Automated merge with file:///Users/oz/Work/V-D

doc/contributions.txt

indra/newview/CMakeLists.txt

indra/newview/app_settings/settings.xml

indra/newview/llagent.cpp

indra/newview/llagent.h

indra/newview/llavataractions.cpp

indra/newview/llcommandhandler.cpp

indra/newview/llfloaterpreference.cpp

indra/newview/llfloaterpreference.h

indra/newview/llfloaterworldmap.cpp

indra/newview/llfloaterworldmap.h

indra/newview/llinventorypanel.cpp

indra/newview/llpanelavatar.cpp

indra/newview/llpanelavatar.h

indra/newview/llpanelpicks.cpp

indra/newview/llpanelpicks.h

indra/newview/llpanelprimmediacontrols.cpp

indra/newview/llpanelprimmediacontrols.h

indra/newview/llpanelprofile.cpp

indra/newview/llpanelprofile.h