Commit Graph

198 Commits (bdc94eac5cda3dd6700a1cd462178b7ac3c4cfec)

Author SHA1 Message Date
Ansariel b61dfd131d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-26 11:36:16 +02:00
Beq 06bde96503 FIRE-30562 [OPENSIM] Add GridStatus support 2022-05-25 02:52:37 +01:00
Beq 8070513312 UI change (checkbox toggle autofps) - Missed from an earlier commit 2022-05-25 00:22:53 +01:00
Ansariel f19311bf7a Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-20 12:45:10 +01:00
Ansariel be25e64888 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-11-16 13:54:22 +01:00
Ansariel ced9423261 Merge branch 'DRTVWR-534' of https://bitbucket.org/lindenlab/viewer 2021-11-16 12:17:26 +01:00
Ansariel 4a69e51a24 Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer 2021-08-23 14:21:10 +02:00
Callum Prentice 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
Mnikolenko Productengine 130e915007 SL-15297 toolbar button is added & changing quality via radio group is handled correctly now 2021-07-21 18:10:25 +03:00
Ansariel 3c1d189bb8 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-06-25 09:26:10 +02:00
Ansariel ea6058baf4 Merge branch 'master' of https://bitbucket.org/lindenlab/viewer 2021-06-25 08:18:59 +02:00
Andrey Kleshchev 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
Ansariel c2addaf78e Merge branch 'DRTVWR-518-ui' of https://bitbucket.org/lindenlab/viewer 2021-04-22 08:15:41 +02:00
Andrey Kleshchev 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
Ansariel fd06acc270 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-02-15 21:22:24 +01:00
Zi Ree f05f7696a8 Better pose stand disabling implementation 2021-02-13 18:50:28 +01:00
Zi Ree e0be68917b FIRE-24147 - Disable pose stand when the avatar is sitting to prevent animation issues 2021-02-07 18:02:49 +01:00
Ansariel 7bc0ad1ea5 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-01-18 19:07:12 +01:00
Ansariel 81d89b5727 Add option to use legacy, smaller camera floater without camera preset controls 2020-12-10 14:25:16 +01:00
Ansariel 62c644a422 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2020-06-17 13:08:37 +02:00
Kitty Barnett fb670069b0 Merge branch 'rlva/development' (v2.2.3 + v2.3.0 - both WIP) 2020-06-12 12:51:11 +02:00
Kitty Barnett 00f561ec80 [FIXED] Toolbar and menu items no longer disable when their matching restrictions are active 2020-05-02 22:28:12 +02:00
Ansariel 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
Kitty Barnett 02c072a0be Merge branch 'appearance/misc' into rlva/feature/eep 2020-03-21 14:56:22 +01:00
Kitty Barnett 57feec9763 Merge branch 'viewer/build' of rlva/development 2020-03-21 11:26:59 +01:00
Dave Houlton 2a6b48c9b0 DRTVWR-440, merge in latest from 6.3.7 release 2020-01-28 17:26:45 -07:00
Kitty Barnett 1ca7b29edf Merge branch 'appearance/misc' into rlva/development 2019-12-27 15:49:47 +01:00
Dave Houlton f61a5c4642 Merge viewer-release 6.3.6 into viewwer-eep repo 2019-12-16 12:47:19 -07:00
Ansariel da365b227e Merge Firestorm LGPL 2019-12-13 18:15:19 +01:00
Ansariel 8f3213d7d4 Merge Firestorm LGPL 2019-12-13 00:14:24 +01:00
AndreyL ProductEngine 216fe3d47f Merged in pe_devs/494-wassail 2019-11-27 22:36:28 +02:00
Ansariel a154630ecd Merge 494-maint-wassail 2019-11-19 21:51:54 +01:00
AndreyL ProductEngine 7ffe8d0a51 SL-11964 Removed SL Share from the viewer 2019-11-13 05:32:05 +02:00
Ansariel 014451229e Merge Firestorm LGPL 2019-09-11 20:22:35 +02:00
Ansariel 9f005065d0 Merge Firestorm LGPL 2019-09-10 23:40:54 +02:00
Graham Linden 3609eabe54 Merge viewer-release 6.3.2 2019-09-10 12:07:01 -07:00
Ansariel 0ddac19941 Merge Firestorm LGPL 2019-09-10 18:35:34 +02:00
Liny 1c8be4e323 Discord rich presence support 2019-09-10 04:24:02 -07:00
Ansariel 4087c4c077 Merge Firestorm LGPL 2019-08-13 20:17:51 +02:00
andreykproductengine f7ad4bdd19 SL-209 Cleanup Merchant Outbox 2019-08-15 19:53:34 +03:00
Ansariel 69f14e2f29 Initial merge of viewer-legacy-profiles
For the time being, use the Firestorm legacy profiles. Can be switched via FSUseOwnProfiles debug setting
2019-07-19 11:21:54 +02:00
Ansariel d82f98180c Merge Firestorm LGPL 2019-07-12 20:13:35 +02:00
Ansariel ccea567c08 Merge viewer-eep 2019-06-19 20:20:14 +02:00
maxim_productengine 25f9dc9b5a SL-10984 [EEP] Add a toolbar button to open My Environments 2019-05-22 18:05:15 +03:00
Angeldark.Raymaker 2a64f28f25 FIRE-16256: Add Avatar Stop Animations button to Toolbar 2019-05-19 18:27:08 +01:00
Ansariel 8dfb7d571e Merge viewer-neko 2019-04-24 21:05:58 +02:00
AndreyL ProductEngine ba90f3a8e4 SL-10994 Removed Facebook In-world Sharing
SL-11024 Fixed Twitter connect failure
2019-04-24 02:24:42 +03:00
maxim_productengine e0b24ee960 SL-10798 FIXED [Legacy Profiles] 'Picks' toolbar button does nothing 2019-03-25 15:38:26 +02:00
Beq 8e46f32d80 move the animesh kill switch to tools 2018-11-28 20:18:46 +00:00
Beq c910adf0e4 Changes to support Animesh kill switch.
removes all Animesh currently in view. Add to world menu. Available in tray
needs an icon TBD
2018-11-19 21:31:53 +00:00