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

75669 Commits (6ecb0278dbb09e1f91ecabd78b24538d30a04eb6)

Author SHA1 Message Date
Ansariel 6ecb0278db Fix OpenSim build 2024-07-09 09:17:15 +02: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
Ansariel 499a717f62 Remove ancient MSVC7 code 2024-07-08 20:46:45 +02:00
Ansariel 9fdca96f8b Re-enable compiler warnings C4244 and C4396 except for lltracerecording.h and llunittype.h for now 2024-07-08 20:27:14 +02:00
Andrey Lihatskiy 94a66b5584
Merge pull request #1941 from RyeMutt/llpointer-move 
Introduce move assignment and construction to LLPointer
 2024-07-08 19:17:12 +03:00
Rye Mutt 38fdee7673 Introduce move assignment and construction to LLPointer 2024-07-08 11:14:02 -04:00
Andrey Kleshchev 22782a0c68 viewer#1131 Fix gltf editor being a bit spamy 2024-07-08 16:19:39 +03:00
Alexander Gavriliuk d0173ac7fc #1931 Terminate AppViewer immediately in case of initialization failed 2024-07-08 12:16:32 +02:00
Andrey Kleshchev d996497c5e SL-15354 Fixed object IMs not respecting chat settings 2024-07-08 08:15:36 +03:00
Andrey Kleshchev 77a8bd878b viewer#1916 Updated default Chat Window behavior 2024-07-08 07:22:14 +03:00
Ansariel c2b696b6c9 FIRE-34192: Fix (revert) avatar height fudge factor after LL's av height measuring changes have been reverted 2024-07-06 13:36:17 +02:00
Ansariel bb95cee882 Don't create debug log messages for intentional no-op cases 2024-07-06 13:27:23 +02:00
Ansariel 0a0368c232 FIRE-34230: Fix muted avatars showing not showing in italic font in radar (Default font for scroll list cells now is emoji font - which does not support italic apparently) 2024-07-06 13:25:54 +02:00
Ansariel 75aa83aab6 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llmessage/lltemplatemessagedispatcher.cpp
#	indra/newview/llappviewer.cpp
 2024-07-06 12:42:19 +02:00
Ansariel e9b6550c48 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llviewertexture.h
#	indra/newview/llviewertexturelist.cpp
 2024-07-06 11:06:55 +02:00
Alexander Gavriliuk 9ddf64c651 #1931 BugSplat Crash: SecondLifeViewer!LLRenderTarget::release(387) 2024-07-06 08:38:17 +02:00
Ansariel cabf0d60b9 FIRE-33958: Let's see if this fixes the stuck notifications by not removing toasts from the incorrect channel at startup 2024-07-06 04:14:10 +02:00
Andrey Lihatskiy 958f781283
Merge pull request #1930 from RyeMutt/llsd-opts 
Introduce move support and string_view to LLSD
 2024-07-05 19:18:09 +03:00
Rye Mutt 1296afd96a Reduce LLSD::Binary temporaries 2024-07-05 02:56:25 -04:00
Rye Mutt f6d2536e4f Make LLDate a trivial copyable/movable type 2024-07-05 02:56:25 -04:00
Rye Mutt 6cf176900f Add move construction/assignment support for LLSD type 2024-07-05 02:56:25 -04:00
Rye Mutt 7df1edbde1 Introduce move assignment operators for various LLSD types 2024-07-05 02:56:25 -04:00
Rye Mutt 59312bf209 Introduce string_view to LLSD map functions to reduce string temporaries 2024-07-05 02:56:24 -04:00
Andrey Kleshchev b099dbef27 viewer#1131 Sync 'transform' arrows with UI 2024-07-04 08:29:37 +03:00
Dave Parks 08b933a0c6
#1870 Tune up for better experience on integrated intel with low memory (#1872) 
* More deterministic vsize calculation.   Add control for choosing downscale method.
* Quick hack to make GLTF preview work again
 2024-07-03 17:42:24 -05:00
Andrey Kleshchev 9a38ecee8e viewer#1131 gltf model upload UI WIP #4 
Hooked selection to tree view
 2024-07-03 22:21:18 +03:00
Alexander Gavriliuk 32f3107a20 #1917 The 'No emoji selected' message appears and overlaps emoji name 2024-07-03 15:23:19 +02:00
Andrey Kleshchev 42a9690daa viewer-private#247 Porperly reload image when uploading a model 2024-07-03 06:23:50 +03:00
Ansariel 3d9414c1f2 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llui/llfloaterreg.cpp
#	indra/llui/llnotifications.cpp
#	indra/llui/llpanel.cpp
#	indra/llui/llui.cpp
#	indra/llui/lluicolortable.cpp
#	indra/llui/lluicolortable.h
#	indra/newview/llappviewer.h
#	indra/newview/llfloatersidepanelcontainer.cpp
#	indra/newview/llfloatersidepanelcontainer.h
#	indra/newview/llpanelpeoplemenus.cpp
#	indra/newview/llviewermenufile.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2024-07-03 01:11:47 +02:00
cosmic-linden 9af13cce61
Merge pull request #1887 from secondlife/v-1475 
secondlife/viewer#1475: Add test plan for PBR terrain texture transforms UI
 2024-07-02 15:05:01 -07:00
Cosmic Linden 2c46194d70 secondlife/viewer#1475: Add test plan for PBR terrain texture transforms UI 2024-07-02 15:01:55 -07:00
cosmic-linden 51b329cc47
Merge pull request #1902 from secondlife/v-1847 
secondlife/viewer#1847: Add test plan for normal textures on PBR materials
 2024-07-02 14:27:52 -07:00
Cosmic Linden b7ad221f37 secondlife/viewer#1847: Update test plan: Enumerate support for KHR_texture_transform on prims 2024-07-02 14:25:30 -07:00
Andrey Kleshchev b63065486b viewer#1666 Make warning universal to avoid shifting notification 2024-07-02 21:53:43 +03:00
Andrey Kleshchev 1adb94a89c viewer#1666 Allow switching 2k textures off in bulk uploads 2024-07-02 21:53:43 +03:00
Jonathan "Geenz" Goodman b276936ef3
Quick fix for a possible merge bug from featurettes. (#1715) 2024-07-02 11:01:35 -07:00
Beq Janus 2e836ab06f
LL Issue#1835 - Input delays introduced in PBR viewers. (#1889) 2024-07-02 12:59:30 -05:00
Beq Janus 475d0df4c1
Experimental fix for blurry textures (#1875) 
This change removes the distance based bias (which is a large contributor to premature blurring) but adds a check using the importance factor to give some balance.
importance should be between 0 and 1 and is higher when the texture is facing the camera, lower when it is side on,
The unimportance setting defines the cutoff vaklue below which we'll consider the textures worth "down scaling" by the bias factor. The setting is inplace to allow us to play with this, 0.25 is current default.

Note this change moves the calcPixelArea() call to the top BEFORE we user getPixelArea(). Either that call is entirely redundant (i.e. if calc was called earlier in the frame)  or we were using the stale pixelArea (one frame behind). If the former is true then it might be faster to just do an AABB frustum check.
 2024-07-02 12:57:39 -05:00
Andrey Kleshchev 886be2faf1 viewer#1857 Reset texture transforms when terrain PBR is applied 
ctrls aren't dynamically alocated so getChild is preferable, but since other elements use findchild and validy checks used findChild as well
 2024-07-02 19:34:37 +03:00
Andrey Kleshchev cb2795748e viewer#1905 Fix "Share" and "Pay" buttons' state in nearby list 2024-07-02 19:29:38 +03:00
Andrey Lihatskiy b0a6bae589
Merge pull request #1906 from RyeMutt/reduce-llui-stringtemp 
Reduce string temporaries in LLUI part 2
 2024-07-02 19:09:00 +03:00
Ansariel 9a2b83b294 Merge branch 'develop' of https://github.com/secondlife/viewer 
# Conflicts:
#	indra/llcommon/llmemory.cpp
#	indra/llmessage/CMakeLists.txt
#	indra/llmessage/llfiltersd2xmlrpc.cpp
#	indra/newview/lldebugview.cpp
#	indra/newview/lldrawpoolbump.cpp
#	indra/newview/llheroprobemanager.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llslurl.cpp
#	indra/newview/llsurface.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llversioninfo.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/llviewerwindow.cpp
#	indra/newview/llvlcomposition.cpp
#	indra/newview/llvoiceclient.cpp
#	indra/newview/llworld.cpp
#	indra/newview/llxmlrpctransaction.cpp
#	indra/newview/skins/default/xui/da/floater_about.xml
#	indra/newview/skins/default/xui/de/floater_about.xml
#	indra/newview/skins/default/xui/de/menu_viewer.xml
#	indra/newview/skins/default/xui/en/floater_about.xml
#	indra/newview/skins/default/xui/es/floater_about.xml
#	indra/newview/skins/default/xui/es/menu_viewer.xml
#	indra/newview/skins/default/xui/fr/floater_about.xml
#	indra/newview/skins/default/xui/it/floater_about.xml
#	indra/newview/skins/default/xui/it/menu_viewer.xml
#	indra/newview/skins/default/xui/ja/menu_viewer.xml
#	indra/newview/skins/default/xui/pl/menu_viewer.xml
#	indra/newview/skins/default/xui/pt/floater_about.xml
#	indra/newview/skins/default/xui/pt/menu_viewer.xml
#	indra/newview/skins/default/xui/ru/floater_about.xml
#	indra/newview/skins/default/xui/ru/menu_viewer.xml
#	indra/newview/skins/default/xui/tr/floater_about.xml
#	indra/newview/skins/default/xui/tr/menu_viewer.xml
#	indra/newview/skins/default/xui/zh/floater_about.xml
#	indra/newview/skins/default/xui/zh/menu_viewer.xml
#	scripts/messages/message_template.msg.sha1
 2024-07-02 18:08:57 +02:00