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

650 Commits (85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9)

Author SHA1 Message Date
Andrey Lihatskiy 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
Alexander Gavriliuk f815b015ce secondlife/jira-archive-internal#69593 Avatar is upside down when viewed from below 2024-03-26 19:06:30 +01:00
Andrey Kleshchev 3d14450133 triage#100 Fix invalid interest mode 
Agent needs these strings before values were initialized so made values
a bit more global.
 2024-02-22 01:32:14 +02:00
Ansariel 60d3dd98a4 Convert remaining BOOL to bool 2024-02-21 23:14:31 +02:00
Lars Næsbye Christensen 9e854b697a misc: BOOL to bool 2024-02-17 12:23:07 +02:00
Lars Næsbye Christensen 2b31dad400 miscellaneous: BOOL (int) to real bool 2024-02-12 23:17:22 +02:00
Andrey Lihatskiy e3e1672ac4 Merge branch 'DRTVWR-599-maint-Z' into release/maint-yz 
# Conflicts:
#	indra/newview/llchiclet.h
 2024-02-05 22:04:40 +02:00
Alexander Gavriliuk 44f509a319 SL-20752 Mouselook no longer allows pitch upwards to full 90 degrees 2024-01-10 15:35:50 +01:00
Ansariel ba74152c82 Replace BOOST_FOREACH with standard C++ range-based for-loops 2024-01-09 20:44:50 +02:00
Andrey Lihatskiy aed6313d7c Merge branch 'main' into DRTVWR-594-maint-Y 2023-12-18 06:33:57 +02:00
Andrey Lihatskiy c409236dac Merge branch 'DRTVWR-594-maint-Y' into marchcat/594-y-pbr-merge 
# Conflicts:
#	indra/newview/llinventorygallery.cpp
#	indra/newview/skins/default/xui/en/notifications.xml
 2023-11-30 18:09:29 +02:00
Andrey Lihatskiy d1c0a5b840 Merge branch 'DRTVWR-559' into marchcat/587-v-pbr-merge 
# Conflicts:
#	indra/llcommon/CMakeLists.txt
#	indra/newview/llspatialpartition.cpp
#	indra/newview/llviewergenericmessage.cpp
#	indra/newview/llvoavatar.cpp
 2023-11-29 10:45:43 +02:00
Mnikolenko Productengine bfcc7a92b3 SL-20564 reset camera when teleporting Home, so avatar points to the expected direction 2023-11-20 21:52:11 +02:00
Andrey Lihatskiy d4123ec30d Merge branch 'main' into DRTVWR-587-maint-V 
# Conflicts:
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llvovolume.cpp
 2023-10-03 19:25:19 +03:00
Andrey Kleshchev 7d50a51434 Merge branch 'main' (DRTVWR-567) into DRTVWR-559 
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloaternewfeaturenotification.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsidepaneltaskinfo.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
#	indra/newview/skins/default/xui/en/menu_inventory.xml
 2023-10-03 19:00:33 +03:00
Andrey Kleshchev 3d73a10da3 Merge branch main (DRTVWR-582) into DRTVWR-567 
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
 2023-08-23 22:40:17 +03:00
Andrey Lihatskiy d08859f3f4 Merge branch 'main' into DRTVWR-587-maint-V 
# Conflicts:
#	autobuild.xml
 2023-08-23 22:28:01 +03:00
Brad Linden c6d5f11f63 Merge remote-tracking branch 'origin/main' into DRTVWR-559 2023-08-23 12:26:14 -07:00
Andrey Kleshchev 0b85c05f8e SL-20145 New inventory feature notification 
Pulled in relevant parts from SL-19929
 2023-08-21 19:51:04 +03:00
Andrey Kleshchev 4287020859 SL-19929 Minimize feature conflicts with gltf viewer 2023-08-18 19:21:31 +03:00
Andrey Kleshchev d32e685d96 SL-19929 Small rework of a 'feature' notification 
To make multiple parallel features possible
 2023-08-18 18:53:11 +03:00
Brad Linden ae63ed51aa Merge remote-tracking branch 'origin/xcode-14.3' into DRTVWR-559 (#292) 2023-07-18 14:38:18 -07:00
Maxim Nikolenko 374de322bf SL-19950 don't try to change fly state if it's not needed 2023-07-05 20:48:54 +03:00
Andrey Kleshchev d3233e787a SL-19929 New inventory feature notification should appear on top 2023-07-03 23:29:26 +03:00
Alexander Gavriliuk 3f34acaa18 SL-19816 Home location on world map for invalid locations 2023-06-30 15:12:25 +02:00
Andrey Kleshchev f149b87fcc SL-19929 New inventory feature notification 2023-06-29 23:54:27 +03:00
Alexander Gavriliuk 247f6ae06f SL-19286 Avatar is upside down when viewed from below 2023-06-07 19:49:45 +02:00
Nat Goodspeed 7d05ade3f1 SL-18330: Merge branch 'main' of secondlife/viewer into xcode-14.3 2023-06-01 09:56:41 -04:00
Andrey Lihatskiy b9cd6e2e84 Merge branch 'xcode-14.3' into DRTVWR-582-maint-U 
# Conflicts:
#	indra/llcommon/llsdserialize.h
 2023-05-26 06:15:49 +03:00
Nat Goodspeed b61ea595b5 SL-18837: Clean up more set-but-unused variables for Xcode 14.3 2023-05-19 17:33:27 -04:00
simon 81f1be6710 sl-19676 - 360 Intereset list mode. Changed mode to be a string for 
future expansion instead of a bool toggle
 2023-05-13 04:10:28 +01:00
simon 4173cae021 sl-19676 - more loading stats and 360 Interest List mode work 2023-05-11 01:16:42 +01:00
Brad Linden 369945b45d Merge remote-tracking branch 'origin/DRTVWR-539' into DRTVWR-559-merge-539 2023-04-26 15:38:47 -07:00
Dave Parks 8d263197f0 SL-19371 Fix for occlusion culling getting stuck after teleport. 2023-03-13 11:16:23 -05:00
Dave Parks 4ec8844f01 DRTVWR-559 Fix for occlusion culling going off the rails when settings change -- remove LLPipeline::resetVertexBuffers and add a sanity check to how long we wait for a query to be "available". 2023-02-27 10:42:53 -06:00
Dave Parks 830cb6b665 SL-19148 Decruft some forward shaders and drawpools. Fix HUDs being in wrong color space. 2023-02-03 17:18:39 -06:00
Maxim Nikolenko 6cbe17305c SL-18991 FIXED Autotune starts too early after login-in 2023-01-19 15:55:44 +02:00
Mnikolenko Productengine 553a98723b Merge branch 'main' into DRTVWR-539 
# Conflicts:
#	doc/contributions.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/skins/default/colors.xml
 2022-12-13 08:05:03 +02:00
Mnikolenko Productengine 717b34f53f Merge branch 'master' into DRTVWR-539 
# Conflicts:
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llviewercontrol.cpp
 2022-10-21 14:42:53 +03:00
Andrey Lihatskiy 97b676b60f Merge branch 'master' into DRTVWR-565-maint-P 2022-10-20 21:43:54 +03:00
Mnikolenko Productengine 3098d315a3 SL-18202 remove old autofps 2022-09-23 16:49:47 +03:00
Andrey Lihatskiy 26c8883bb7 Merge remote-tracking branch 'origin/SL-18119' into DRTVWR-548-maint-N 2022-09-22 19:13:13 +03:00
Brad Payne (Vir Linden) 3994101549 SL-18119 - more ViewerStats logs for NUX 2022-09-21 20:52:27 +01:00
Mnikolenko Productengine 85504f085e Merge branch 'master' into DRTVWR-539 2022-09-21 18:36:49 +03:00
Andrey Lihatskiy b5861e58cb Merge branch 'master' into DRTVWR-565-maint-P 2022-09-15 20:43:02 +03:00
Andrey Kleshchev 0fa8fbc4a7 SL-16156 Fix exit crash in 360 snapshot floater 2022-09-08 22:58:55 +03:00
Andrey Kleshchev bc26931482 SL-17908 No left and right events when both held down 
Reverts part of SL-15746
 2022-08-05 19:44:54 +03:00
Mnikolenko Productengine b0e9840648 Merge branch 'master' into DRTVWR-539 2022-06-29 21:03:15 +03:00
Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint 
# Conflicts:
#	autobuild.xml
#	indra/cmake/LLCommon.cmake
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
 2022-05-27 02:51:33 +03:00
Mnikolenko Productengine 79c9a8a4b7 Merge branch 'DRTVWR-546' into DRTVWR-539 2022-04-26 16:03:03 +03:00