Merge

indra/llmath/llvolume.cpp

indra/llmath/llvolume.h

...wview/app_settings/shaders/class1/avatar/objectSkinV.glsl

indra/newview/llfilepicker.cpp

indra/newview/llfloaterregiondebugconsole.cpp

indra/newview/llfloatertools.cpp

indra/newview/llfloatertools.h

indra/newview/llmaniprotate.cpp

indra/newview/llselectmgr.cpp

indra/newview/llselectmgr.h

indra/newview/llsimplestat.h

indra/newview/lltranslate.cpp

indra/newview/lltranslate.h

indra/newview/llviewerassetstats.cpp

indra/newview/llviewerassetstats.h

indra/newview/llvoavatar.cpp

indra/newview/llvovolume.cpp

indra/newview/llvovolume.h

indra/newview/pipeline.cpp

indra/newview/skins/default/xui/da/strings.xml