Commit Graph

183 Commits (b18f328c08a0af7032c24843cf1d045eea73ad33)

Author SHA1 Message Date
Andrey Lihatskiy 7f19c512c9 Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
#	indra/newview/app_settings/settings.xml
2021-06-25 00:54:35 +03:00
Andrey Kleshchev 2351809b5c SL-14796 Resolved encountered merge issue 2021-02-04 18:04:42 +02:00
Andrey Kleshchev 1b21cc8ffb SL-14372 Changes to parcel properties should not pause or ask about music unless url changed 2020-11-25 14:25:30 +02:00
Andrey Kleshchev f554fe2ca7 SL-10326 Allow selecting any movable avatars with 'Allow Select Avatar' option 2020-07-10 23:51:39 +03:00
Andrey Kleshchev a6b3b98e52 SL-12898 Added https to allowed audio links 2020-04-30 22:11:34 +03:00
Dave Houlton 2a6b48c9b0 DRTVWR-440, merge in latest from 6.3.7 release 2020-01-28 17:26:45 -07:00
Dave Houlton dc1453af9c Merge in from viewer-release 6.3.5 2019-11-13 16:46:27 -07:00
AndreyL ProductEngine 5f731d84cb Downstream merge from 494-maint-wassail 2019-11-12 02:37:15 +02:00
andreykproductengine e29b3605c3 SL-11315 Viewer asks to play media and retains selected choice 2019-09-05 17:15:57 +03:00
andreykproductengine 30cc3ff01f DRTVWR-493 LLViewerParcelMedia to singleton 2019-06-21 21:31:40 +03:00
Graham Linden 470d1595cc Merge viewer-release 2019-05-08 09:30:39 -07:00
Rider Linden 2401712d10 SL-9660: Next pass cleanup. Removed and downgraded a number of logs. Removed refs to LAPAS. Better sync with legacy regions. 2019-02-20 15:20:30 -08:00
andreykproductengine c7a7503b2c SL-10096 ParcelPropertiesRequest is sent too often when terraforming or hover tooltips are On 2018-11-27 18:51:53 +02:00
andreykproductengine 4f6037a823 SL-3404 Named log output for easier debugging and testing 2018-11-19 19:20:57 +02:00
andreykproductengine bda785e8b1 SL-10033 [EEP] Use fast environment transition for teleports 2018-11-12 20:11:00 +02:00
maxim_productengine aa43ddf674 SL-9808 [EEP] Don't update environment each time we receive parcel info after hovering any parcel 2018-10-05 16:48:49 +03:00
Rider Linden cae08e0096 SL-9661: Trigger an event when the settings on a parcel or region are changed. Environment panel montiors this event and updates itself when it occurs. 2018-09-19 15:31:23 -07:00
maxim_productengine d1f746ff7f SL-9656 FIXED EEP viewer crash after opening About Land and then right-clicking a Day Cycle in Inventory 2018-09-14 15:47:52 +03:00
andreykproductengine bb52cdf4f0 SL-1307 EEP At startup viewer does not recognize what parcel you are on. 2018-09-13 18:36:47 +03:00
Rider Linden b50d546d5f MAINT-7699: More robust cap protocol, better support for delete and support for individual tracks, support for setting environment by asset id in the cap
MAINT-7703: Initial flags sent in message protocol for parcels
2018-08-03 16:13:22 -07:00
Rider Linden 294793b9a9 MAINT-8821: Tighten up floater. Allow apply from gear menu. 2018-07-10 15:15:47 -07:00
Rider Linden 2f655d117a Request environment when parcel settings are changed. 2018-06-18 15:48:48 -07:00
Nat Goodspeed fe64db61d6 Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2017-05-22 21:30:26 -04:00
Nat Goodspeed e2b56c9bba DRTVWR-418: Eliminate reference to LLParcelSelection::sNullSelection. 2017-03-30 16:13:26 -04:00
Rider Linden cee83074e9 Backed out changeset: 87661f6ec809 2017-03-13 14:47:28 -07:00
Rider Linden 988f624f01 MAINT-7196: Revers flag when sent to viewer (to correctly mask when value isn't sent) 2017-03-13 14:16:37 -07:00
Rider Linden 880be86cf2 MAINT-7196: Viewer changes supporting new Allow Access Override opition for estate owners. 2017-03-10 15:07:55 -08:00
andreykproductengine ccff36c8ee MAINT-7009 backing out changeset 638ac620a500 (MAINT-4576) 2016-12-19 20:06:11 +02:00
Oz Linden 9be58e915a merge with 4.0.3-release 2016-04-04 15:53:09 -04:00
Rider Linden b8c1976460 Merge 2016-03-17 13:14:21 -07:00
Oz Linden 31f3db0291 merge changes for DRTVWR-417 2016-03-16 13:08:06 -04:00
andreykproductengine 30f9287645 MAINT-2199 reverted previous change, refixed missing cloud and ban line 2016-03-03 00:15:33 +02:00
andreykproductengine 3ae2ffad75 MAINT-6042 FIXED Audio/Media automatically starts playing again after clicking "Stop All" 2016-02-01 16:42:30 +02:00
andreykproductengine 6c218c076b MAINT-6042 region crossing in any form should trigger music check 2016-01-25 18:50:57 +02:00
andreykproductengine dab96aad7f MAINT-6042 FIXED Regular agent-parcel updates should not restart stopped audio 2016-01-24 23:54:46 +02:00
andreykproductengine f26f1ca0f4 MAINT-6042 FIXED Audio/Media automatically starts playing again after clicking "Stop All" 2016-01-14 17:26:17 +02:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Rider Linden 96bb17f20b Merge 2015-08-25 11:40:36 -07:00
Rider Linden 9f2302bdff Merge 2015-07-01 08:47:50 -07:00
andreykproductengine 79ffc6569b Merge from viewer-relese and become version 3.8.1 2015-07-01 14:40:05 +03:00
Oz Linden 949942c730 merge changes for 3.7.29-release 2015-06-08 16:33:02 -04:00
andreykproductengine 2684c53690 Merge from viewer-relese and become version 3.8.1 2015-07-02 14:50:23 +03:00
Rider Linden 5fbd84a210 Parcel Media and Viewer Parcel Mgr to generic coroutines. 2015-05-18 14:15:51 -07:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
Mnikolenko ProductEngine bb87365c37 Merge viewer-release, become version 3.7.29 2015-04-28 13:36:35 +03:00
simon a219cf1c98 Merge viewer-release 2015-04-15 15:07:13 -07:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
andreykproductengine 00f18efe75 MAINT-5063 FIXED SLurl display text shows name of parcel in adjacent region when mousing over parcel after region crossing 2015-04-08 17:05:47 +03:00
Nat Goodspeed b5324afb6f Automated merge with ssh://bitbucket.org/lindenlab/viewer-release 2015-02-24 21:02:12 -05:00
Oz Linden 905431cf60 merge changes for 3.7.25-release 2015-02-24 15:48:28 -05:00