Merged in lindenlab/viewer-release

.hgtags

doc/contributions.txt

indra/llmessage/llregionflags.h

indra/llui/lllineeditor.cpp

indra/llui/lllineeditor.h

indra/llui/llspinctrl.cpp

indra/newview/CMakeLists.txt

indra/newview/VIEWER_VERSION.txt

indra/newview/app_settings/settings.xml

indra/newview/llcontrolavatar.cpp

indra/newview/llfloaterbanduration.cpp

indra/newview/llfloaterbanduration.h

indra/newview/llfloaterland.cpp

indra/newview/llfloaterland.h

indra/newview/llfloaterregioninfo.cpp

indra/newview/llfloaterregioninfo.h

indra/newview/llnamelistctrl.cpp

indra/newview/llnamelistctrl.h

indra/newview/llviewerfloaterreg.cpp

indra/newview/llviewerobject.cpp