summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
Diffstat (limited to 'indra')
-rw-r--r--indra/CMakeLists.txt1
-rw-r--r--indra/cmake/Boost.cmake62
-rw-r--r--indra/cmake/Copy3rdPartyLibs.cmake6
-rw-r--r--indra/cmake/GooglePerfTools.cmake2
-rw-r--r--indra/cmake/LLCommon.cmake2
-rw-r--r--indra/cmake/LLCoreHttp.cmake16
-rw-r--r--indra/cmake/LLPrimitive.cmake8
-rw-r--r--indra/edit-me-to-trigger-new-build.txt1
-rw-r--r--indra/integration_tests/llimage_libtest/llimage_libtest.cpp2
-rw-r--r--indra/integration_tests/llui_libtest/llui_libtest.cpp29
-rw-r--r--indra/linux_updater/linux_updater.cpp2
-rw-r--r--indra/llaudio/llaudioengine.cpp2
-rw-r--r--indra/llcharacter/lleditingmotion.cpp4
-rw-r--r--indra/llcommon/CMakeLists.txt1
-rw-r--r--indra/llcommon/fix_macros.h25
-rw-r--r--indra/llcommon/llapr.h2
-rw-r--r--indra/llcommon/llsdserialize.cpp5
-rw-r--r--indra/llcommon/llstring.cpp3
-rw-r--r--indra/llcommon/llsys.cpp34
-rw-r--r--indra/llcommon/llthread.cpp7
-rw-r--r--indra/llcommon/llthread.h5
-rw-r--r--indra/llcommon/lluri.cpp36
-rw-r--r--indra/llcommon/llversionviewer.h2
-rw-r--r--indra/llcommon/tests/bitpack_test.cpp1
-rw-r--r--indra/llcommon/tests/lluri_test.cpp94
-rw-r--r--indra/llcommon/tests/reflection_test.cpp2
-rw-r--r--indra/llcorehttp/CMakeLists.txt186
-rw-r--r--indra/llcorehttp/_httpinternal.h146
-rw-r--r--indra/llcorehttp/_httplibcurl.cpp373
-rw-r--r--indra/llcorehttp/_httplibcurl.h129
-rw-r--r--indra/llcorehttp/_httpopcancel.cpp73
-rw-r--r--indra/llcorehttp/_httpopcancel.h78
-rw-r--r--indra/llcorehttp/_httpoperation.cpp248
-rw-r--r--indra/llcorehttp/_httpoperation.h262
-rw-r--r--indra/llcorehttp/_httpoprequest.cpp906
-rw-r--r--indra/llcorehttp/_httpoprequest.h219
-rw-r--r--indra/llcorehttp/_httpopsetget.cpp97
-rw-r--r--indra/llcorehttp/_httpopsetget.h83
-rw-r--r--indra/llcorehttp/_httpopsetpriority.cpp63
-rw-r--r--indra/llcorehttp/_httpopsetpriority.h73
-rw-r--r--indra/llcorehttp/_httppolicy.cpp387
-rw-r--r--indra/llcorehttp/_httppolicy.h161
-rw-r--r--indra/llcorehttp/_httppolicyclass.cpp125
-rw-r--r--indra/llcorehttp/_httppolicyclass.h59
-rw-r--r--indra/llcorehttp/_httppolicyglobal.cpp175
-rw-r--r--indra/llcorehttp/_httppolicyglobal.h66
-rw-r--r--indra/llcorehttp/_httpreadyqueue.h124
-rw-r--r--indra/llcorehttp/_httpreplyqueue.cpp107
-rw-r--r--indra/llcorehttp/_httpreplyqueue.h108
-rw-r--r--indra/llcorehttp/_httprequestqueue.cpp161
-rw-r--r--indra/llcorehttp/_httprequestqueue.h141
-rw-r--r--indra/llcorehttp/_httpretryqueue.h94
-rw-r--r--indra/llcorehttp/_httpservice.cpp348
-rw-r--r--indra/llcorehttp/_httpservice.h224
-rw-r--r--indra/llcorehttp/_mutex.h55
-rw-r--r--indra/llcorehttp/_refcounted.cpp45
-rw-r--r--indra/llcorehttp/_refcounted.h126
-rw-r--r--indra/llcorehttp/_thread.h123
-rw-r--r--indra/llcorehttp/bufferarray.cpp352
-rw-r--r--indra/llcorehttp/bufferarray.h137
-rw-r--r--indra/llcorehttp/bufferstream.cpp285
-rw-r--r--indra/llcorehttp/bufferstream.h153
-rw-r--r--indra/llcorehttp/examples/http_texture_load.cpp943
-rw-r--r--indra/llcorehttp/httpcommon.cpp179
-rw-r--r--indra/llcorehttp/httpcommon.h311
-rw-r--r--indra/llcorehttp/httphandler.h88
-rw-r--r--indra/llcorehttp/httpheaders.cpp44
-rw-r--r--indra/llcorehttp/httpheaders.h87
-rw-r--r--indra/llcorehttp/httpoptions.cpp73
-rw-r--r--indra/llcorehttp/httpoptions.h106
-rw-r--r--indra/llcorehttp/httprequest.cpp504
-rw-r--r--indra/llcorehttp/httprequest.h535
-rw-r--r--indra/llcorehttp/httpresponse.cpp91
-rw-r--r--indra/llcorehttp/httpresponse.h161
-rw-r--r--indra/llcorehttp/tests/llcorehttp_test.cpp175
-rw-r--r--indra/llcorehttp/tests/llcorehttp_test.h64
-rw-r--r--indra/llcorehttp/tests/test_allocator.cpp184
-rw-r--r--indra/llcorehttp/tests/test_allocator.h47
-rw-r--r--indra/llcorehttp/tests/test_bufferarray.hpp432
-rw-r--r--indra/llcorehttp/tests/test_bufferstream.hpp304
-rw-r--r--indra/llcorehttp/tests/test_httpheaders.hpp108
-rw-r--r--indra/llcorehttp/tests/test_httpoperation.hpp125
-rw-r--r--indra/llcorehttp/tests/test_httprequest.hpp2670
-rw-r--r--indra/llcorehttp/tests/test_httprequestqueue.hpp186
-rw-r--r--indra/llcorehttp/tests/test_httpstatus.hpp265
-rw-r--r--indra/llcorehttp/tests/test_llcorehttp_peer.py190
-rw-r--r--indra/llcorehttp/tests/test_refcounted.hpp156
-rw-r--r--indra/llcorehttp/tests/testrunner.py265
-rw-r--r--indra/llmath/v3color.h1
-rw-r--r--indra/llmessage/llavatarnamecache.cpp58
-rw-r--r--indra/llmessage/llavatarnamecache.h4
-rw-r--r--indra/llmessage/llcurl.cpp5
-rw-r--r--indra/llmessage/llhttpassetstorage.cpp2
-rw-r--r--indra/llrender/llfontgl.cpp4
-rw-r--r--indra/llrender/llfontgl.h2
-rw-r--r--indra/llrender/llfontregistry.cpp30
-rw-r--r--indra/llrender/llfontregistry.h4
-rw-r--r--indra/llrender/llgl.h4
-rw-r--r--indra/llrender/llrendertarget.cpp15
-rw-r--r--indra/llrender/llvertexbuffer.cpp17
-rw-r--r--indra/llui/llcombobox.cpp3
-rw-r--r--indra/llui/llfloater.cpp18
-rw-r--r--indra/llui/llfloater.h2
-rw-r--r--indra/llui/llfloaterreg.cpp2
-rw-r--r--indra/llui/llnotifications.cpp26
-rw-r--r--indra/llui/llpanel.cpp18
-rw-r--r--indra/llui/llpanel.h2
-rw-r--r--indra/llui/llscrolllistcolumn.cpp3
-rw-r--r--indra/llui/llscrolllistctrl.cpp166
-rw-r--r--indra/llui/llscrolllistctrl.h28
-rw-r--r--indra/llui/lltransutil.cpp13
-rw-r--r--indra/llui/llui.cpp87
-rw-r--r--indra/llui/llui.h5
-rw-r--r--indra/llui/lluicolortable.cpp18
-rw-r--r--indra/llui/lluictrlfactory.cpp55
-rw-r--r--indra/llui/lluictrlfactory.h31
-rw-r--r--indra/llui/llview.cpp12
-rw-r--r--indra/llvfs/lldir.cpp498
-rw-r--r--indra/llvfs/lldir.h100
-rw-r--r--indra/llvfs/lldiriterator.cpp7
-rw-r--r--indra/llvfs/tests/lldir_test.cpp346
-rw-r--r--indra/llwindow/llwindowmacosx.h2
-rw-r--r--indra/llwindow/llwindowsdl.h2
-rw-r--r--indra/llxml/llxmlnode.cpp3
-rw-r--r--indra/newview/CMakeLists.txt21
-rw-r--r--indra/newview/app_settings/settings.xml35
-rw-r--r--indra/newview/featuretable.txt54
-rw-r--r--indra/newview/featuretable_linux.txt52
-rw-r--r--indra/newview/featuretable_mac.txt53
-rw-r--r--indra/newview/featuretable_xp.txt59
-rw-r--r--indra/newview/gpu_table.txt1085
-rwxr-xr-xindra/newview/llagent.cpp9
-rw-r--r--indra/newview/llappcorehttp.cpp192
-rw-r--r--indra/newview/llappcorehttp.h86
-rw-r--r--indra/newview/llappearancemgr.cpp3
-rw-r--r--indra/newview/llappviewer.cpp129
-rw-r--r--indra/newview/llappviewer.h8
-rw-r--r--indra/newview/llappviewerwin32.cpp2
-rw-r--r--indra/newview/llattachmentsmgr.cpp6
-rw-r--r--indra/newview/lldaycyclemanager.cpp2
-rw-r--r--indra/newview/lldirpicker.h2
-rw-r--r--indra/newview/lldrawpoolwlsky.cpp10
-rw-r--r--indra/newview/llface.cpp6
-rw-r--r--indra/newview/llfeaturemanager.cpp46
-rw-r--r--indra/newview/llfeaturemanager.h4
-rw-r--r--indra/newview/llfilepicker.h2
-rw-r--r--indra/newview/llflexibleobject.cpp11
-rw-r--r--indra/newview/llfloaterbvhpreview.cpp21
-rw-r--r--indra/newview/llfloaterhelpbrowser.cpp10
-rw-r--r--indra/newview/llfloateruipreview.cpp122
-rw-r--r--indra/newview/llhints.cpp4
-rw-r--r--indra/newview/llinventorybridge.cpp19
-rw-r--r--indra/newview/lllocalbitmaps.cpp4
-rw-r--r--indra/newview/llmediactrl.cpp30
-rw-r--r--indra/newview/llmenuoptionpathfindingrebakenavmesh.cpp239
-rw-r--r--indra/newview/llmenuoptionpathfindingrebakenavmesh.h (renamed from indra/newview/llpanelpathfindingrebakenavmesh.h)54
-rwxr-xr-xindra/newview/llmeshrepository.cpp34
-rw-r--r--indra/newview/llnamelistctrl.cpp27
-rw-r--r--indra/newview/llnamelistctrl.h18
-rw-r--r--indra/newview/llnotificationmanager.cpp7
-rw-r--r--indra/newview/llpaneleditwearable.cpp10
-rw-r--r--indra/newview/llpanelgroup.h2
-rw-r--r--indra/newview/llpanelgroupgeneral.cpp101
-rw-r--r--indra/newview/llpanelgroupgeneral.h6
-rw-r--r--indra/newview/llpanelgroupinvite.cpp11
-rw-r--r--indra/newview/llpanelgroupinvite.h4
-rw-r--r--indra/newview/llpanelgrouplandmoney.cpp2
-rw-r--r--indra/newview/llpanelgrouproles.cpp54
-rw-r--r--indra/newview/llpanelgrouproles.h2
-rw-r--r--indra/newview/llpanellogin.cpp83
-rw-r--r--indra/newview/llpanelpathfindingrebakenavmesh.cpp278
-rw-r--r--indra/newview/llpreview.cpp17
-rw-r--r--indra/newview/llpreviewscript.cpp2
-rw-r--r--indra/newview/llscreenchannel.cpp40
-rw-r--r--indra/newview/llstartup.cpp5
-rw-r--r--indra/newview/llsyswellwindow.cpp4
-rwxr-xr-xindra/newview/lltexturefetch.cpp2103
-rw-r--r--indra/newview/lltexturefetch.h263
-rw-r--r--indra/newview/lltextureview.cpp44
-rw-r--r--indra/newview/lltoast.cpp2
-rw-r--r--indra/newview/llviewerhelp.cpp6
-rw-r--r--indra/newview/llviewermedia.cpp15
-rw-r--r--indra/newview/llviewermenu.cpp34
-rw-r--r--indra/newview/llviewerobject.cpp13
-rw-r--r--indra/newview/llviewerstats.cpp15
-rw-r--r--indra/newview/llviewertexture.cpp37
-rw-r--r--indra/newview/llviewertexture.h1
-rw-r--r--indra/newview/llviewertexturelist.cpp52
-rwxr-xr-xindra/newview/llviewerwindow.cpp15
-rw-r--r--indra/newview/llvoavatar.cpp25
-rw-r--r--indra/newview/llvovolume.cpp28
-rw-r--r--indra/newview/llwaterparammanager.cpp2
-rw-r--r--indra/newview/llwlhandlers.cpp10
-rw-r--r--indra/newview/llwlparammanager.cpp2
-rw-r--r--indra/newview/macutil_Prefix.h2
-rw-r--r--indra/newview/pipeline.cpp41
-rw-r--r--indra/newview/pipeline.h2
-rw-r--r--indra/newview/skins/default/xui/de/panel_navmesh_rebake.xml6
-rw-r--r--indra/newview/skins/default/xui/de/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/en/menu_object.xml40
-rw-r--r--indra/newview/skins/default/xui/en/menu_viewer.xml10
-rw-r--r--indra/newview/skins/default/xui/en/notifications.xml20
-rw-r--r--indra/newview/skins/default/xui/en/panel_login.xml11
-rw-r--r--indra/newview/skins/default/xui/en/panel_navmesh_rebake.xml45
-rw-r--r--indra/newview/skins/default/xui/en/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/es/panel_navmesh_rebake.xml6
-rw-r--r--indra/newview/skins/default/xui/es/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/fr/panel_navmesh_rebake.xml6
-rw-r--r--indra/newview/skins/default/xui/fr/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/it/panel_navmesh_rebake.xml6
-rw-r--r--indra/newview/skins/default/xui/it/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/ja/panel_navmesh_rebake.xml6
-rw-r--r--indra/newview/skins/default/xui/ja/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/pt/panel_navmesh_rebake.xml6
-rw-r--r--indra/newview/skins/default/xui/pt/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/ru/panel_navmesh_rebake.xml6
-rw-r--r--indra/newview/skins/default/xui/ru/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/tr/panel_navmesh_rebake.xml6
-rw-r--r--indra/newview/skins/default/xui/tr/strings.xml2
-rw-r--r--indra/newview/skins/default/xui/zh/strings.xml2
-rw-r--r--indra/newview/skins/paths.xml10
-rw-r--r--indra/newview/skins/steam/xui/da/strings.xml4483
-rw-r--r--indra/newview/skins/steam/xui/de/strings.xml5018
-rw-r--r--indra/newview/skins/steam/xui/en/strings.xml3761
-rw-r--r--indra/newview/skins/steam/xui/es/strings.xml4925
-rw-r--r--indra/newview/skins/steam/xui/fr/strings.xml5018
-rw-r--r--indra/newview/skins/steam/xui/it/strings.xml4928
-rw-r--r--indra/newview/skins/steam/xui/ja/strings.xml5018
-rw-r--r--indra/newview/skins/steam/xui/pl/strings.xml4340
-rw-r--r--indra/newview/skins/steam/xui/pt/strings.xml4885
-rw-r--r--indra/newview/skins/steam/xui/ru/strings.xml5024
-rw-r--r--indra/newview/skins/steam/xui/tr/strings.xml5025
-rw-r--r--indra/newview/skins/steam/xui/zh/strings.xml4454
-rw-r--r--indra/newview/tests/lldir_stub.cpp2
-rw-r--r--indra/newview/viewer_manifest.py28
-rw-r--r--indra/test/lluuidhashmap_tut.cpp141
-rw-r--r--indra/viewer_components/login/lllogin.cpp10
-rw-r--r--indra/viewer_components/updater/tests/llupdaterservice_test.cpp4
238 files changed, 20027 insertions, 59772 deletions
diff --git a/indra/CMakeLists.txt b/indra/CMakeLists.txt
index 1cebb53a07..24c98bfada 100644
--- a/indra/CMakeLists.txt
+++ b/indra/CMakeLists.txt
@@ -43,6 +43,7 @@ add_subdirectory(cmake)
add_subdirectory(${LIBS_OPEN_PREFIX}llaudio)
add_subdirectory(${LIBS_OPEN_PREFIX}llcharacter)
add_subdirectory(${LIBS_OPEN_PREFIX}llcommon)
+add_subdirectory(${LIBS_OPEN_PREFIX}llcorehttp)
add_subdirectory(${LIBS_OPEN_PREFIX}llimage)
add_subdirectory(${LIBS_OPEN_PREFIX}llkdu)
add_subdirectory(${LIBS_OPEN_PREFIX}llimagej2coj)
diff --git a/indra/cmake/Boost.cmake b/indra/cmake/Boost.cmake
index 2135f0584c..1acb2bbbfd 100644
--- a/indra/cmake/Boost.cmake
+++ b/indra/cmake/Boost.cmake