summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/CMakeLists.txt97
-rw-r--r--indra/cmake/00-Common.cmake59
-rw-r--r--indra/cmake/APR.cmake4
-rw-r--r--indra/cmake/CMakeLists.txt49
-rw-r--r--indra/cmake/CSharpMacros.cmake142
-rw-r--r--indra/cmake/ConfigurePkgConfig.cmake74
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake2
-rw-r--r--indra/cmake/CopyBackToSource.cmake16
-rw-r--r--indra/cmake/DirectX.cmake6
-rw-r--r--indra/cmake/DragDrop.cmake27
-rw-r--r--indra/cmake/Externals.cmake34
-rw-r--r--indra/cmake/FindELFIO.cmake48
-rw-r--r--indra/cmake/FindLLQtWebkit.cmake62
-rw-r--r--indra/cmake/FindMT.cmake15
-rw-r--r--indra/cmake/FindMono.cmake68
-rw-r--r--indra/cmake/FindMySQL.cmake48
-rw-r--r--indra/cmake/FindSVN.cmake34
-rw-r--r--indra/cmake/GLEXT.cmake8
-rw-r--r--indra/cmake/GLOD.cmake2
-rw-r--r--indra/cmake/GooglePerfTools.cmake4
-rw-r--r--indra/cmake/Havok.cmake128
-rw-r--r--indra/cmake/LLAppearance.cmake17
-rw-r--r--indra/cmake/LLAppearanceUtility.cmake12
-rw-r--r--indra/cmake/LLCommon.cmake2
-rw-r--r--indra/cmake/LLDatabase.cmake10
-rw-r--r--indra/cmake/LLRender.cmake26
-rw-r--r--indra/cmake/LLScene.cmake7
-rw-r--r--indra/cmake/LLWindow.cmake27
-rw-r--r--indra/cmake/LLXML.cmake4
-rw-r--r--indra/cmake/LLXUIXML.cmake7
-rw-r--r--indra/cmake/Linking.cmake5
-rw-r--r--indra/cmake/MonoDeps.cmake48
-rw-r--r--indra/cmake/MonoEmbed.cmake57
-rw-r--r--indra/cmake/MySQL.cmake26
-rw-r--r--indra/cmake/OpenGL.cmake14
-rw-r--r--indra/cmake/Prebuilt.cmake5
-rw-r--r--indra/cmake/Python.cmake2
-rw-r--r--indra/cmake/UI.cmake2
-rw-r--r--indra/cmake/Variables.cmake64
-rw-r--r--indra/cmake/VisualLeakDetector.cmake15
-rw-r--r--indra/integration_tests/llimage_libtest/CMakeLists.txt3
-rw-r--r--indra/integration_tests/llui_libtest/CMakeLists.txt4
-rw-r--r--indra/linux_crash_logger/CMakeLists.txt4
-rw-r--r--indra/linux_updater/CMakeLists.txt57
-rw-r--r--indra/linux_updater/linux_updater.cpp924
-rw-r--r--indra/llappearance/CMakeLists.txt118
-rw-r--r--indra/llappearance/llavatarappearance.cpp1953
-rw-r--r--indra/llappearance/llavatarappearance.h448
-rw-r--r--indra/llappearance/llavatarappearancedefines.cpp (renamed from indra/newview/llvoavatardefines.cpp)106
-rw-r--r--indra/llappearance/llavatarappearancedefines.h (renamed from indra/newview/llvoavatardefines.h)49
-rw-r--r--indra/llappearance/llavatarjoint.cpp326
-rw-r--r--indra/llappearance/llavatarjoint.h140
-rw-r--r--indra/llappearance/llavatarjointmesh.cpp375
-rw-r--r--indra/llappearance/llavatarjointmesh.h145
-rw-r--r--indra/llappearance/lldriverparam.cpp (renamed from indra/newview/lldriverparam.cpp)133
-rw-r--r--indra/llappearance/lldriverparam.h (renamed from indra/newview/lldriverparam.h)23
-rw-r--r--indra/llappearance/lljointpickname.h49
-rw-r--r--indra/llappearance/lllocaltextureobject.cpp (renamed from indra/newview/lllocaltextureobject.cpp)13
-rw-r--r--indra/llappearance/lllocaltextureobject.h (renamed from indra/newview/lllocaltextureobject.h)13
-rw-r--r--indra/llappearance/llpolymesh.cpp (renamed from indra/newview/llpolymesh.cpp)259
-rw-r--r--indra/llappearance/llpolymesh.h (renamed from indra/newview/llpolymesh.h)96
-rw-r--r--indra/llappearance/llpolymorph.cpp (renamed from indra/newview/llpolymorph.cpp)7
-rw-r--r--indra/llappearance/llpolymorph.h (renamed from indra/newview/llpolymorph.h)8
-rw-r--r--indra/llappearance/llpolyskeletaldistortion.cpp293
-rw-r--r--indra/llappearance/llpolyskeletaldistortion.h131
-rw-r--r--indra/llappearance/lltexglobalcolor.cpp (renamed from indra/newview/lltexglobalcolor.cpp)16
-rw-r--r--indra/llappearance/lltexglobalcolor.h (renamed from indra/newview/lltexglobalcolor.h)12
-rw-r--r--indra/llappearance/lltexlayer.cpp (renamed from indra/newview/lltexlayer.cpp)933
-rw-r--r--indra/llappearance/lltexlayer.h (renamed from indra/newview/lltexlayer.h)167
-rw-r--r--indra/llappearance/lltexlayerparams.cpp (renamed from indra/newview/lltexlayerparams.cpp)70
-rw-r--r--indra/llappearance/lltexlayerparams.h (renamed from indra/newview/lltexlayerparams.h)18
-rw-r--r--indra/llappearance/lltexturemanagerbridge.cpp32
-rw-r--r--indra/llappearance/lltexturemanagerbridge.h46
-rw-r--r--indra/llappearance/llviewervisualparam.cpp (renamed from indra/newview/llviewervisualparam.cpp)3
-rw-r--r--indra/llappearance/llviewervisualparam.h (renamed from indra/newview/llviewervisualparam.h)0
-rw-r--r--indra/llappearance/llwearable.cpp781
-rw-r--r--indra/llappearance/llwearable.h (renamed from indra/newview/llwearable.h)85
-rw-r--r--indra/llappearance/llwearabledata.cpp360
-rw-r--r--indra/llappearance/llwearabledata.h109
-rw-r--r--indra/llappearance/llwearabletype.cpp (renamed from indra/newview/llwearabletype.cpp)62
-rw-r--r--indra/llappearance/llwearabletype.h (renamed from indra/newview/llwearabletype.h)14
-rw-r--r--indra/llaudio/CMakeLists.txt4
-rw-r--r--indra/llaudio/llaudioengine.cpp4
-rw-r--r--indra/llaudio/llaudioengine.h24
-rw-r--r--indra/llcharacter/CMakeLists.txt13
-rw-r--r--indra/llcharacter/llanimationstates.cpp4
-rw-r--r--indra/llcharacter/llanimationstates.h2
-rw-r--r--indra/llcharacter/llcharacter.cpp2
-rw-r--r--indra/llcharacter/llcharacter.h9
-rw-r--r--indra/llcharacter/lljoint.cpp30
-rw-r--r--indra/llcharacter/lljoint.h8
-rw-r--r--indra/llcharacter/llvisualparam.cpp33
-rw-r--r--indra/llcharacter/llvisualparam.h14
-rw-r--r--indra/llcharacter/tests/lljoint_test.cpp6
-rw-r--r--indra/llcommon/imageids.cpp3
-rw-r--r--indra/llcommon/imageids.h1
-rw-r--r--indra/llcommon/llassettype.cpp1
-rw-r--r--indra/llcommon/llassettype.h3
-rw-r--r--indra/llcommon/llavatarname.cpp131
-rw-r--r--indra/llcommon/llavatarname.h60
-rw-r--r--indra/llcommon/lldictionary.h2
-rw-r--r--indra/llcommon/llfasttimer.cpp6
-rw-r--r--indra/llcommon/llfasttimer.h2
-rw-r--r--indra/llcommon/llfile.cpp709
-rw-r--r--indra/llcommon/llfile.h399
-rwxr-xr-x[-rw-r--r--]indra/llcommon/llfoldertype.h0
-rw-r--r--indra/llcommon/llhandle.h13
-rw-r--r--indra/llcommon/llinitparam.cpp82
-rw-r--r--indra/llcommon/llinitparam.h1657
-rw-r--r--indra/llcommon/llinstancetracker.h5
-rw-r--r--indra/llcommon/llmetricperformancetester.cpp2
-rw-r--r--indra/llcommon/llrefcount.h19
-rw-r--r--indra/llcommon/llregistry.h4
-rw-r--r--indra/llcommon/llsdparam.cpp51
-rw-r--r--indra/llcommon/llsdserialize.cpp4
-rw-r--r--indra/llcommon/llsdserialize.h16
-rw-r--r--indra/llcommon/llsdserialize_xml.cpp18
-rw-r--r--indra/llcommon/llthread.h17
-rw-r--r--indra/llcommon/llversionserver.h2
-rw-r--r--indra/llcommon/llversionviewer.h6
-rw-r--r--indra/llcommon/stdenums.h3
-rw-r--r--indra/llcommon/tests/bitpack_test.cpp16
-rw-r--r--indra/llcommon/tests/llinstancetracker_test.cpp3
-rw-r--r--indra/llcrashlogger/CMakeLists.txt4
-rw-r--r--indra/llcrashlogger/llcrashlogger.cpp2
-rw-r--r--indra/llimage/CMakeLists.txt13
-rw-r--r--indra/llimage/llimage.cpp23
-rw-r--r--indra/llimage/llimage.h5
-rw-r--r--indra/llimage/llimagetga.cpp12
-rw-r--r--indra/llinventory/llinventory.cpp56
-rw-r--r--indra/llinventory/llinventory.h6
-rw-r--r--indra/llinventory/llinventorytype.cpp3
-rw-r--r--indra/llinventory/llinventorytype.h50
-rw-r--r--indra/llkdu/CMakeLists.txt5
-rw-r--r--indra/llmath/CMakeLists.txt5
-rw-r--r--indra/llmath/llvolume.cpp5
-rw-r--r--indra/llmessage/CMakeLists.txt5
-rw-r--r--indra/llmessage/llavatarnamecache.cpp251
-rw-r--r--indra/llmessage/llavatarnamecache.h32
-rw-r--r--indra/llmessage/llcachename.cpp10
-rw-r--r--indra/llmessage/llcachename.h2
-rw-r--r--indra/llmessage/llcurl.cpp4
-rw-r--r--indra/llmessage/lldbstrings.h12
-rw-r--r--indra/llmessage/llhttpassetstorage.cpp4
-rwxr-xr-x[-rw-r--r--]indra/llmessage/llhttpclient.cpp15
-rw-r--r--indra/llmessage/llhttpclientadapter.cpp7
-rw-r--r--indra/llmessage/llinstantmessage.cpp17
-rw-r--r--indra/llmessage/llinstantmessage.h55
-rw-r--r--indra/llmessage/lliosocket.cpp9
-rw-r--r--indra/llmessage/llregionflags.h65
-rw-r--r--indra/llmessage/llurlrequest.cpp4
-rw-r--r--indra/llmessage/message_prehash.cpp7
-rw-r--r--indra/llmessage/message_prehash.h7
-rw-r--r--indra/llmessage/tests/llhttpclient_test.cpp84
-rw-r--r--indra/llmessage/tests/test_llsdmessage_peer.py46
-rw-r--r--indra/llplugin/CMakeLists.txt4
-rw-r--r--indra/llplugin/llpluginprocessparent.cpp3
-rw-r--r--indra/llplugin/slplugin/CMakeLists.txt3
-rw-r--r--indra/llprimitive/CMakeLists.txt15
-rw-r--r--indra/llprimitive/llprimitive.cpp102
-rw-r--r--indra/llprimitive/llprimitive.h31
-rw-r--r--indra/llrender/CMakeLists.txt73
-rw-r--r--indra/llrender/llfontfreetype.cpp7
-rw-r--r--indra/llrender/llfontgl.cpp7
-rw-r--r--indra/llrender/llfontregistry.cpp2
-rw-r--r--indra/llrender/llgl.cpp10
-rw-r--r--indra/llrender/llglslshader.h2
-rw-r--r--indra/llrender/llgltexture.cpp396
-rw-r--r--indra/llrender/llgltexture.h199
-rw-r--r--indra/llrender/llimagegl.cpp42
-rw-r--r--indra/llrender/llimagegl.h5
-rw-r--r--indra/llrender/llrender.cpp2
-rw-r--r--indra/llrender/llrender2dutils.cpp1608
-rw-r--r--indra/llrender/llrender2dutils.h163
-rw-r--r--indra/llrender/llrendertarget.cpp2
-rw-r--r--indra/llrender/llrendertarget.h3
-rw-r--r--indra/llrender/lltexture.h7
-rw-r--r--indra/llrender/lluiimage.cpp (renamed from indra/llui/lluiimage.cpp)52
-rw-r--r--indra/llrender/lluiimage.h (renamed from indra/llui/lluiimage.h)8
-rw-r--r--indra/llrender/llvertexbuffer.cpp24
-rw-r--r--indra/llui/CMakeLists.txt18
-rw-r--r--indra/llui/llaccordionctrltab.cpp2
-rw-r--r--indra/llui/llbutton.cpp84
-rw-r--r--indra/llui/llbutton.h8
-rw-r--r--indra/llui/llchatentry.cpp257
-rw-r--r--indra/llui/llchatentry.h106
-rw-r--r--indra/llui/llcheckboxctrl.cpp14
-rw-r--r--indra/llui/llcheckboxctrl.h2
-rw-r--r--indra/llui/llcombobox.cpp2
-rw-r--r--indra/llui/llcommandmanager.cpp2
-rw-r--r--indra/llui/llcommandmanager.h6
-rw-r--r--indra/llui/llconsole.cpp1
-rw-r--r--indra/llui/lldockcontrol.cpp31
-rw-r--r--indra/llui/lldockcontrol.h4
-rw-r--r--indra/llui/llflashtimer.cpp100
-rw-r--r--indra/llui/llflashtimer.h73
-rw-r--r--indra/llui/llfloater.cpp190
-rw-r--r--indra/llui/llfloater.h19
-rw-r--r--indra/llui/llfloaterreg.cpp73
-rw-r--r--indra/llui/llfolderview.cpp (renamed from indra/newview/llfolderview.cpp)1082
-rw-r--r--indra/llui/llfolderview.h (renamed from indra/newview/llfolderview.h)198
-rwxr-xr-xindra/llui/llfolderviewitem.cpp2095
-rwxr-xr-x[-rw-r--r--]indra/llui/llfolderviewitem.h (renamed from indra/newview/llfolderviewitem.h)395
-rw-r--r--indra/llui/llfolderviewmodel.cpp68
-rw-r--r--indra/llui/llfolderviewmodel.h444
-rw-r--r--indra/llui/llfunctorregistry.h2
-rw-r--r--indra/llui/llkeywords.cpp4
-rw-r--r--indra/llui/lllayoutstack.cpp51
-rw-r--r--indra/llui/lllayoutstack.h4
-rw-r--r--indra/llui/lllineeditor.cpp23
-rw-r--r--indra/llui/lllineeditor.h3
-rw-r--r--indra/llui/llloadingindicator.cpp2
-rw-r--r--indra/llui/llloadingindicator.h6
-rw-r--r--indra/llui/lllocalcliprect.cpp18
-rw-r--r--indra/llui/llmenubutton.cpp78
-rw-r--r--indra/llui/llmenubutton.h11
-rw-r--r--indra/llui/llmenugl.cpp109
-rw-r--r--indra/llui/llmenugl.h9
-rw-r--r--indra/llui/llmultifloater.cpp45
-rw-r--r--indra/llui/llmultifloater.h16
-rw-r--r--indra/llui/llnotifications.cpp492
-rw-r--r--indra/llui/llnotifications.h292
-rw-r--r--indra/llui/llnotificationslistener.cpp354
-rw-r--r--indra/llui/llnotificationslistener.h69
-rw-r--r--indra/llui/llnotificationtemplate.h35
-rw-r--r--indra/llui/llresizebar.cpp8
-rw-r--r--indra/llui/llresizebar.h2
-rw-r--r--indra/llui/llscrollbar.cpp5
-rw-r--r--indra/llui/llscrollbar.h3
-rw-r--r--indra/llui/llscrollcontainer.cpp32
-rw-r--r--indra/llui/llscrollcontainer.h4
-rw-r--r--indra/llui/llscrolllistctrl.cpp29
-rw-r--r--indra/llui/llscrolllistctrl.h3
-rw-r--r--indra/llui/llspellcheck.cpp8
-rw-r--r--indra/llui/llspinctrl.cpp5
-rw-r--r--indra/llui/llspinctrl.h1
-rw-r--r--indra/llui/lltabcontainer.cpp42
-rw-r--r--indra/llui/lltabcontainer.h5
-rw-r--r--indra/llui/lltextbase.cpp202
-rw-r--r--indra/llui/lltextbase.h63
-rw-r--r--indra/llui/lltexteditor.cpp60
-rw-r--r--indra/llui/lltexteditor.h14
-rw-r--r--indra/llui/lltoggleablemenu.h2
-rw-r--r--indra/llui/lltoolbar.cpp22
-rw-r--r--indra/llui/lltooltip.cpp2
-rw-r--r--indra/llui/llui.cpp1612
-rw-r--r--indra/llui/llui.h145
-rw-r--r--indra/llui/lluictrlfactory.cpp18
-rw-r--r--indra/llui/lluictrlfactory.h5
-rw-r--r--indra/llui/llurlaction.cpp33
-rw-r--r--indra/llui/llurlaction.h3
-rw-r--r--indra/llui/llurlentry.cpp32
-rw-r--r--indra/llui/llurlentry.h16
-rw-r--r--indra/llui/llview.cpp34
-rw-r--r--indra/llui/llview.h1
-rw-r--r--indra/llui/llxuiparser.cpp92
-rw-r--r--indra/llui/llxuiparser.h2
-rw-r--r--indra/llui/tests/llurlentry_stub.cpp21
-rw-r--r--indra/llui/tests/llurlentry_test.cpp2
-rw-r--r--indra/llui/tests/llurlmatch_test.cpp18
-rw-r--r--indra/llvfs/CMakeLists.txt6
-rw-r--r--indra/llvfs/lldir.cpp18
-rw-r--r--indra/llvfs/lldir.h3
-rw-r--r--indra/llvfs/llvfile.cpp7
-rw-r--r--indra/llwindow/CMakeLists.txt97
-rw-r--r--indra/llwindow/GL/glh_extensions.h4
-rw-r--r--indra/llwindow/llwindowsdl.cpp38
-rw-r--r--indra/llxml/CMakeLists.txt10
-rw-r--r--indra/llxml/llcontrol.cpp6
-rw-r--r--indra/llxml/llxmlnode.cpp94
-rw-r--r--indra/llxml/llxmlnode.h5
-rw-r--r--indra/lscript/lscript_compile/CMakeLists.txt9
-rw-r--r--indra/lscript/lscript_compile/bison.bat9
-rw-r--r--indra/lscript/lscript_compile/indra.l23
-rw-r--r--indra/lscript/lscript_execute/CMakeLists.txt3
-rw-r--r--indra/lscript/lscript_execute/lscript_execute.cpp11
-rw-r--r--indra/lscript/lscript_execute/lscript_readlso.cpp9
-rw-r--r--indra/lscript/lscript_library/CMakeLists.txt3
-rw-r--r--indra/mac_crash_logger/CMakeLists.txt4
-rw-r--r--indra/mac_updater/CMakeLists.txt2
-rw-r--r--indra/media_plugins/base/CMakeLists.txt5
-rw-r--r--indra/media_plugins/example/CMakeLists.txt5
-rw-r--r--indra/media_plugins/gstreamer010/CMakeLists.txt5
-rw-r--r--indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp3
-rw-r--r--indra/media_plugins/quicktime/CMakeLists.txt5
-rw-r--r--indra/media_plugins/webkit/CMakeLists.txt5
-rw-r--r--indra/newview/CMakeLists.txt135
-rw-r--r--indra/newview/English.lproj/InfoPlist.strings4
-rw-r--r--indra/newview/Info-SecondLife.plist2
-rw-r--r--indra/newview/app_settings/commands.xml17
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/logcontrol.xml0
-rwxr-xr-x[-rw-r--r--]indra/newview/app_settings/settings.xml434
-rw-r--r--indra/newview/app_settings/settings_per_account.xml122
-rw-r--r--indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterAlphaMaskF.glsl2
-rw-r--r--indra/newview/app_settings/shaders/class1/lighting/lightFullbrightWaterF.glsl2
-rw-r--r--indra/newview/character/avatar_lad.xml28
-rwxr-xr-xindra/newview/linux_tools/wrapper.sh31
-rw-r--r--indra/newview/llaccountingcostmanager.cpp4
-rwxr-xr-xindra/newview/llagent.cpp270
-rw-r--r--indra/newview/llagent.h16
-rw-r--r--indra/newview/llagentcamera.cpp62
-rw-r--r--indra/newview/llagentpilot.cpp2
-rwxr-xr-x[-rw-r--r--]indra/newview/llagentwearables.cpp485
-rw-r--r--indra/newview/llagentwearables.h74
-rw-r--r--indra/newview/llagentwearablesfetch.cpp73
-rw-r--r--indra/newview/llappearance.h8
-rwxr-xr-x[-rw-r--r--]indra/newview/llappearancemgr.cpp1318
-rwxr-xr-x[-rw-r--r--]indra/newview/llappearancemgr.h41
-rw-r--r--indra/newview/llappviewer.cpp61
-rw-r--r--indra/newview/llappviewer.h2
-rw-r--r--indra/newview/llappviewerwin32.cpp2
-rw-r--r--indra/newview/llassetuploadqueue.cpp7
-rw-r--r--indra/newview/llassetuploadresponders.cpp25
-rw-r--r--indra/newview/llassetuploadresponders.h6
-rw-r--r--indra/newview/llautoreplace.cpp99
-rw-r--r--indra/newview/llautoreplace.h54
-rwxr-xr-xindra/newview/llavataractions.cpp211
-rw-r--r--indra/newview/llavataractions.h43
-rwxr-xr-xindra/newview/llavatariconctrl.cpp39
-rw-r--r--indra/newview/llavatariconctrl.h20
-rw-r--r--indra/newview/llavatarlist.cpp61
-rw-r--r--indra/newview/llavatarlist.h3
-rw-r--r--indra/newview/llavatarlistitem.cpp51
-rw-r--r--indra/newview/llavatarlistitem.h6
-rw-r--r--indra/newview/llblockedlistitem.cpp114
-rw-r--r--indra/newview/llblockedlistitem.h73
-rw-r--r--indra/newview/llblocklist.cpp284
-rw-r--r--indra/newview/llblocklist.h138
-rw-r--r--indra/newview/llbrowsernotification.cpp8
-rw-r--r--indra/newview/llbuycurrencyhtml.cpp4
-rw-r--r--indra/newview/llcallbacklist.cpp49
-rw-r--r--indra/newview/llcallbacklist.h6
-rw-r--r--indra/newview/llcallfloater.cpp821
-rw-r--r--indra/newview/llcallfloater.h273
-rw-r--r--indra/newview/llcallingcard.cpp19
-rw-r--r--indra/newview/llchannelmanager.cpp6
-rw-r--r--indra/newview/llchatbar.cpp44
-rw-r--r--indra/newview/llchathistory.cpp263
-rw-r--r--indra/newview/llchathistory.h8
-rw-r--r--indra/newview/llchatitemscontainerctrl.cpp52
-rw-r--r--indra/newview/llchatitemscontainerctrl.h8
-rw-r--r--indra/newview/llchiclet.cpp935
-rw-r--r--indra/newview/llchiclet.h457
-rw-r--r--indra/newview/llchicletbar.cpp101
-rw-r--r--indra/newview/llchicletbar.h14
-rw-r--r--indra/newview/llclassifiedstatsresponder.cpp5
-rw-r--r--indra/newview/llclassifiedstatsresponder.h2
-rw-r--r--indra/newview/llcofwearables.cpp6
-rw-r--r--indra/newview/llcolorswatch.cpp4
-rw-r--r--indra/newview/llcommunicationchannel.cpp113
-rw-r--r--indra/newview/llcommunicationchannel.h66
-rw-r--r--indra/newview/llcompilequeue.cpp12
-rw-r--r--indra/newview/llconversationlog.cpp615
-rw-r--r--indra/newview/llconversationlog.h216
-rw-r--r--indra/newview/llconversationloglist.cpp533
-rw-r--r--indra/newview/llconversationloglist.h153
-rw-r--r--indra/newview/llconversationloglistitem.cpp184
-rw-r--r--indra/newview/llconversationloglistitem.h86
-rw-r--r--indra/newview/llconversationmodel.cpp702
-rwxr-xr-xindra/newview/llconversationmodel.h314
-rwxr-xr-xindra/newview/llconversationview.cpp696
-rwxr-xr-xindra/newview/llconversationview.h177
-rw-r--r--indra/newview/lldeferredsounds.cpp45
-rw-r--r--indra/newview/lldeferredsounds.h46
-rw-r--r--indra/newview/lldelayedgestureerror.cpp8
-rw-r--r--indra/newview/lldirpicker.cpp4
-rw-r--r--indra/newview/lldonotdisturbnotificationstorage.cpp350
-rw-r--r--indra/newview/lldonotdisturbnotificationstorage.h78
-rw-r--r--indra/newview/lldrawable.cpp26
-rw-r--r--indra/newview/lldrawpoolbump.cpp4
-rw-r--r--indra/newview/lldrawpoolterrain.cpp10
-rw-r--r--indra/newview/lldrawpoolwater.cpp4
-rw-r--r--indra/newview/lldynamictexture.cpp2
-rw-r--r--indra/newview/lldynamictexture.h4
-rw-r--r--indra/newview/llestateinfomodel.cpp28
-rw-r--r--indra/newview/llestateinfomodel.h25
-rw-r--r--indra/newview/lleventpoll.cpp12
-rw-r--r--indra/newview/llexpandabletextbox.cpp4
-rw-r--r--indra/newview/llface.cpp4
-rw-r--r--indra/newview/llfasttimerview.cpp11
-rw-r--r--indra/newview/llfavoritesbar.cpp311
-rw-r--r--indra/newview/llfavoritesbar.h110
-rw-r--r--indra/newview/llfilepicker.cpp8
-rw-r--r--indra/newview/llfirstuse.cpp2
-rw-r--r--indra/newview/llflexibleobject.cpp36
-rw-r--r--indra/newview/llfloaterauction.cpp1
-rw-r--r--indra/newview/llfloateravatarpicker.cpp239
-rw-r--r--indra/newview/llfloateravatarpicker.h17
-rw-r--r--indra/newview/llfloateravatartextures.cpp15
-rw-r--r--indra/newview/llfloateravatartextures.h4
-rw-r--r--indra/newview/llfloaterbuycontents.cpp1
-rw-r--r--indra/newview/llfloaterbuyland.cpp4
-rw-r--r--indra/newview/llfloaterbvhpreview.cpp4
-rw-r--r--indra/newview/llfloaterchatvoicevolume.cpp44
-rw-r--r--indra/newview/llfloaterchatvoicevolume.h44
-rw-r--r--indra/newview/llfloatercolorpicker.cpp36
-rw-r--r--indra/newview/llfloatercolorpicker.h4
-rw-r--r--indra/newview/llfloaterconversationlog.cpp134
-rw-r--r--indra/newview/llfloaterconversationlog.h56
-rw-r--r--indra/newview/llfloaterconversationpreview.cpp186
-rw-r--r--indra/newview/llfloaterconversationpreview.h64
-rw-r--r--indra/newview/llfloaterdisplayname.cpp20
-rw-r--r--indra/newview/llfloatergodtools.cpp46
-rw-r--r--indra/newview/llfloatergodtools.h14
-rw-r--r--indra/newview/llfloaterimagepreview.cpp8
-rw-r--r--indra/newview/llfloaterimcontainer.cpp2028
-rw-r--r--indra/newview/llfloaterimcontainer.h211
-rw-r--r--indra/newview/llfloaterimnearbychat.cpp885
-rw-r--r--indra/newview/llfloaterimnearbychat.h (renamed from indra/newview/llnearbychatbar.h)69
-rw-r--r--indra/newview/llfloaterimnearbychathandler.cpp (renamed from indra/newview/llnearbychathandler.cpp)204
-rw-r--r--indra/newview/llfloaterimnearbychathandler.h (renamed from indra/newview/llnearbychathandler.h)17
-rw-r--r--indra/newview/llfloaterimnearbychatlistener.cpp (renamed from indra/newview/llnearbychatbarlistener.cpp)14
-rw-r--r--indra/newview/llfloaterimnearbychatlistener.h (renamed from indra/newview/llnearbychatbarlistener.h)18
-rw-r--r--indra/newview/llfloaterimsession.cpp1307
-rw-r--r--indra/newview/llfloaterimsession.h (renamed from indra/newview/llimfloater.h)159
-rw-r--r--indra/newview/llfloaterimsessiontab.cpp1103
-rw-r--r--indra/newview/llfloaterimsessiontab.h216
-rw-r--r--indra/newview/llfloaterinspect.cpp46
-rw-r--r--indra/newview/llfloaterinspect.h8
-rw-r--r--indra/newview/llfloaterland.cpp22
-rwxr-xr-xindra/newview/llfloatermodelpreview.cpp15
-rw-r--r--indra/newview/llfloaternotificationsconsole.cpp38
-rw-r--r--indra/newview/llfloateroutbox.cpp84
-rw-r--r--indra/newview/llfloateroutbox.h2
-rwxr-xr-xindra/newview/llfloaterpreference.cpp353
-rw-r--r--indra/newview/llfloaterpreference.h39
-rw-r--r--indra/newview/llfloaterregiondebugconsole.cpp2
-rw-r--r--indra/newview/llfloaterregioninfo.cpp90
-rw-r--r--indra/newview/llfloaterreporter.cpp39
-rw-r--r--indra/newview/llfloaterreporter.h1
-rw-r--r--indra/newview/llfloaterscriptdebug.cpp2
-rw-r--r--indra/newview/llfloaterscriptlimits.cpp31
-rw-r--r--indra/newview/llfloaterscriptlimits.h8
-rw-r--r--indra/newview/llfloatersellland.cpp22
-rw-r--r--indra/newview/llfloatersidepanelcontainer.cpp31
-rw-r--r--indra/newview/llfloatersidepanelcontainer.h2
-rw-r--r--indra/newview/llfloatertools.cpp4
-rw-r--r--indra/newview/llfloatertopobjects.cpp14
-rw-r--r--indra/newview/llfloatertranslationsettings.cpp23
-rw-r--r--indra/newview/llfloatertranslationsettings.h1
-rw-r--r--indra/newview/llfloateruipreview.cpp1
-rw-r--r--indra/newview/llfloatervoicevolume.cpp220
-rw-r--r--indra/newview/llfloatervoicevolume.h35
-rw-r--r--indra/newview/llfoldervieweventlistener.h103
-rw-r--r--indra/newview/llfolderviewitem.cpp2901
-rw-r--r--indra/newview/llfolderviewmodelinventory.cpp314
-rw-r--r--indra/newview/llfolderviewmodelinventory.h118
-rw-r--r--indra/newview/llfollowcam.cpp1
-rw-r--r--indra/newview/llfriendcard.cpp10
-rw-r--r--indra/newview/llgesturemgr.cpp8
-rw-r--r--indra/newview/llglsandbox.cpp8
-rw-r--r--indra/newview/llgroupactions.cpp4
-rw-r--r--indra/newview/llgroupiconctrl.cpp3
-rw-r--r--indra/newview/llgrouplist.cpp6
-rw-r--r--indra/newview/llgrouplist.h13
-rw-r--r--indra/newview/llgroupmgr.cpp7
-rw-r--r--indra/newview/llhomelocationresponder.cpp4
-rw-r--r--indra/newview/llhomelocationresponder.h2
-rw-r--r--indra/newview/llhudeffectlookat.cpp2
-rw-r--r--indra/newview/llhudnametag.cpp282
-rw-r--r--indra/newview/llhudnametag.h2
-rw-r--r--indra/newview/llhudtext.cpp5
-rw-r--r--indra/newview/llimfloater.cpp1195
-rw-r--r--indra/newview/llimfloatercontainer.cpp165
-rw-r--r--indra/newview/llimfloatercontainer.h70
-rw-r--r--indra/newview/llimhandler.cpp104
-rw-r--r--indra/newview/llimpanel.cpp7
-rw-r--r--indra/newview/llimview.cpp581
-rw-r--r--indra/newview/llimview.h66
-rw-r--r--indra/newview/llinspectavatar.cpp516
-rw-r--r--indra/newview/llinventorybridge.cpp851
-rw-r--r--indra/newview/llinventorybridge.h113
-rw-r--r--indra/newview/llinventoryfilter.cpp403
-rw-r--r--indra/newview/llinventoryfilter.h182
-rw-r--r--indra/newview/llinventoryfunctions.cpp135
-rw-r--r--indra/newview/llinventoryfunctions.h58
-rw-r--r--indra/newview/llinventoryicon.cpp110
-rw-r--r--indra/newview/llinventoryicon.h54
-rw-r--r--indra/newview/llinventorylistitem.cpp3
-rwxr-xr-x[-rw-r--r--]indra/newview/llinventorymodel.cpp109
-rw-r--r--indra/newview/llinventorymodel.h13
-rw-r--r--indra/newview/llinventorymodelbackgroundfetch.cpp44
-rw-r--r--indra/newview/llinventorypanel.cpp648
-rw-r--r--indra/newview/llinventorypanel.h120
-rw-r--r--indra/newview/lllistcontextmenu.h2
-rw-r--r--indra/newview/lllocalbitmaps.cpp110
-rw-r--r--indra/newview/lllocalbitmaps.h7
-rw-r--r--indra/newview/lllocationinputctrl.cpp4
-rw-r--r--indra/newview/lllogchat.cpp496
-rw-r--r--indra/newview/lllogchat.h35
-rw-r--r--indra/newview/llmanip.cpp2
-rw-r--r--indra/newview/llmaniprotate.cpp1
-rw-r--r--indra/newview/llmanipscale.cpp5
-rw-r--r--indra/newview/llmaniptranslate.cpp17
-rw-r--r--indra/newview/llmediactrl.cpp18
-rw-r--r--indra/newview/llmediadataclient.cpp10
-rw-r--r--indra/newview/llmediadataclient.h4
-rwxr-xr-xindra/newview/llmeshrepository.cpp4
-rw-r--r--indra/newview/llmorphview.cpp2
-rw-r--r--indra/newview/llnamelistctrl.cpp19
-rw-r--r--indra/newview/llnamelistctrl.h8
-rw-r--r--indra/newview/llnearbychat.cpp338
-rw-r--r--indra/newview/llnearbychat.h83
-rw-r--r--indra/newview/llnearbychatbar.cpp684
-rw-r--r--indra/newview/llnetmap.cpp2
-rw-r--r--indra/newview/llnotificationalerthandler.cpp107
-rw-r--r--indra/newview/llnotificationgrouphandler.cpp65
-rw-r--r--indra/newview/llnotificationhandler.h237
-rw-r--r--indra/newview/llnotificationhandlerutil.cpp269
-rw-r--r--indra/newview/llnotificationhinthandler.cpp25
-rw-r--r--indra/newview/llnotificationmanager.cpp107
-rw-r--r--indra/newview/llnotificationmanager.h17
-rw-r--r--indra/newview/llnotificationofferhandler.cpp189
-rw-r--r--indra/newview/llnotificationscripthandler.cpp100
-rw-r--r--indra/newview/llnotificationstorage.cpp244
-rw-r--r--indra/newview/llnotificationstorage.h33
-rw-r--r--indra/newview/llnotificationtiphandler.cpp121
-rw-r--r--indra/newview/lloutputmonitorctrl.cpp112
-rw-r--r--indra/newview/lloutputmonitorctrl.h19
-rw-r--r--indra/newview/llpanelblockedlist.cpp166
-rw-r--r--indra/newview/llpanelblockedlist.h38
-rw-r--r--indra/newview/llpanelclassified.cpp1
-rw-r--r--indra/newview/llpanelcontents.cpp2
-rw-r--r--indra/newview/llpaneleditwearable.cpp99
-rw-r--r--indra/newview/llpaneleditwearable.h36
-rw-r--r--indra/newview/llpanelface.cpp1
-rw-r--r--indra/newview/llpanelgroupgeneral.cpp18
-rw-r--r--indra/newview/llpanelgroupgeneral.h1
-rw-r--r--indra/newview/llpanelgroupinvite.cpp46
-rw-r--r--indra/newview/llpanelgrouplandmoney.cpp4
-rw-r--r--indra/newview/llpanelgroupnotices.cpp6
-rw-r--r--indra/newview/llpanelgrouproles.cpp21
-rw-r--r--indra/newview/llpanelgrouproles.h1
-rw-r--r--indra/newview/llpanelimcontrolpanel.cpp397
-rw-r--r--indra/newview/llpanelimcontrolpanel.h56
-rw-r--r--indra/newview/llpanelland.cpp2
-rw-r--r--indra/newview/llpanellandmarkinfo.cpp18
-rw-r--r--indra/newview/llpanellandmarks.cpp181
-rw-r--r--indra/newview/llpanellandmarks.h2
-rw-r--r--indra/newview/llpanelmaininventory.cpp122
-rw-r--r--indra/newview/llpanelmarketplaceinbox.cpp16
-rw-r--r--indra/newview/llpanelmarketplaceinboxinventory.cpp146
-rw-r--r--indra/newview/llpanelmarketplaceinboxinventory.h19
-rw-r--r--indra/newview/llpanelmarketplaceoutboxinventory.cpp156
-rw-r--r--indra/newview/llpanelmarketplaceoutboxinventory.h78
-rw-r--r--indra/newview/llpanelobject.cpp3
-rw-r--r--indra/newview/llpanelobjectinventory.cpp185
-rw-r--r--indra/newview/llpanelobjectinventory.h11
-rw-r--r--indra/newview/llpaneloutfitedit.cpp45
-rw-r--r--indra/newview/llpanelpeople.cpp375
-rw-r--r--indra/newview/llpanelpeople.h34
-rw-r--r--indra/newview/llpanelpeoplemenus.cpp141
-rw-r--r--indra/newview/llpanelpeoplemenus.h20
-rw-r--r--indra/newview/llpanelpermissions.cpp4
-rw-r--r--indra/newview/llpanelplaceprofile.cpp12
-rw-r--r--indra/newview/llpanelplaceprofile.h2
-rw-r--r--indra/newview/llpaneltopinfobar.cpp6
-rw-r--r--indra/newview/llpanelvolume.cpp3
-rw-r--r--indra/newview/llpanelwearing.cpp15
-rw-r--r--indra/newview/llparticipantlist.cpp738
-rw-r--r--indra/newview/llparticipantlist.h152
-rw-r--r--indra/newview/llpathfindingmanager.cpp59
-rw-r--r--indra/newview/llpathfindingnavmesh.cpp5
-rw-r--r--indra/newview/llpathfindingnavmesh.h2
-rw-r--r--indra/newview/llpathfindingobject.cpp1
-rw-r--r--indra/newview/llpersistentnotificationstorage.cpp149
-rw-r--r--indra/newview/llpersistentnotificationstorage.h63
-rw-r--r--indra/newview/llphysicsmotion.cpp25
-rw-r--r--indra/newview/llpipelinelistener.cpp216
-rw-r--r--indra/newview/llpipelinelistener.h41
-rw-r--r--indra/newview/llplacesfolderview.cpp74
-rw-r--r--indra/newview/llplacesfolderview.h72
-rw-r--r--indra/newview/llplacesinventorybridge.cpp50
-rw-r--r--indra/newview/llplacesinventorybridge.h3
-rw-r--r--indra/newview/llplacesinventorypanel.cpp118
-rw-r--r--indra/newview/llplacesinventorypanel.h37
-rw-r--r--indra/newview/llpostcard.cpp1
-rw-r--r--indra/newview/llpreviewscript.cpp6
-rw-r--r--indra/newview/llpreviewtexture.cpp6
-rw-r--r--indra/newview/llproductinforequest.cpp6
-rw-r--r--indra/newview/llprogressview.cpp4
-rw-r--r--indra/newview/llregioninfomodel.cpp14
-rw-r--r--indra/newview/llregioninfomodel.h2
-rw-r--r--indra/newview/llremoteparcelrequest.cpp6
-rw-r--r--indra/newview/llremoteparcelrequest.h2
-rw-r--r--indra/newview/llsaveoutfitcombobtn.cpp4
-rw-r--r--indra/newview/llscreenchannel.cpp140
-rw-r--r--indra/newview/llscreenchannel.h16
-rw-r--r--indra/newview/llscriptfloater.cpp123
-rw-r--r--indra/newview/llscrollingpanelparam.cpp6
-rw-r--r--indra/newview/llscrollingpanelparambase.cpp2
-rw-r--r--indra/newview/llsechandler_basic.cpp2
-rw-r--r--indra/newview/llselectmgr.cpp8
-rw-r--r--indra/newview/llsidepanelappearance.cpp55
-rw-r--r--indra/newview/llsidepanelappearance.h11
-rw-r--r--indra/newview/llsidepanelinventory.cpp22
-rw-r--r--indra/newview/llsidepanelinventory.h2
-rw-r--r--indra/newview/llsidepaneltaskinfo.cpp4
-rw-r--r--indra/newview/llspatialpartition.cpp16
-rw-r--r--indra/newview/llspeakers.cpp210
-rw-r--r--indra/newview/llspeakers.h15
-rw-r--r--indra/newview/llspeakingindicatormanager.cpp46
-rw-r--r--indra/newview/llspeakingindicatormanager.h5
-rw-r--r--indra/newview/llstartup.cpp72
-rw-r--r--indra/newview/llsurface.cpp2
-rw-r--r--indra/newview/llsyswellwindow.cpp346
-rw-r--r--indra/newview/llsyswellwindow.h76
-rw-r--r--indra/newview/lltexturectrl.cpp54
-rwxr-xr-xindra/newview/lltexturefetch.cpp181
-rw-r--r--indra/newview/lltexturefetch.h4
-rw-r--r--indra/newview/lltextureview.cpp14
-rw-r--r--indra/newview/lltoast.h7
-rw-r--r--indra/newview/lltoastgroupnotifypanel.cpp11
-rw-r--r--indra/newview/lltoastgroupnotifypanel.h5
-rw-r--r--indra/newview/lltoastimpanel.cpp4
-rw-r--r--indra/newview/lltoastimpanel.h12
-rw-r--r--indra/newview/lltoastnotifypanel.cpp566
-rw-r--r--indra/newview/lltoastnotifypanel.h31
-rw-r--r--indra/newview/lltoastpanel.cpp40
-rw-r--r--indra/newview/lltoastpanel.h9
-rw-r--r--indra/newview/lltoastscriptquestion.cpp4
-rw-r--r--indra/newview/lltoastscripttextbox.cpp2
-rw-r--r--indra/newview/lltoastscripttextbox.h2
-rw-r--r--indra/newview/lltoolbarview.cpp10
-rw-r--r--indra/newview/lltoolbrush.cpp2
-rw-r--r--indra/newview/lltoolcomp.cpp2
-rw-r--r--indra/newview/lltooldraganddrop.cpp103
-rw-r--r--indra/newview/lltooldraganddrop.h3
-rw-r--r--indra/newview/lltoolfocus.cpp10
-rw-r--r--indra/newview/lltoolgun.cpp2
-rw-r--r--indra/newview/lltoolmorph.cpp1
-rw-r--r--indra/newview/lltoolpie.cpp30
-rw-r--r--indra/newview/lltoolplacer.cpp4
-rw-r--r--indra/newview/lluploadfloaterobservers.cpp5
-rw-r--r--indra/newview/lluploadfloaterobservers.h2
-rw-r--r--indra/newview/llurlhistory.cpp2
-rwxr-xr-x[-rw-r--r--]indra/newview/llviewerassetstats.cpp39
-rwxr-xr-x[-rw-r--r--]indra/newview/llviewerassetstats.h6
-rw-r--r--indra/newview/llviewerassettype.cpp2
-rw-r--r--indra/newview/llviewerattachmenu.cpp2
-rw-r--r--indra/newview/llvieweraudio.cpp7
-rw-r--r--indra/newview/llviewercamera.cpp6
-rw-r--r--indra/newview/llviewerdisplay.cpp11
-rw-r--r--indra/newview/llviewerdisplayname.cpp17
-rw-r--r--indra/newview/llviewerfloaterreg.cpp24
-rwxr-xr-x[-rw-r--r--]indra/newview/llviewerfoldertype.cpp0
-rw-r--r--indra/newview/llviewergesture.cpp6
-rw-r--r--indra/newview/llviewerinventory.cpp415
-rw-r--r--indra/newview/llviewerinventory.h88
-rw-r--r--indra/newview/llviewerjoint.cpp473
-rw-r--r--indra/newview/llviewerjoint.h108
-rw-r--r--indra/newview/llviewerjointmesh.cpp300
-rw-r--r--indra/newview/llviewerjointmesh.h99
-rw-r--r--indra/newview/llviewerkeyboard.cpp11
-rw-r--r--indra/newview/llviewermediafocus.cpp2
-rw-r--r--indra/newview/llviewermenu.cpp172
-rw-r--r--indra/newview/llviewermenu.h9
-rwxr-xr-xindra/newview/llviewermessage.cpp511
-rw-r--r--indra/newview/llviewermessage.h4
-rw-r--r--indra/newview/llviewerobject.cpp16
-rw-r--r--indra/newview/llviewerobject.h2
-rw-r--r--indra/newview/llviewerobjectlist.cpp25
-rw-r--r--indra/newview/llviewerparcelmedia.cpp2
-rw-r--r--indra/newview/llviewerparcelmgr.cpp8
-rw-r--r--indra/newview/llviewerregion.cpp141
-rw-r--r--indra/newview/llviewerregion.h73
-rw-r--r--indra/newview/llviewershadermgr.h1
-rw-r--r--indra/newview/llviewerstats.cpp47
-rw-r--r--indra/newview/llviewerstats.h4
-rwxr-xr-xindra/newview/llviewertexlayer.cpp748
-rw-r--r--indra/newview/llviewertexlayer.h180
-rw-r--r--indra/newview/llviewertexteditor.cpp2
-rw-r--r--indra/newview/llviewertexture.cpp468
-rw-r--r--indra/newview/llviewertexture.h167
-rw-r--r--indra/newview/llviewertexturelist.cpp110
-rw-r--r--indra/newview/llviewertexturelist.h20
-rw-r--r--indra/newview/llviewerwearable.cpp656
-rw-r--r--indra/newview/llviewerwearable.h104
-rwxr-xr-xindra/newview/llviewerwindow.cpp110
-rw-r--r--indra/newview/llviewerwindow.h7
-rw-r--r--indra/newview/llvlcomposition.cpp14
-rwxr-xr-x[-rw-r--r--]indra/newview/llvoavatar.cpp3691
-rwxr-xr-x[-rw-r--r--]indra/newview/llvoavatar.h483
-rwxr-xr-x[-rw-r--r--]indra/newview/llvoavatarself.cpp918
-rw-r--r--indra/newview/llvoavatarself.h100
-rw-r--r--indra/newview/llvograss.cpp2
-rw-r--r--indra/newview/llvoicechannel.cpp12
-rw-r--r--indra/newview/llvoicechannel.h2
-rw-r--r--indra/newview/llvoiceclient.cpp2
-rw-r--r--indra/newview/llvoiceclient.h6
-rw-r--r--indra/newview/llvoicevisualizer.cpp48
-rw-r--r--indra/newview/llvoicevisualizer.h11
-rw-r--r--indra/newview/llvoicevivox.cpp259
-rw-r--r--indra/newview/llvoicevivox.h7
-rw-r--r--indra/newview/llvopartgroup.cpp4
-rw-r--r--indra/newview/llvosky.cpp10
-rw-r--r--indra/newview/llvosurfacepatch.cpp10
-rw-r--r--indra/newview/llvotree.cpp2
-rw-r--r--indra/newview/llvovolume.cpp12
-rw-r--r--indra/newview/llvowlsky.cpp16
-rw-r--r--indra/newview/llwaterparamset.cpp2
-rw-r--r--indra/newview/llwearable.cpp1285
-rw-r--r--indra/newview/llwearableitemslist.cpp12
-rw-r--r--indra/newview/llwearablelist.cpp54
-rw-r--r--indra/newview/llwearablelist.h13
-rw-r--r--indra/newview/llwebsharing.cpp16
-rw-r--r--indra/newview/llwlhandlers.cpp17
-rw-r--r--indra/newview/llwlhandlers.h5
-rw-r--r--indra/newview/llworld.cpp2
-rw-r--r--indra/newview/llworldmap.cpp7
-rw-r--r--indra/newview/llworldmap.h1
-rw-r--r--indra/newview/llworldmapview.cpp7
-rw-r--r--indra/newview/llworldmipmap.cpp16
-rw-r--r--indra/newview/pipeline.cpp78
-rw-r--r--indra/newview/pipeline.h15
-rw-r--r--indra/newview/res/viewerRes.rc8
-rw-r--r--indra/newview/skins/default/colors.xml1592
-rw-r--r--indra/newview/skins/default/textures/bottomtray/Unread_IM.pngbin458 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl1_Dark.pngbin602 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl2_Dark.pngbin669 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_Lvl3_Dark.pngbin639 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_Off_Dark.pngbin547 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/bottomtray/VoicePTT_On_Dark.pngbin526 -> 0 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/Conv_log_inbox.pngbin0 -> 556 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_add_person.pngbin0 -> 373 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_arrow_ne.pngbin0 -> 215 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_arrow_sw.pngbin0 -> 211 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_call_log.pngbin0 -> 546 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_close.pngbin0 -> 275 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_collapse.pngbin0 -> 345 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_expand.pngbin0 -> 342 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_hang_up.pngbin0 -> 459 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_open_call.pngbin0 -> 366 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_plus.pngbin0 -> 144 bytes
-rwxr-xr-xindra/newview/skins/default/textures/icons/Conv_toolbar_sort.pngbin0 -> 230 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/collapse_to_one_line.pngbin0 -> 538 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/expand_one_liner.pngbin0 -> 545 bytes
-rw-r--r--indra/newview/skins/default/textures/icons/nearby_chat_icon.pngbin0 -> 399 bytes
-rw-r--r--indra/newview/skins/default/textures/textures.xml29
-rw-r--r--indra/newview/skins/default/xui/da/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/da/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/de/floater_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/de/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/de/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_camera.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_chat_bar.xml85
-rw-r--r--indra/newview/skins/default/xui/en/floater_conversation_log.xml84
-rw-r--r--indra/newview/skins/default/xui/en/floater_conversation_preview.xml64
-rw-r--r--indra/newview/skins/default/xui/en/floater_destinations.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_container.xml203
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml399
-rw-r--r--indra/newview/skins/default/xui/en/floater_incoming_call.xml58
-rw-r--r--indra/newview/skins/default/xui/en/floater_moveview.xml4
-rw-r--r--indra/newview/skins/default/xui/en/floater_pathfinding_console.xml2
-rw-r--r--indra/newview/skins/default/xui/en/floater_people.xml14
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_chat_volume.xml48
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_controls.xml155
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_effect.xml3
-rw-r--r--indra/newview/skins/default/xui/en/floater_voice_volume.xml59
-rw-r--r--indra/newview/skins/default/xui/en/inspect_avatar.xml100
-rw-r--r--indra/newview/skins/default/xui/en/menu_attachment_other.xml8
-rw-r--r--indra/newview/skins/default/xui/en/menu_attachment_self.xml8
-rw-r--r--indra/newview/skins/default/xui/en/menu_avatar_other.xml8
-rw-r--r--indra/newview/skins/default/xui/en/menu_avatar_self.xml8
-rw-r--r--indra/newview/skins/default/xui/en/menu_cof_gear.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_conversation.xml203
-rw-r--r--indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml142
-rw-r--r--indra/newview/skins/default/xui/en/menu_conversation_log_view.xml45
-rw-r--r--indra/newview/skins/default/xui/en/menu_group_plus.xml4
-rw-r--r--indra/newview/skins/default/xui/en/menu_im_conversation.xml101
-rw-r--r--indra/newview/skins/default/xui/en/menu_im_session_showmodes.xml49
-rw-r--r--indra/newview/skins/default/xui/en/menu_im_well_button.xml16
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_avatar_gear.xml143
-rw-r--r--indra/newview/skins/default/xui/en/menu_inspect_self_gear.xml252
-rw-r--r--indra/newview/skins/default/xui/en/menu_login.xml15
-rw-r--r--indra/newview/skins/default/xui/en/menu_object_icon.xml18
-rw-r--r--indra/newview/skins/default/xui/en/menu_participant_view.xml112
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_blocked_gear.xml26
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_blocked_plus.xml20
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_blocked_view.xml26
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_friends_view.xml (renamed from indra/newview/skins/default/xui/en/menu_people_friends_view_sort.xml)12
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_groups.xml27
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_groups_view.xml (renamed from indra/newview/skins/default/xui/en/menu_people_groups_view_sort.xml)9
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_nearby.xml99
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_nearby_multiselect.xml14
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_nearby_view.xml53
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_nearby_view_sort.xml57
-rw-r--r--indra/newview/skins/default/xui/en/menu_people_recent_view.xml (renamed from indra/newview/skins/default/xui/en/menu_people_recent_view_sort.xml)4
-rw-r--r--indra/newview/skins/default/xui/en/menu_url_agent.xml20
-rw-r--r--indra/newview/skins/default/xui/en/menu_url_objectim.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml176
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml167
-rw-r--r--indra/newview/skins/default/xui/en/panel_activeim_row.xml97
-rw-r--r--indra/newview/skins/default/xui/en/panel_adhoc_control_panel.xml95
-rw-r--r--indra/newview/skins/default/xui/en/panel_avatar_list_item.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_block_list_sidetray.xml163
-rw-r--r--indra/newview/skins/default/xui/en/panel_blocked_list_item.xml71
-rw-r--r--indra/newview/skins/default/xui/en/panel_bottomtray_lite.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_chiclet_bar.xml48
-rw-r--r--indra/newview/skins/default/xui/en/panel_conversation_list_item.xml98
-rw-r--r--indra/newview/skins/default/xui/en/panel_conversation_log_list_item.xml107
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_control_panel.xml109
-rw-r--r--indra/newview/skins/default/xui/en/panel_group_list_item.xml1
-rw-r--r--indra/newview/skins/default/xui/en/panel_im_control_panel.xml166
-rw-r--r--indra/newview/skins/default/xui/en/panel_inbox_inventory.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_landmarks.xml16
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_chat.xml22
-rw-r--r--indra/newview/skins/default/xui/en/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_outbox_inventory.xml25
-rw-r--r--indra/newview/skins/default/xui/en/panel_people.xml929
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_chat.xml693
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_colors.xml4
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_general.xml6
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_privacy.xml226
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml43
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chat_editor.xml4
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_im_adhoc.xml55
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_im_group.xml56
-rw-r--r--indra/newview/skins/default/xui/en/widgets/chiclet_im_p2p.xml56
-rwxr-xr-xindra/newview/skins/default/xui/en/widgets/conversation_view_participant.xml42
-rw-r--r--indra/newview/skins/default/xui/en/widgets/conversation_view_session.xml16
-rw-r--r--indra/newview/skins/default/xui/en/widgets/folder_view_item.xml8
-rw-r--r--indra/newview/skins/default/xui/en/widgets/inbox_folder_view_folder.xml8
-rw-r--r--indra/newview/skins/default/xui/en/widgets/inbox_inventory_panel.xml3
-rw-r--r--indra/newview/skins/default/xui/en/widgets/outbox_folder_view_folder.xml9
-rw-r--r--indra/newview/skins/default/xui/en/widgets/outbox_inventory_panel.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/text.xml1
-rw-r--r--indra/newview/skins/default/xui/en/widgets/toolbar.xml12
-rw-r--r--indra/newview/skins/default/xui/es/floater_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/es/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/es/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/floater_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/fr/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/it/floater_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/it/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/floater_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/ja/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/pl/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/pl/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/floater_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/pt/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/floater_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/ru/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/floater_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/tr/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/menu_im_well_button.xml4
-rw-r--r--indra/newview/skins/default/xui/zh/panel_nearby_chat_bar.xml2
-rw-r--r--indra/newview/tests/llmediadataclient_test.cpp4
-rwxr-xr-x[-rw-r--r--]indra/newview/tests/llviewerassetstats_test.cpp51
-rw-r--r--indra/newview/tests/llviewertexture_stub.cpp34
-rw-r--r--indra/newview/tests/llworldmap_test.cpp6
-rw-r--r--indra/newview/tests/llworldmipmap_test.cpp4
-rw-r--r--indra/newview/viewer_manifest.py2
-rw-r--r--indra/test/CMakeLists.txt4
-rw-r--r--indra/test/io.cpp8
-rw-r--r--indra/test/llpermissions_tut.cpp10
-rw-r--r--indra/test/llsaleinfo_tut.cpp5
-rw-r--r--indra/test/llstreamtools_tut.cpp53
-rw-r--r--indra/test/lltemplatemessagebuilder_tut.cpp3
-rw-r--r--indra/test_apps/llplugintest/CMakeLists.txt5
-rw-r--r--indra/viewer_components/login/CMakeLists.txt4
-rw-r--r--indra/viewer_components/updater/CMakeLists.txt3
-rw-r--r--indra/viewer_components/updater/tests/llupdaterservice_test.cpp1
-rw-r--r--indra/win_crash_logger/CMakeLists.txt4
870 files changed, 50761 insertions, 36602 deletions