67813450af
First Omnifilter implementation - Can block chat, dialogs, teleport offers, friendship, etc. based on content rather than just owner or sender.
2025-12-10 18:51:15 +01:00
f82e171a30
Merge branch 'release/2025.04.1' of https://github.com/secondlife/viewer
...
# Conflicts:
# indra/newview/app_settings/commands.xml
# indra/newview/llfloateravatarwelcomepack.cpp
# indra/newview/llfloateravatarwelcomepack.h
# indra/newview/llstartup.cpp
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/llviewerwindow.cpp
# indra/newview/skins/default/xui/en/menu_viewer.xml
# indra/newview/skins/default/xui/en/strings.xml
2025-06-13 19:39:16 +02:00
d8db0ff30c
First commit - bare bones of it working - pointing to test page on S3
2025-06-03 17:50:15 -07:00
c085682b54
Primfeed integration V1
...
baseline Primfeed authentication/authorisation - working
chat interception login authentication - working
Primfeed Integration - WiP Authorisation connect/disconnect - working
Primfeed post photo support - working
Clean up ready for release
2025-05-19 23:24:32 +01:00
7a311a285f
[FIRE-35039] Add flag to show/hide the on-screen console
...
Added new persist boolean to settings.xml called FSShowOnscreenConsole to enable/disable the drawing of the on-screen console.
Updated menu_viewer.xml to have new check option under Comm called Show On-screen Console with a Shift+` shortcut key combo to toggle the new flag.
Updated panel_preferences_chat.xml to also have a "Show on-screen console" check box tied to the new flag.
Updated commans.xml Chat to have an extra check box linked to the FSShowOnscreenConsole to allow it to also change the new flag.
Updated llviewmenu.cpp to include callback functions to check and set/toggle the new menu choice.
2025-01-01 07:44:47 -04:00
305d999c49
Restructure a bit
2024-10-24 20:20:04 +02:00
529d3427bb
FIRE-30873: Add menu item, strings & command
2024-09-10 12:48:44 +01:00
08d8965271
Fix debug setting name FSAutoTuneFPS -> AutoTuneFPS (and sync unused floater_performance.xml with upstream)
2023-08-28 13:03:41 +02:00
85504f085e
Merge branch 'master' into DRTVWR-539
2022-09-21 18:36:49 +03:00
b61dfd131d
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546
2022-05-26 11:36:16 +02:00
06bde96503
FIRE-30562 [OPENSIM] Add GridStatus support
2022-05-25 02:52:37 +01:00
8070513312
UI change (checkbox toggle autofps) - Missed from an earlier commit
2022-05-25 00:22:53 +01:00
b33e18585d
Merge branch 'master' into DRTVWR-483
2021-12-26 14:00:00 +02:00
2c3fb3d59b
Merge branch 'master' into DRTVWR-539
2021-12-20 14:15:49 +02:00
f19311bf7a
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-12-20 12:45:10 +01:00
be25e64888
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-11-16 13:54:22 +01:00
ced9423261
Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer
2021-11-16 12:17:26 +01:00
4a69e51a24
Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer
2021-08-23 14:21:10 +02:00
0c89e67eb5
DRTVWR-534: Batch of modifications to 360 capture project after moving from internal repo to public one.
2021-08-20 08:28:48 -07:00
638fe87576
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/llpanelpicks.cpp
# indra/newview/llpanelpicks.h
# indra/newview/llviewerfloaterreg.cpp
2021-07-23 07:10:26 +03:00
130e915007
SL-15297 toolbar button is added & changing quality via radio group is handled correctly now
2021-07-21 18:10:25 +03:00
3c1d189bb8
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-06-25 09:26:10 +02:00
ea6058baf4
Merge branch 'master' of https://bitbucket.org/lindenlab/viewer
2021-06-25 08:18:59 +02:00
79f8c024c3
SL-15363 how_to on older viewers is forced to persist
...
Older how_to floater is not set to persist in between sessions and gets stuck, ranamed new how_to into guidebook to avoid the issue
2021-06-09 19:48:19 +03:00
c2addaf78e
Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer
2021-04-22 08:15:41 +02:00
8cd5d7c58a
SL-14906 More adjustments to guidebook
...
The Guidebook should remember it's open/closed state between sessions.
The Guidebook button should show as pressed while the Guidebook is open.
2021-04-17 00:36:10 +03:00
fd06acc270
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-02-15 21:22:24 +01:00
f05f7696a8
Better pose stand disabling implementation
2021-02-13 18:50:28 +01:00
e0be68917b
FIRE-24147 - Disable pose stand when the avatar is sitting to prevent animation issues
2021-02-07 18:02:49 +01:00
7bc0ad1ea5
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2021-01-18 19:07:12 +01:00
81d89b5727
Add option to use legacy, smaller camera floater without camera preset controls
2020-12-10 14:25:16 +01:00
62c644a422
Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
2020-06-17 13:08:37 +02:00
fb670069b0
Merge branch 'rlva/development' (v2.2.3 + v2.3.0 - both WIP)
2020-06-12 12:51:11 +02:00
00f561ec80
[FIXED] Toolbar and menu items no longer disable when their matching restrictions are active
2020-05-02 22:28:12 +02:00
40b39f9990
Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-eep
...
# Conflicts:
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-23 18:13:29 +02:00
4cf4243573
Merge branch 'master' into DRTVWR-483
...
# Conflicts:
# indra/newview/CMakeLists.txt
# indra/newview/llviewerfloaterreg.cpp
# indra/newview/skins/default/xui/de/floater_preview_texture.xml
# indra/newview/skins/default/xui/es/floater_preview_texture.xml
# indra/newview/skins/default/xui/fr/floater_preview_texture.xml
# indra/newview/skins/default/xui/it/floater_preview_texture.xml
# indra/newview/skins/default/xui/ja/panel_edit_classified.xml
# indra/newview/skins/default/xui/ja/panel_me.xml
# indra/newview/skins/default/xui/ru/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/floater_picks.xml
# indra/newview/skins/default/xui/tr/floater_preview_texture.xml
# indra/newview/skins/default/xui/tr/panel_edit_classified.xml
# indra/newview/skins/default/xui/tr/panel_me.xml
# indra/newview/skins/default/xui/zh/floater_preview_texture.xml
2020-04-21 15:37:25 +03:00
02c072a0be
Merge branch 'appearance/misc' into rlva/feature/eep
2020-03-21 14:56:22 +01:00
57feec9763
Merge branch 'viewer/build' of rlva/development
2020-03-21 11:26:59 +01:00
d956c866cf
Merge branch 'master' into DRTVWR-483
2020-02-05 18:33:53 +02:00
2a6b48c9b0
DRTVWR-440, merge in latest from 6.3.7 release
2020-01-28 17:26:45 -07:00
1ca7b29edf
Merge branch 'appearance/misc' into rlva/development
2019-12-27 15:49:47 +01:00
f61a5c4642
Merge viewer-release 6.3.6 into viewwer-eep repo
2019-12-16 12:47:19 -07:00
da365b227e
Merge Firestorm LGPL
2019-12-13 18:15:19 +01:00
8f3213d7d4
Merge Firestorm LGPL
2019-12-13 00:14:24 +01:00
c32a970cea
Merged in lindenlab/viewer-release
2019-12-13 00:19:53 +02:00
216fe3d47f
Merged in pe_devs/494-wassail
2019-11-27 22:36:28 +02:00
a154630ecd
Merge 494-maint-wassail
2019-11-19 21:51:54 +01:00
7ffe8d0a51
SL-11964 Removed SL Share from the viewer
2019-11-13 05:32:05 +02:00
014451229e
Merge Firestorm LGPL
2019-09-11 20:22:35 +02:00
9f005065d0
Merge Firestorm LGPL
2019-09-10 23:40:54 +02:00
Zi Ree