Commit Graph

75710 Commits (76f2b1f48c147c19d3370e78b7d0c41d4de33842)

Author SHA1 Message Date
Ansariel 76f2b1f48c Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llfloaterspellchecksettings.h
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
2024-07-16 10:44:38 +02:00
Andrey Kleshchev c8310aaea2 viewer#2006 Fixed terrain textures not updating in the "Region/Estate" floater 2024-07-16 10:17:50 +03:00
TommyTheTerrible 27a2531c5b
Fix: Stop textures from being set as inactive if still on a face. (#2017)
Textures were being set to Inactive even if still in scene, causing them to be deleted and re-decoded in a loop.
2024-07-14 00:39:09 +03:00
Andrey Kleshchev 4bc5c806c7 viewer#1990 Fixed "Main dictionary" option is switching to the previous value 2024-07-12 19:29:07 +03:00
Zi Ree 934021f324
Make image_list_t iterator const (#2010)
gcc complains about this iterator not being const
2024-07-12 19:17:30 +03:00
Zi Ree af93e58192
Initialize array before use (#2011)
gcc detects usage of this array as uninitialized, so make sure it's initialized. I am not sure if this is a legitimate warning, or if the code guarantees the array gets initialized before use in lines 140-142 and this is a performance optimization.
2024-07-12 19:08:56 +03:00
Andrey Kleshchev becdc46bdc viewer#1988 "Set empty" for controls ignores "Apply to all" 2024-07-12 09:05:36 +03:00
cosmic-linden 85b99328e8
Merge pull request #2002 from secondlife/revert-1982-v-1885
Revert "secondlife/viewer#1885: Terrain texture repeats: Remove feature flag dependency on simulator feature in favor of cap"
2024-07-11 12:28:33 -07:00
cosmic-linden cc7a38d9d1 Partially revert "secondlife/viewer#1885: Terrain texture repeats: Remove feature flag dependency on simulator feature in favor of cap" 2024-07-11 12:24:00 -07:00
Dave Parks 98941831e4
Fix for GLTF scenes not uploading (#1994) 2024-07-11 11:36:36 -05:00
Andrey Kleshchev 067c400803 viewer#1253 Viewer tries to detach attachments in inventory on shutdown 2024-07-11 16:58:17 +03:00
Andrey Kleshchev aa3fe3352e viewer#1975 Fixed "Allow Land Resell" option not switching 2024-07-11 10:58:19 +03:00
Andrey Lihatskiy 223114f63d
Update llphysicsextensions_source to v1.0.66e6919 (#1985) 2024-07-11 09:17:02 +03:00
Andrey Kleshchev cecc726134 viewer#1965 Fixed selection swirls swirling forever when the UI is hidden. 2024-07-11 07:20:11 +03:00
Alexander Gavriliuk 52a581a398 #1859 BugSplat Crash: SecondLifeViewer!<lambda>::operator()(61) 2024-07-11 03:20:24 +02:00
cosmic-linden e43c4c78b3
Merge pull request #1982 from secondlife/v-1885
secondlife/viewer#1885: Terrain texture repeats: Remove feature flag dependency on simulator feature in favor of cap
2024-07-10 15:47:31 -07:00
Ansariel Hiller 579a78a8dc
Neither alpha, tattoo nor universal wearable edit panels contain a param list and a main panel (#1978) 2024-07-10 21:54:32 +03:00
Cosmic Linden 95f9946425 secondlife/viewer#1885: Update test plan 2024-07-10 11:34:05 -07:00
Cosmic Linden e0b75e3366 secondlife/viewer#1885: Terrain texture repeats: Remove feature flag dependency on simulator feature in favor of cap 2024-07-10 11:33:49 -07:00
nat-goodspeed 8b59d9bb42
Introduce LLCoros::RMutex, use for SettingsConfig::mRecorderMutex (#1980)
in llerror.cpp.
2024-07-10 10:15:51 -05:00
Alexander Gavriliuk 35246a9503 #1959 BugSplat Crash #1489790: VCRUNTIME140!memcmp(72) 2024-07-10 16:44:55 +02:00
Andrey Kleshchev 94ef434cbf #1932 Fix a case where an IM toast wasn't displayed 2024-07-10 14:24:55 +03:00
Ansariel Hiller 47e2cc271a
Remove orphaned constants gMinVideoRam and gMaxVideoRam (#1970) 2024-07-10 14:02:52 +03:00
Ansariel 68514ab97f Remove duplicate entry in autobuild.xml 2024-07-10 12:39:43 +02:00
Ansariel cb43c1c792 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/llcommon/llprofiler.h
#	indra/llcommon/llthread.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
2024-07-10 12:36:15 +02:00
Ansariel 5a44c9ffed Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus
# Conflicts:
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
2024-07-10 11:22:37 +02:00
Ansariel d730e31e6e Build fix 2024-07-10 11:12:02 +02:00
Ansariel 3548295185 Merge branch 'release/2024.06-atlasaurus' of https://github.com/secondlife/viewer 2024-07-10 10:32:00 +02:00
Ansariel 99396c859d Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/llviewerdisplay.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.cpp
2024-07-10 10:31:35 +02:00
Rye Mutt f8b1d8095e
Update meshoptimizer package to 0.21 (#1948) 2024-07-09 19:51:38 -05:00
Rye Mutt e101d1aa28
Fix excessive clearing of shader cache when toggling mirrors (#1950) 2024-07-09 19:51:02 -05:00
Brad Linden a79e02da0f Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop 2024-07-09 17:43:30 -05:00
Brad Linden b6447dec4c
Merge pull request #1967 from secondlife/1826-llerror-hangs-viewer
#1826 Fix for LL_ERRS crashing in mutex lock
2024-07-09 17:41:15 -05:00
Rye Mutt 2a7030992f
Update tracy profiler to 0.10 (#1946) 2024-07-09 16:53:43 -05:00
Rye Mutt e1b7ac6065
Fix broken hero probe feature table entries (#1951)
* Clean up other feature table warnings
2024-07-09 16:46:15 -05:00
Dave Parks e6e41e71b7
#1943 make sys free in texture console llmemorysavailphysicalmeminkb tell the truth (#1966)
* Also fix for crash when applying MoaP to PBR material
2024-07-09 15:54:18 -05:00
RunitaiLinden d9782cf966 Review feedback change 2024-07-09 15:53:06 -05:00
RunitaiLinden f1f7426d54 #1826 Fix for LL_ERRS crashing in mutex lock 2024-07-09 15:36:00 -05:00
Andrey Kleshchev 21f40280ec viewer#1299 PBR texture stretches when "stretch textures" is unchecked 2024-07-09 18:07:36 +03:00
Ansariel 6ecb0278db Fix OpenSim build 2024-07-09 09:17:15 +02:00
Ansariel 89c1767bd3 Fix build error in llxmlnode.cpp 2024-07-09 07:58:13 +03:00
Ansariel c8089f54f1 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llxmlrpctransaction.cpp
2024-07-09 03:14:21 +02:00
Ansariel 15d0525191 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-07-09 02:26:24 +02:00
Ansariel 088cc2ea35 Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llcommon/llpointer.h
#	indra/llcommon/llqueuedthread.cpp
#	indra/llfilesystem/llfilesystem.cpp
#	indra/llui/llconsole.cpp
#	indra/llui/llkeywords.cpp
#	indra/llui/llstatgraph.cpp
#	indra/llui/llvirtualtrackball.cpp
#	indra/newview/llagentcamera.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/llfloaterimnearbychathandler.cpp
#	indra/newview/llfloatersettingsdebug.cpp
#	indra/newview/llfloatersnapshot.cpp
#	indra/newview/llglsandbox.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llpanelface.cpp
#	indra/newview/llpanelpermissions.cpp
#	indra/newview/llpanelplaceprofile.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llviewermessage.cpp
#	indra/newview/llvocache.cpp
#	indra/newview/llworldmapview.cpp
2024-07-09 02:25:42 +02:00
Andrey Lihatskiy a5a7c7c8f5
Merge pull request #1949 from sldevel/xmlrpc-crash-fix
Fix for crash in XMLRPC reply decoding on login with large inventories
2024-07-09 01:17:22 +03:00
Henri Beauchamp db6fdcf2df Spacing-anality :-D 2024-07-09 00:00:29 +02:00
Andrey Lihatskiy cd5d35ddab
Merge pull request #1945 from Ansariel/develop_msvc7
Remove ancient MSVC7 code
2024-07-09 00:43:36 +03:00
Andrey Lihatskiy f56ef28ccf
Merge pull request #1944 from Ansariel/develop_c4244
Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now
2024-07-09 00:42:36 +03:00
Henri Beauchamp 0df35799a3 Remove a remnant of debug code. 2024-07-08 23:31:43 +02:00
Henri Beauchamp 989cfe2f70 Fix for crash in XMLRPC reply decoding on login with large inventories
Commit 2ea5ac0c43 introduced a crash bug
due to the recursive construction of the XMLTreeNode wrapper class.
The constructor of the said class typically recurses twice as many times
as there are entries in the user's inventory list.

This commit:
- Moves the fromXMLRPCValue() method and its helper functions from the LLSD
  class/module to the LLXMLNode class, where it belongs, thus making
  LLSD::TreeNode (which was a wrapper class to avoid making llcommon
  dependant on llxml, which is still the case after this commit) totally
  moot; the fromXMLRPCValue() call is now done directly on the LLXMLNode.
- Moves the XML and XMLRPC decoding code out of the HTTP coroutine
  LLXMLRPCTransaction::Handler (coroutines got an even smaller and fixed
  stack), and into LLXMLRPCTransaction::Impl::process().
- Removes XMLTreeNode entirely, fixing the crash as a result.
2024-07-08 23:18:02 +02:00