e2e37cced8
Fix line endlings
2024-05-22 22:40:26 +03:00
1b67dd855c
Merge remote-tracking branch 'origin/main' into DRTVWR-600-maint-A
...
# Conflicts:
# autobuild.xml
# indra/cmake/CMakeLists.txt
# indra/cmake/GoogleMock.cmake
# indra/llaudio/llaudioengine_fmodstudio.cpp
# indra/llaudio/llaudioengine_fmodstudio.h
# indra/llaudio/lllistener_fmodstudio.cpp
# indra/llaudio/lllistener_fmodstudio.h
# indra/llaudio/llstreamingaudio_fmodstudio.cpp
# indra/llaudio/llstreamingaudio_fmodstudio.h
# indra/llcharacter/llmultigesture.cpp
# indra/llcharacter/llmultigesture.h
# indra/llimage/llimage.cpp
# indra/llimage/llimagepng.cpp
# indra/llimage/llimageworker.cpp
# indra/llimage/tests/llimageworker_test.cpp
# indra/llmessage/tests/llmockhttpclient.h
# indra/llprimitive/llgltfmaterial.h
# indra/llrender/llfontfreetype.cpp
# indra/llui/llcombobox.cpp
# indra/llui/llfolderview.cpp
# indra/llui/llfolderviewmodel.h
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/lltextbase.cpp
# indra/llui/lltextbase.h
# indra/llui/lltexteditor.cpp
# indra/llui/lltextvalidate.cpp
# indra/llui/lltextvalidate.h
# indra/llui/lluictrl.h
# indra/llui/llview.cpp
# indra/llwindow/llwindowmacosx.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/llappearancemgr.cpp
# indra/newview/llappearancemgr.h
# indra/newview/llavatarpropertiesprocessor.cpp
# indra/newview/llavatarpropertiesprocessor.h
# indra/newview/llbreadcrumbview.cpp
# indra/newview/llbreadcrumbview.h
# indra/newview/llbreastmotion.cpp
# indra/newview/llbreastmotion.h
# indra/newview/llconversationmodel.h
# indra/newview/lldensityctrl.cpp
# indra/newview/lldensityctrl.h
# indra/newview/llface.inl
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llfloateremojipicker.h
# indra/newview/llfloaterimsessiontab.cpp
# indra/newview/llfloaterprofiletexture.cpp
# indra/newview/llfloaterprofiletexture.h
# indra/newview/llgesturemgr.cpp
# indra/newview/llgesturemgr.h
# indra/newview/llimpanel.cpp
# indra/newview/llimpanel.h
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorybridge.h
# indra/newview/llinventoryclipboard.cpp
# indra/newview/llinventoryclipboard.h
# indra/newview/llinventoryfunctions.cpp
# indra/newview/llinventoryfunctions.h
# indra/newview/llinventorygallery.cpp
# indra/newview/lllistbrowser.cpp
# indra/newview/lllistbrowser.h
# indra/newview/llpanelobjectinventory.cpp
# indra/newview/llpanelprofile.cpp
# indra/newview/llpanelprofile.h
# indra/newview/llpreviewgesture.cpp
# indra/newview/llsavedsettingsglue.cpp
# indra/newview/llsavedsettingsglue.h
# indra/newview/lltooldraganddrop.cpp
# indra/newview/llurllineeditorctrl.cpp
# indra/newview/llvectorperfoptions.cpp
# indra/newview/llvectorperfoptions.h
# indra/newview/llviewerparceloverlay.cpp
# indra/newview/llviewertexlayer.cpp
# indra/newview/llviewertexturelist.cpp
# indra/newview/macmain.h
# indra/test/test.cpp
2024-05-22 19:04:52 +02:00
38c2a5bde9
Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge
2024-05-01 08:16:58 +03:00
1b68f71348
#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed
2024-04-29 07:56:09 +03:00
85f2447b3d
Merge branch 'main' into marchcat/a-merge
...
# Conflicts:
# autobuild.xml
# indra/llimage/llimage.cpp
# indra/llui/llsearcheditor.cpp
# indra/llui/llview.cpp
# indra/newview/llagent.cpp
# indra/newview/llappviewer.cpp
# indra/newview/llfloatercamera.cpp
# indra/newview/llfloatereditsky.cpp
# indra/newview/llfloatereditwater.cpp
# indra/newview/llinventoryfunctions.cpp
# indra/newview/lloutfitgallery.cpp
# indra/newview/lloutfitslist.cpp
# indra/newview/llpanelgroupbulkban.cpp
# indra/newview/llsidepanelappearance.cpp
# indra/newview/llvovolume.cpp
2024-04-24 19:28:15 +03:00
428f21cf79
Merge branch 'main' into marchcat/x-merge
2024-04-24 18:45:54 +03:00
60d3dd98a4
Convert remaining BOOL to bool
2024-02-21 23:14:31 +02:00
a5261a5fa8
Convert BOOL to bool in llui
2024-02-21 03:00:25 +02:00
7c8907522f
replace boost library to standard
2024-01-08 23:29:21 +02:00
27dae1d967
Merge branch 'DRTVWR-591-maint-X' into marchcat/591-x-pbr-merge
...
# Conflicts:
# indra/llrender/llgl.cpp
# indra/llrender/llvertexbuffer.cpp
# indra/llui/llflatlistview.cpp
# indra/newview/app_settings/settings.xml
# indra/newview/lldrawpoolground.cpp
# indra/newview/llinventorybridge.cpp
# indra/newview/llinventorygallery.cpp
# indra/newview/llspatialpartition.cpp
# indra/newview/llviewercontrol.cpp
# indra/newview/llviewertexture.cpp
# indra/newview/llvosky.cpp
# indra/newview/skins/default/xui/en/menu_inventory.xml
2023-11-30 13:30:27 +02:00
d0d05ddddf
SL-15039 Prune unused preferences #4
2023-09-27 13:11:12 +03:00
c69c8aa347
SL-18777 PBR upload was stuck waiting for texture
...
Handle obscure upload failure case - floater was waiting for a texture upload indefinetely.
Unblock floater if upload fails.
2022-12-07 02:16:12 +02:00
8631a7a077
Merge with tip of Master after a Viewer release
2021-07-19 14:35:44 -07:00
823f97ac59
SL-15272 Bugsplat crashes at condition wait()
...
Made sure all waits will be triggered, won't loop back and that in case of http queue it had some time to trigger
2021-06-03 21:31:30 +03:00
168d177197
This set of changes reverts the merge with master (git revert c83e740) and results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-09 14:39:51 -08:00
c83e740ef9
Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519"
...
This reverts commit e61f485a0400c47d079f
2021-03-08 13:56:16 +00:00
6be1f88a5e
Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation
2020-09-24 14:45:39 -07:00
38faec3b11
Merge branch 'master' into DRTVWR-519
2020-09-22 13:07:39 -07:00
2e6f516411
Renamed the references to LLVFile and llvfile.* source code plus cmake scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16 21:12:53 -07:00
3fc07dea01
First part of change to remove LLVFS from the Viewer. Consists of code changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-09-16 18:53:24 -07:00
4ebba5b918
SL-13891 Coroutine creation was requested on exit
2020-09-02 17:10:24 +03:00
68b8d2658a
MAINT-6570: Fix bad merge.
2016-09-16 14:38:35 -07:00
a3f63bce3c
MAINT-6534 Resetting scripts via the build menu no longer works on many scripted objects
2016-07-11 16:23:18 +03:00
e2ee3a1519
MAINT-6534 Resetting scripts fails due to small timeout
2016-06-30 16:47:12 +03:00
0597f87646
MAINT-6486: Use literal string. Don't try and look it up.
2016-06-15 13:42:39 -07:00
c8b6628140
Make string ref in HandleScriptUserData const
2016-06-10 13:25:22 -07:00
1e803a6bd7
MAINT-6486: Be sure that all the script queue functions hit all objects and scripts in those objects. Convert from responders and callbacks to coroutines.
2016-06-10 12:33:39 -07:00
9be58e915a
merge with 4.0.3-release
2016-04-04 15:53:09 -04:00
c8726aba30
remove execute permission from many files that should not have it
2015-11-10 09:48:56 -05:00
8913ed6692
Changes from code review with Nat
2015-09-03 16:59:00 -07:00
c08072a050
Moved group experiences into experience cache. Use coros and new HTTP libs.
2015-09-03 11:10:32 -07:00
6c9610b4e4
Move associated experience fetching into the ExperienceCache as a coro remove the responder.
2015-09-02 11:50:26 -07:00
a455759e64
Convert exp floater to use coroutines
...
Convert script queue compilation exp request
2015-08-26 15:50:15 -07:00
7882396811
Remove unused code and llassetuploadresponders files.
2015-07-23 13:06:24 -07:00
37d17eaebd
Remove old "compile queue" and replace with the coroutine based upload queue.
2015-07-20 15:57:10 -07:00
200788c344
Updated all experience responders for LLCurl::Responder interface changes for ACME-1535 and ACME-1536
2014-06-24 22:43:23 +01:00
d331db79c2
Build>Scripts>Recompile Scripts now will skip Experience scripts that the agent
...
can not contribute to and will keep Experience association otherwise.
2014-05-07 16:48:45 -07:00
e340009fc5
second phase summer cleaning
...
replace llinfos, lldebugs, etc with new LL_INFOS(), LL_DEBUGS(), etc.
2013-08-09 17:11:19 -07:00
a2e22732f1
Summer cleaning - removed a lot of llcommon dependencies to speed up build times
...
consolidated most indra-specific constants in llcommon under indra_constants.h
fixed issues with operations on mixed unit types (implicit and explicit)
made LL_INFOS() style macros variadic in order to subsume other logging methods
such as ll_infos
added optional tag output to error recorders
2013-07-30 19:13:45 -07:00
0a96b47663
merge with viewer-release
2013-06-05 19:05:43 -07:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
a52d203a4f
SH-3405 WIP convert existing stats to lltrace system
...
started conversion of llviewerassetstats
removed old, dead LLViewerStats code
made units tracing require units declaration
clean up of units handling
2012-10-17 20:00:07 -07:00
8d2f7a5265
SH-3405 WIP convert existing stats to lltrace system
...
converted all remaining LLViewerStats to lltrace
2012-10-15 19:43:35 -07:00
c06c35609c
Updating linux build to gcc4.6
2012-10-11 00:09:04 +00:00
e478204526
STORM-1833 Square char is presented in list of recompilation for script with error
...
Subtask of STORM-637
2012-04-06 09:04:51 -04:00
439a7df6ba
STORM-637 Scripts Progress windows Missing
2012-01-30 16:12:40 -05:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
124bc854dd
moved buildFloater out of lluictrlfactory to llfloater.cpp
2010-08-16 17:44:23 -07:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Ansariel