merge

.hgignore

indra/llcommon/llqueuedthread.cpp

indra/llcommon/llversionserver.h

indra/llcommon/llversionviewer.h

indra/llimagej2coj/llimagej2coj.cpp

indra/llui/llmenugl.cpp

indra/llui/llmenugl.h

indra/newview/CMakeLists.txt

indra/newview/English.lproj/InfoPlist.strings

indra/newview/Info-SecondLife.plist

indra/newview/llavataractions.cpp

indra/newview/llavatariconctrl.cpp

indra/newview/llbottomtray.cpp

indra/newview/llcurrencyuimanager.cpp

indra/newview/llcurrencyuimanager.h

indra/newview/llfloaterbuyland.cpp

indra/newview/llfloaterinspect.cpp

indra/newview/llfloateruipreview.cpp

indra/newview/llfloatervoicedevicesettings.cpp

indra/newview/llgroupactions.cpp