Commit Graph

78 Commits (ff8dcc23bfde402feb4c33b74194852a730bf5bb)

Author SHA1 Message Date
Mnikolenko Productengine 85504f085e Merge branch 'master' into DRTVWR-539 2022-09-21 18:36:49 +03:00
Andrey Lihatskiy b33e18585d Merge branch 'master' into DRTVWR-483 2021-12-26 14:00:00 +02:00
Mnikolenko Productengine 2c3fb3d59b Merge branch 'master' into DRTVWR-539 2021-12-20 14:15:49 +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
Andrey Lihatskiy 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
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
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
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
Andrey Lihatskiy 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
Andrey Lihatskiy d956c866cf Merge branch 'master' into DRTVWR-483 2020-02-05 18:33:53 +02:00
Dave Houlton 2a6b48c9b0 DRTVWR-440, merge in latest from 6.3.7 release 2020-01-28 17:26:45 -07:00
Dave Houlton f61a5c4642 Merge viewer-release 6.3.6 into viewwer-eep repo 2019-12-16 12:47:19 -07:00
AndreyL ProductEngine c32a970cea Merged in lindenlab/viewer-release 2019-12-13 00:19:53 +02:00
AndreyL ProductEngine 216fe3d47f Merged in pe_devs/494-wassail 2019-11-27 22:36:28 +02:00
AndreyL ProductEngine 7ffe8d0a51 SL-11964 Removed SL Share from the viewer 2019-11-13 05:32:05 +02:00
AndreyL ProductEngine 8e82f50a76 Merged in lindenlab/viewer-release 2019-09-10 23:31:38 +03:00
Graham Linden 3609eabe54 Merge viewer-release 6.3.2 2019-09-10 12:07:01 -07:00
andreykproductengine f7ad4bdd19 SL-209 Cleanup Merchant Outbox 2019-08-15 19:53:34 +03:00
maxim_productengine 25f9dc9b5a SL-10984 [EEP] Add a toolbar button to open My Environments 2019-05-22 18:05:15 +03:00
maxim_productengine e0b24ee960 SL-10798 FIXED [Legacy Profiles] 'Picks' toolbar button does nothing 2019-03-25 15:38:26 +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
Mnikolenko ProductEngine 67edb011b5 MAINT-7104 Flash toolbar when grid status page is updated 2017-02-14 13:37:45 +02:00
Mnikolenko ProductEngine 85c24a489d MAINT-7104 Add Grid status floater and toolbar button 2017-02-06 13:04:22 +02:00
andreykproductengine 0d223368d1 MAINT-6748 Add Report Abuse as new Toolbar entry 2016-10-04 16:41:17 +03:00
AndreyL ProductEngine b25a22a2c1 Merged in lindenlab/viewer-release 2016-05-19 23:02:37 +03:00
Mnikolenko Productengine c1a56f9fb7 MAINT-1057 FIXED Cannot get focus for or close build floater using toolbar button when editing attachments in no-build area 2016-04-27 10:58:44 +03:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Merov Linden 6b8916e760 DD-170 : Handle 503 answer from SLM and added a MARKET_MERCHANT_NOT_MIGRATED state to the UI, showing only the relevant UI to the user (i.e. Merchant Outbox or Marketplace Listings). 2014-10-05 20:17:29 -07:00
Merov Linden f8098d2b0f DD-174 : WIP : Use the correct icon for the marketplace listing FUI (toolbar) button 2014-10-02 21:51:54 -07:00
Merov Linden 87a7eee21d Sync merge with lindenlab/viewer-release 2014-07-22 15:54:53 -07:00
Merov Linden ea5a154691 DD-49 : Add FUI button for Marketplace Listings 2014-04-15 14:55:40 -07:00
Merov Linden 5c82aca910 Merge pull from lindenlab/viewer-release 2014-02-10 20:12:41 -08:00
Merov Linden a4f121f065 Pull merge from lindenlab/viewer-release 2013-12-12 09:03:21 -08:00
Cho 9108354e9d Renamed floater_social to floater_facebook for ACME-1205 2013-12-05 00:28:28 +00:00
Oz Linden 52ec6f9af0 remove excessively complex fixes for MAINT-2914 and MAINT-3142 2013-11-26 15:09:55 -05:00
Cho 9946965c4d replaced Flickr and Twitter FUI icons for ACME-1181 2013-11-12 20:07:54 +00:00
Cho 86442d1f8b added Flickr and Twitter FUI buttons for ACME-1179 2013-11-12 01:43:00 +00:00
simon 64c5afa196 Merge latest viewer-release with FBC 2013-10-23 14:14:36 -07:00
dmitrykproductengine f8e5ae8006 MAINT-3142 FIXED Hover over highlighting broken in Second Life 3.6.6 (280797) 2013-10-04 14:04:31 +03:00
dmitry 48f702029f MAINT-2914 FIXED Mousing over UI elements does not make them light up 2013-08-02 18:00:08 +03:00
Merov Linden 90b5bd5148 ACME-645 : Implement the Facebook FUI button. No code, all xml wizardry... 2013-07-01 15:06:30 -07:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
maksymsproductengine edeeed9541 CHUI-531 FIXED Poor fps in CHUI viewer 2012-11-21 01:41:49 +02:00
AlexanderP ProductEngine 7ba6111d91 CHUI-190 (Remove the Voice Settings floater): removed the menu item "Communicate > Voice settings" and the FUI button (headphones) from the Toybox (Toolbox). I left a floater in the project to be able to reconnect it to a different location. 2012-10-02 21:32:23 +03:00
Merov Linden c238027dd9 CHUI-139 : Use the Chat toolbar button to open and close the conversations multi floater. Force Nearby Conversation if floater is empty. 2012-06-14 16:47:43 -07:00
Jonathan Yap 065edd19d6 STORM-1808 Fix wrong name in xml file 2012-02-19 16:20:47 -05:00
Jonathan Yap 566bbe7e09 STORM-1808 Recode so build button is not clickable when grayed out 2012-02-19 14:06:32 -05:00
Jonathan Yap 1f5c2c056f STORM-1808 Indicate ability to build 2012-02-08 18:25:35 -05:00
Leslie Linden 97a2663cf9 EXP-1745 FIX -- removed the merchant outbox from the toolbox 2011-12-19 11:25:14 -08:00
Leslie Linden 570d02dc7e Initial merchant outbox button 2011-11-29 16:57:37 -08:00