Automated merge with ssh://bitbucket.org/lindenlab/viewer-release

.hgtags

BuildParams

indra/lib/python/indra/util/llmanifest.py

indra/llui/llfloaterreg.cpp

indra/llui/llnotifications.cpp

indra/llvfs/lldir.h

indra/llxml/llcontrol.cpp

indra/llxml/llcontrol.h

indra/llxml/tests/llcontrol_test.cpp

indra/newview/app_settings/cmd_line.xml

indra/newview/app_settings/settings.xml

indra/newview/app_settings/settings_files.xml

indra/newview/linux_tools/wrapper.sh

indra/newview/llagent.cpp

indra/newview/llappviewer.cpp

indra/newview/llappviewer.h

indra/newview/llappviewermacosx.cpp

indra/newview/llcommandlineparser.cpp

indra/newview/llcommandlineparser.h

indra/newview/llfeaturemanager.cpp