merge changes for vmrg-184

indra/llui/llsdparam.cpp

indra/llui/llsdparam.h

indra/llui/llurlaction.cpp

indra/llui/llurlaction.h

indra/llwindow/llwindowsdl.cpp

indra/newview/CMakeLists.txt

indra/newview/llappviewer.cpp

indra/newview/llfloaterhelpbrowser.h

indra/newview/llfloatermediabrowser.cpp

indra/newview/llfloatermediabrowser.h

indra/newview/llinventorypanel.cpp

indra/newview/llinventorypanel.h

indra/newview/llmediactrl.cpp

indra/newview/llnavigationbar.cpp

indra/newview/llpanelmarketplaceinboxinventory.cpp

indra/newview/llpanelpicks.cpp

indra/newview/llsidepanelinventory.cpp

indra/newview/llsidepanelinventory.h

indra/newview/llstartup.cpp

indra/newview/llviewerfloaterreg.cpp