Commit Graph

68389 Commits (69a31fad4caabec61e4a5e4094de63620ab4da66)

Author SHA1 Message Date
Mnikolenko Productengine ace1b6b858 SL-17270 FIXED Torn-off menus not getting update after operation 2022-04-23 01:19:05 +03:00
Ansariel 8dc785c484 Starlight? Wat dat? 2022-04-22 10:59:08 +02:00
Ansariel d86107490c What's this? 2022-04-22 10:51:44 +02:00
PanteraPolnocy 1287656ff4 Starlight/Latency removal post-cleanup 2022-04-22 09:51:58 +02:00
PanteraPolnocy 01bb88cabb FIRE-31596 Updated Russian translation, by Romka Swallowtail 2022-04-22 09:09:12 +02:00
PanteraPolnocy 63d3de6877 FIRE-31595 French translation update, by Laurent Bechir 2022-04-22 09:07:24 +02:00
Nicky 6612f142dd Remove unmaintained latency skin. 2022-04-22 08:01:10 +02:00
Nicky a89f29a343 Remove unmaintained starlight skin. 2022-04-22 07:47:39 +02:00
Andrey Kleshchev ffdc04f5d2 SL-17040 Crash due to LLWord not existing
LLWord should persist till the end due to wide usage.
2022-04-21 22:58:30 +03:00
Andrey Kleshchev cf7bc4406e SL-17159 Crash initializing LLInstanceTrackerPrivate 2022-04-21 20:43:50 +03:00
Ansariel 15354e86ba Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer 2022-04-21 14:27:51 +02:00
Ansariel e7a5b0984b Stop implementing crashes, LL! 2022-04-20 20:36:05 +02:00
PanteraPolnocy 1e660e59f3 Updated Polish translation 2022-04-20 19:11:27 +02:00
Ansariel c3062e0e82 Merge branch 'DRTVWR-550-mfa' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/viewer_components/login/lllogin.cpp
2022-04-20 17:20:53 +02:00
Ansariel 717c31b77f Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-20 17:18:46 +02:00
Ansariel a2742afe99 Fix crash in legacy search 2022-04-20 15:57:09 +02:00
Ansariel f999ed25ef Squeeze avatar UUID into profile for now 2022-04-20 15:46:50 +02:00
Ansariel ab0fb9f839 Restore online status in profiles 2022-04-20 15:35:21 +02:00
Ansariel bca1892803 Merge branch 'DRTVWR-483' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/newview/llgrouplist.cpp
#	indra/newview/lllocalbitmaps.cpp
#	indra/newview/lllocalbitmaps.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/skins/default/xui/en/floater_profile.xml
#	indra/newview/skins/default/xui/en/panel_edit_profile.xml
#	indra/newview/skins/default/xui/en/panel_profile_secondlife.xml
2022-04-20 15:08:09 +02:00
Ansariel 0afd0f0028 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-20 13:08:41 +02:00
Andrey Lihatskiy c944641900 SL-17240 slvoice notarization fix 2022-04-20 02:14:27 +03:00
Mnikolenko Productengine fb4aab3144 SL-17246 Fix getSharedPrt typo 2022-04-20 00:51:13 +03:00
Mnikolenko Productengine 9e2cdf5cc2 SL-17242 Use proper cap for setting pathfinding attributes 2022-04-20 00:49:58 +03:00
Andrey Lihatskiy 4c799c9646 SL-15507 Post-merge fix 2022-04-20 00:21:49 +03:00
Ansariel 35e9be41ff Fix indentation 2022-04-19 21:58:18 +02:00
Ansariel 9cd3e0e996 Update German translation 2022-04-19 21:56:14 +02:00
Ansariel f990515d35 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloaterhoverheight.cpp
#	indra/newview/llfloatermap.cpp
#	indra/newview/llfloatermap.h
#	indra/newview/llfloaterworldmap.cpp
#	indra/newview/llnetmap.cpp
#	indra/newview/llnetmap.h
#	indra/newview/llworldmapview.cpp
#	indra/newview/skins/default/colors.xml
#	indra/newview/skins/default/xui/en/menu_mini_map.xml
2022-04-19 21:50:14 +02:00
Andrey Kleshchev e0c4304e4a Restored SL-15400, it got lost in an automatic merge
Pausing clouds should not pause water
2022-04-19 21:15:58 +03:00
Andrey Kleshchev 8c96cd3599 SL-15312 Group sorting and highlights
1. Highlight shared groups by using bold font
2. Sort shared groups to be at the front
2022-04-19 21:10:52 +03:00
Ansariel f9f11a7782 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 18:40:01 +02:00
Ansariel 08e171247e Update German translation 2022-04-19 18:38:16 +02:00
Ansariel fbb6b25677 Merge branch 'DRTVWR-486' of https://bitbucket.org/lindenlab/viewer 2022-04-19 18:36:48 +02:00
Ansariel 459a8861cf Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 17:36:39 +02:00
Ansariel d64cda29bf Update German translation 2022-04-19 16:06:39 +02:00
Ansariel 9dee43cf46 Re-apply SL-15400 Menu item "Pause Clouds" should not pause water 2022-04-19 16:03:50 +02:00
Ansariel a775b9fc7f Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-04-19 15:49:47 +02:00
Ansariel b8b0c8ec3b Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 15:42:14 +02:00
Ansariel 0cdd55fd24 Update German translation 2022-04-19 15:29:59 +02:00
Ansariel ac2ee57edb Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/cmake/Copy3rdPartyLibs.cmake
#	indra/cmake/FMODSTUDIO.cmake
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/lllocationinputctrl.h
#	indra/newview/llnavigationbar.cpp
#	indra/newview/llnavigationbar.h
#	indra/newview/viewer_manifest.py
#	indra/viewer_components/login/lllogin.cpp
2022-04-19 15:27:35 +02:00
Ansariel 2daf0cb2fd Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfloatersearch.cpp
#	indra/newview/llgroupactions.cpp
#	indra/newview/llvovolume.cpp
2022-04-19 14:24:09 +02:00
Ansariel c1a4be7dae Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/Boost.cmake
#	indra/llappearance/lltexlayer.cpp
#	indra/llinventory/llparcel.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvovolume.cpp
2022-04-19 13:21:52 +02:00
Ansariel 1aaa765d26 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 12:33:48 +02:00
Mnikolenko Productengine 2445525cc5 SL-17231 Copying textures should be disabled if object content was not yet updated 2022-04-19 02:33:59 +03:00
Ansariel ad0aa3422f Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2022-04-19 00:23:41 +02:00
Ansariel 07040f7eb0 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-04-19 00:15:01 +02:00
Andrey Lihatskiy b5406352e9 DRTVWR-548 post-merge build fix 2022-04-19 00:01:52 +03:00
Andrey Kleshchev ce4c694b66 Merge branch master (D540) into DRTVWR-546
# Conflicts:
#	indra/llcommon/llsdutil.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/lldrawpoolalpha.cpp
#	indra/newview/lldrawpoolwater.cpp
2022-04-18 23:42:39 +03:00
Andrey Kleshchev ea0c810d2d SL-15312 Small tweaks for profiles 2022-04-18 23:39:21 +03:00
Brad Kittenbrink e9921e77b0 Merge remote-tracking branch 'origin/master' into DRTVWR-550-mfa 2022-04-18 13:29:25 -07:00
Andrey Kleshchev 8a39aaa3a4 SL-15312 Legacy profiles remake #10
Fixed Typo
changed 'show in search' checkbox into combobox, implemented commit
Fixed fl textbox setting sl text instead of fl text
Fixed fl save/discard buttons not following resize
2022-04-18 22:21:58 +03:00