63151d5c6d
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lllineeditor.cpp
# indra/llui/lllineeditor.h
# indra/llui/llurlentry.h
# indra/llui/llurlregistry.cpp
# indra/llui/llurlregistry.h
# indra/newview/llviewerinventory.cpp
# indra/newview/llvoavatarself.h
2023-07-18 00:16:15 +02:00
1aeebcb0cf
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-07-17 23:24:09 +02:00
14e0e1fc4f
Merge branch 'main' of https://github.com/secondlife/viewer
2023-07-17 23:21:01 +02:00
6fdfa1c025
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-07-17 23:20:50 +02:00
4c848c8258
Merge branch 'main' (DRTVWR-580) into DRTVWR-587-maint-V
2023-07-17 23:18:04 +03:00
ec4135da63
Increment viewer version to 6.6.14
...
following promotion of DRTVWR-580
2023-07-17 16:12:39 -04:00
7a77145cd3
FIRE-19959: Fix unindent after } when a previous line had a word wrap
2023-07-17 17:21:13 +02:00
c37140dd89
SL-19995 FIXED The context menu is not fully displayed for the navigation bar
2023-07-17 18:05:10 +03:00
4c89ad5586
SL-19306 A method of displaying user-customized keybindings in user-visible text
2023-07-17 15:46:18 +03:00
d573bc2f92
SL-20011 Restrict 'Empty Trash' if objects are attached
2023-07-15 14:23:44 +03:00
8b89a72195
Merge pull request #279 from secondlife/roxie/SL-20009
...
SL-20009 - race condition - calling cards could be created without name
2023-07-14 11:06:16 -07:00
c70f54095e
Fix some spacing
2023-07-14 10:34:39 -07:00
9a3c76757f
SL-20009 - race condition - calling cards could be created without name
...
This happens when a calling card is created before the name is in the
name cache.
2023-07-13 14:13:24 -07:00
0bc7cee2e1
Merge branch 'brad/SL-19968-vocache-objects-missing' into DRTVWR-587-maint-V ( #273 )
2023-07-12 14:40:29 -07:00
162f10e021
added info log lines for assistance diagnosing SL-19968
2023-07-12 14:18:20 -07:00
2e713ea59d
Merge pull request #213 from secondlife/rm-cxxstd
...
SL-18837: Remove C++17 override, given build-variables change.
2023-07-12 17:19:56 +03:00
73d90aa9dd
SL-18837: Merge branch 'DRTVWR-587-maint-V' into rm-cxxstd.
2023-07-12 10:08:56 -04:00
91b5fbcd66
Merge branch 'DRTVWR-587-maint-V' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/llui/lltabcontainer.cpp
# indra/newview/llagent.cpp
2023-07-12 11:06:47 +02:00
7f2e0b3566
Ewwww! Fake booleans...
2023-07-12 10:04:40 +02:00
e80f0f331d
SL-19986 Crash at LLConversationItemSession::findParticipant
...
Observed on bugsplat, no repro. Something destroys LLConversationItem without cleaning list (some sessions reuse the item, but they aren't supposed to remove it). Either item should inform floater to be properly removed or should be stored as an LLPointer.
2023-07-11 03:10:36 +03:00
6eb96153e6
FIRE-32688 - Area Search Improvements
...
Part 1: These changes prevent some of the aggressive culling that has prevented area search from working. They work best in combination with changes to the aggressive culling that better fit the viewer's memory footprint. These changes are committed separately to make it easier to change them
2023-07-10 01:35:01 +01:00
c04f13968e
Merge remote-tracking branch 'origin/master'
2023-07-10 00:25:29 +01:00
b92f949085
remove commented out old cruft from requirements.txt
2023-07-10 00:24:54 +01:00
2ab51339b1
FIRE-33074 French translation update, by Laurent Bechir - as well as updating all remaining languages ("used RAM")
2023-07-09 23:17:07 +02:00
cbefcf6004
FIRE-32905 - Allow a larger range of fps for limit
...
As 144 Hz is very common and 240 and even 360Hz are feasible it makes no sense to limit this at 120. I have made the upper limit 360 for now. At some point no doubt this will not be good enough but we may need to review the limiting code at that point as it will be increasingly inaccurate given the use of millisecond sleep
2023-07-09 18:19:15 +01:00
dc206c83fc
Update German translation
2023-07-09 13:12:08 +02:00
142781dae7
actually expose used ram properly.
2023-07-09 01:23:46 +01:00
82e80b7726
Revert "Revert changes for FIRE-32453 to try out the fix from LL"
...
This reverts commit c1fbf5e3c2
2023-07-07 21:17:29 +02:00
d80a1dee15
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
2023-07-07 21:16:55 +02:00
2ec61c5e1b
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2023-07-07 21:16:20 +02:00
4aa44bdfc9
SL-19702 restore previous double clicking behavior for objects
2023-07-07 20:30:25 +03:00
d61e6fc7ec
SL-19963 Group Profile's money details have misleading date
2023-07-07 20:26:51 +03:00
79198eddf7
SL-19966 Reverted "SL-18721: Faster viewer shutdown time since performance improvements can lead to perceived inventory loss due to cache corruption"
...
This reverts commit cf692c40b0
2023-07-07 20:26:05 +03:00
f5385a8026
SL-18164 Media type format not shown in the About Land's media tab
2023-07-06 21:51:01 +03:00
5928afda8a
SL-19702 restore previous double clicking behavior for objects ( #266 )
2023-07-06 21:46:19 +03:00
374de322bf
SL-19950 don't try to change fly state if it's not needed
2023-07-05 20:48:54 +03:00
9e703ac967
SL-19716 and SL-19437 viewer_manager
2023-07-05 02:27:42 +03:00
7b47010835
Add memory in use to help about info.
2023-07-03 22:49:19 +01:00
5d863ef500
FIRE-33046 - Reduce logging for experience capability to debug (OpenSim)
2023-07-03 22:48:29 +01:00
71f132cb91
What is this ugly old code?
2023-07-02 19:14:55 +02:00
503baf7013
Curl library expects C style strings for params
2023-07-01 15:25:57 +10:00
bea1bbe955
SL-19565 Prefs Bug when searching in Prefs
2023-06-30 16:09:30 +02:00
3f34acaa18
SL-19816 Home location on world map for invalid locations
2023-06-30 15:12:25 +02:00
076ec3300b
Double lolbug...
2023-06-30 14:26:34 +02:00
4aed82008c
Fix lolbug
2023-06-30 14:25:16 +02:00
fc438607d2
We have a constant for this
2023-06-30 09:26:06 +02:00
8ac1af4aca
Set CURLOPT_USERAGENT in requests (instead of leaving it blank)
2023-06-30 00:16:23 +10:00
e6677a88cd
Merge remote-tracking branch 'origin/master'
2023-06-28 20:41:20 +01:00
0647c1647d
Revert "FIRE-33106 muted objects are not greyed out in the history when shown"
...
This reverts commit 4352952d5f
2023-06-28 20:40:47 +01:00
70149fa44f
Merge branch 'DRTVWR-580-maint-T' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/llpanelprofile.cpp
2023-06-28 14:16:31 +02:00
Ansariel