Commit Graph

363 Commits (77f56fa7bf6404ebcda4d17c1229336243fac4cf)

Author SHA1 Message Date
Ansariel 77f56fa7bf Merge branch 'DRTVWR-512' of https://bitbucket.org/lindenlab/viewer 2020-05-31 15:27:02 +02:00
Andrey Kleshchev a01f297612 SL-13148 Implemented wheel support for inworld media 2020-05-27 00:30:52 +03:00
Ansariel fd4b8a7bb1 Merge Firestorm LGPL 2019-11-12 18:45:02 +01:00
AndreyL ProductEngine 5f731d84cb Downstream merge from 494-maint-wassail 2019-11-12 02:37:15 +02:00
AndreyL ProductEngine 84f3b2865f Merged in lindenlab/viewer-release 2019-11-12 00:39:07 +02:00
Ansariel d79b79fbe2 Merge viewer-ordered-shutdown 2019-10-19 03:16:10 +02:00
Ansariel e0004e744e Merge Firestorm LGPL 2019-10-09 22:09:22 +02:00
Nicky 04f9e3cede FIRE-29031; Properly handle nullptr values. 2019-10-06 22:10:07 +02:00
Ansariel e8b426d1c2 Merge viewer-neko 2019-09-11 17:34:55 +02:00
andreykproductengine 37eb735ba7 Merged in lindenlab/viewer-release 2019-09-10 20:30:25 +03:00
andreykproductengine 98b28e5881 SL-11910 [Win] Horizontal scroll 2019-09-10 19:49:15 +03:00
andreykproductengine c61d0f4297 DRTVWR-493 LLUI to LLParamSingleton 2019-08-10 15:31:03 +03:00
Ansariel 529569cdd9 Merge viewer-neko 2019-08-04 12:09:33 +02:00
andreykproductengine 378c54a11a SL-11532 Fixed The object info icon is not shown when hovering the mouse over object 2019-07-05 18:18:43 +03:00
andreykproductengine 30cc3ff01f DRTVWR-493 LLViewerParcelMedia to singleton 2019-06-21 21:31:40 +03:00
andreykproductengine 8369276a49 DRTVWR-493 LLViewerMedia to singleton 2019-06-21 20:55:39 +03:00
Ansariel f92c1ffdb4 Merge viewer-neko 2019-05-21 20:18:40 +02:00
AndreyL ProductEngine 4231762060 Backed out changeset: a1ba5b935f34 2019-05-11 01:40:28 +03:00
AndreyL ProductEngine 83f4b8a775 Backed out changeset: a1ba5b935f34 2019-05-11 01:40:28 +03:00
andreykproductengine c384904675 SL-11153 Remake of SL-9414 2019-05-13 19:47:23 +03:00
Ansariel 2378f3b4b0 Merge Firestorm LGPL 2018-12-21 11:57:54 +01:00
Liny 30dcf14336 Copy paste fail. 2018-12-20 03:59:33 -08:00
Liny 5f6d9bf262 add merge guard to my last commit. 2018-12-20 03:29:46 -08:00
Liny 2fa722d14a Clean up log spam left over from SL-713, MAINT-7709. 2018-12-19 19:28:11 -08:00
Ansariel 0c59f07c3c Sync with upstream 2018-11-15 20:22:11 +01:00
Ansariel 0d7978ecf8 Merge Firestorm LGPL 2018-11-15 20:20:00 +01:00
Ansariel 90ff9e8fb1 Merge viewer-neko 2018-11-14 19:28:16 +01:00
andreykproductengine 88956491c8 SL-9414 Inconsistent hover vs click action when viewed through transparent prims 2018-11-07 18:21:16 +02:00
Ansariel 23fd31faf6 Merge Firestorm LGPL 2018-09-27 11:59:30 +02:00
Ansariel 31cc1ad792 Merge Firestorm LGPL 2018-08-03 01:07:45 +02:00
Ansariel cb20bc0425 Merge viewer-neko 2018-08-01 01:20:01 +02:00
andreykproductengine f7932f32a1 MAINT-8911 'None' Click actions are ignored for attachments 2018-07-27 19:31:36 +03:00
Ansariel 4c4b76ab37 Merge viewer-neko 2018-06-22 22:22:26 +02:00
andreykproductengine 5f890af707 MAINT-8731 Click action to disable clicking objects, per-object in a linkset 2018-06-13 20:28:26 +03:00
Ansariel a2879b80a6 Merge Firestorm LGPL 2018-05-08 17:13:44 +02:00
Ansariel 467843943f Merge axon 2018-04-12 22:14:07 +02:00
Brad Payne (Vir Linden) cc73a1958d SL-704 - more cleanup of dev-relevant comments 2018-04-10 16:36:57 +01:00
Nicky 8a81a43161 Merge. 2018-04-10 11:42:59 +02:00
Nicky da6f3cf16a As per discussion with Nat, replace those calls to getTE who blindly assume getTE will return a valid pointer with getTEref.
In case that assumption would be wrong the viewer will at least blow up in getTEref rather than deferencing a nullptr and limping along with undefined behavior (or odd crashes).
2018-04-03 13:18:19 +02:00
Ansariel 6c2025a81c Merge Firestorm LGPL 2018-03-21 17:42:59 +01:00
Ansariel 69fc05ffbc FIRE-1396: Make right-click on transparent objects optional via FSEnableRightclickOnTransparentObjects debug setting 2018-03-20 20:01:01 +01:00
Ansariel fc9500e411 Merge Firestorm LGPL 2018-01-16 20:29:02 +01:00
Ansariel 746c48773a FIRE-1396: Allow selecting transparent objects via right-click 2018-01-16 09:20:51 +01:00
Ansariel 0669906f4b Merge axon 2018-01-04 15:53:22 +01:00
Brad Payne (Vir Linden) b0e47ec2c2 SL-713, MAINT-7709 - experimental setting to allow left-click interaction with animesh. Disabled by default. Still doesn't work in all cases and has significant performance impact 2017-12-19 13:33:54 +00:00
Ansariel 13ea9a242a Merge Firestorm LGPL 2017-10-11 20:30:12 +02:00
Brad Payne (Vir Linden) 299592e88e merge 2017-10-11 14:16:39 +01:00
Ansariel 01d8e7e347 Merge axon 2017-09-20 01:09:14 +02:00
Ansariel 615336a4d4 Merge viewer-neko 2017-09-07 21:49:12 +02:00
Ansariel 7c97b96d5d Merge viewer-neko 2017-08-30 20:00:53 +02:00