livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
74,579 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

131 Commits (b84b5bd949f447b3700aff42c5dfd1350c147599)

Author SHA1 Message Date
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
 2024-05-01 12:30:57 +02:00
Andrey Lihatskiy 38c2a5bde9 Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge 2024-05-01 08:16:58 +03:00
Andrey Lihatskiy 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
Ansariel b527620dfc Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-04-24 19:53:03 +02:00
Andrey Lihatskiy 428f21cf79 Merge branch 'main' into marchcat/x-merge 2024-04-24 18:45:54 +03:00
Ansariel 45dc1a63f0 Merge branch 'DRTVWR-599-maint-Z' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llprimitive/lldaeloader.cpp
#	indra/llui/lllayoutstack.cpp
#	indra/llui/llnotifications.h
#	indra/llui/lltoolbar.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llagent.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterimcontainer.cpp
#	indra/newview/llfloaterimnearbychathandler.h
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llpaneloutfitsinventory.h
#	indra/newview/llsidepanelappearance.h
#	indra/newview/lltoolbarview.cpp
 2024-01-12 14:18:34 +01:00
AiraYumi 7c8907522f replace boost library to standard 2024-01-08 23:29:21 +02:00
Ansariel c06fa64758 Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-ll-master 
# Conflicts:
#	indra/llrender/llgl.cpp
#	indra/llrender/llvertexbuffer.cpp
#	indra/llui/llflatlistview.cpp
#	indra/newview/lldrawpoolground.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorygallery.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvosky.cpp
 2023-12-01 13:10:11 +01:00
Andrey Lihatskiy 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
Ansariel 48d2534cef Merge branch 'DRTVWR-591-maint-X' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llchannelmanager.cpp
#	indra/newview/llcompilequeue.cpp
#	indra/newview/lldrawpoolground.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llimprocessing.cpp
#	indra/newview/llvieweraudio.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewerobject.cpp
 2023-09-27 20:16:00 +02:00
Andrey Kleshchev d0d05ddddf SL-15039 Prune unused preferences #4 2023-09-27 13:11:12 +03:00
Ansariel afde13580c Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.gitignore
 2023-02-01 10:26:07 +01:00
Ansariel 018e260ce6 Clean this up for our yoinking friends... 2023-01-28 13:12:26 +01:00
Ansariel 4d8c434846 Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/app_settings/shaders/class1/deferred/fullbrightF.glsl
#	indra/newview/lldynamictexture.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llpreviewscript.cpp
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewercontrol.cpp
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/pipeline.cpp
 2022-12-08 12:18:18 +01:00
akleshchev 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
Callum Prentice 8631a7a077 Merge with tip of Master after a Viewer release 2021-07-19 14:35:44 -07:00
Ansariel 826ee26272 Merge branch 'DRTVWR-521-maint' of https://bitbucket.org/lindenlab/viewer 2021-06-08 19:55:43 +02:00
Ansariel 0382c73f9d Merge branch 'DRTVWR-516-maint' of https://bitbucket.org/lindenlab/viewer 2021-06-08 14:31:00 +02:00
Andrey Kleshchev 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
Andrey Kleshchev 96cbe52803 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-05-21 20:52:08 +03:00
Callum Prentice 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
Brad Payne (Vir Linden) c83e740ef9 Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into DRTVWR-519" 
This reverts commit e61f485a04, reversing
changes made to 00c47d079f.
 2021-03-08 13:56:16 +00:00
Ansariel 6b6b116fd4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-03-03 00:20:02 +01:00
Callum Prentice 6be1f88a5e Complete the change from lldiskcache -> llfilesystem and then addition of new lldiskcache implementation 2020-09-24 14:45:39 -07:00
Callum Prentice 38faec3b11 Merge branch 'master' into DRTVWR-519 2020-09-22 13:07:39 -07:00
Callum Prentice 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
Callum Prentice 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
Ansariel fe10f171d3 Merge branch 'DRTVWR-503-maint' of https://bitbucket.org/lindenlab/viewer 
# Conflicts:
#	indra/llmessage/llcoproceduremanager.cpp
#	indra/newview/llinventorypanel.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/skins/default/xui/en/panel_main_inventory.xml
#	indra/newview/skins/default/xui/en/strings.xml
 2020-09-09 19:34:33 +02:00
Andrey Kleshchev 4ebba5b918 SL-13891 Coroutine creation was requested on exit 2020-09-02 17:10:24 +03:00
Ansariel 24854fbc39 Improvements to script queue logging 2017-01-23 11:55:03 +01:00
Ansariel de4a40dcef FIRE-20765: Recompile scripts not working on OpenSim 2017-01-23 10:45:44 +01:00
Ansariel fd76f1f2db Apply changes of compile queue to LLFloaterDeleteQueue 2016-10-21 19:22:21 +02:00
Ansariel db2d9db8ac Sync llcompilequeue.cpp with upstream 2016-10-18 20:08:17 +02:00
Ansariel f77c99c6ef FIRE-20242: Crash trying to run a script 2016-10-18 20:00:26 +02:00
Ansariel de620eaa4d Cleanup LLFloaterCompileQueue 2016-10-11 21:18:22 +02:00
Nicky d85f8fea7e Merge. 2016-09-27 00:29:01 +02:00
Rider Linden 68b8d2658a MAINT-6570: Fix bad merge. 2016-09-16 14:38:35 -07:00
Ansariel b9b0b15e53 FIRE-19892: When LSL preprocessor is enabled, recompiling experience enabled scripts disables the experience 2016-08-17 18:54:45 +02:00
Ansariel dd7d05ba7d Sync with upstream 2016-07-13 11:00:29 +02:00
Ansariel 2a54ae7e59 Make parameter naming consistent and update translations 2016-07-13 10:33:15 +02:00
Ansariel 067b1c232e Merge viewer-lynx 2016-07-13 10:16:47 +02:00
andreykproductengine a3f63bce3c MAINT-6534 Resetting scripts via the build menu no longer works on many scripted objects 2016-07-11 16:23:18 +03:00
Ansariel 9385341546 Add translation fixes 2016-07-04 16:21:12 +02:00
Ansariel ef301cbf66 Merge viewer-lynx 2016-07-04 16:20:14 +02:00
andreykproductengine e2ee3a1519 MAINT-6534 Resetting scripts fails due to small timeout 2016-06-30 16:47:12 +03:00
Rider Linden 0597f87646 MAINT-6486: Use literal string. Don't try and look it up. 2016-06-15 13:42:39 -07:00
Ansariel 461609b1ac Double the timeout for object inventory fetch in compile queue 2016-06-15 10:55:33 +02:00
Ansariel e35b39d9c9 Fix crash during script recompilation and fix other translations on the way 2016-06-15 10:50:25 +02:00
Ansariel c43be9d39b Merge viewer-lynx 2016-06-15 10:04:29 +02:00
Rider Linden c8b6628140 Make string ref in HandleScriptUserData const 2016-06-10 13:25:22 -07:00