Commit Graph

127 Commits (dfd3d3f2dc98e778eb984e3dd2bd3a5c63a36e41)

Author SHA1 Message Date
Ansariel e3e8726553 Merge 2016-06-14 14:06:45 +02:00
Ansariel d10a87d6fb FIRE-14223: First-round fix for using mouse scroll while renaming an item moves line editor out of inventory floater: Finish renaming and accept changes when using the scroll wheel (identical behavior to clicking the up/down buttons and Windows Explorer) 2016-06-09 19:12:07 +02:00
Ansariel f68896905b Merge Firestorm LGPL 2016-05-23 16:09:09 +02:00
Ansariel 2889c5bf40 Merge viewer-bear 2016-05-09 17:24:00 +02:00
andreykproductengine b493edd2c3 MAINT-204 Fixed Top folder is expanded when my inventory filter is changed 2016-04-27 18:06:57 +03:00
Ansariel 3192fe832f Merge viewer-quickgraphics 2016-03-08 01:41:31 +01:00
Oz Linden c8726aba30 remove execute permission from many files that should not have it 2015-11-10 09:48:56 -05:00
Ansariel 6c9a672b7e Merge LL Viewer 3.8.2 2015-08-03 20:10:04 +02:00
AndreyL ProductEngine f5d22358d2 MAINT-5432 MAINT-5440 FIXED Crash
in LLUUID::operator==(LLUUID const &) and  LLFolderView::removeSelectedItems()
2015-07-28 09:01:20 +03:00
Ansariel ebf54d4b2d Merge with Viewer-VMM 2015-07-15 14:23:19 +02:00
Merov Linden 5cd0e7cf90 Pull merge from lindenlab/viewer-release 2015-05-29 17:11:37 -07:00
Ansariel 0e2a827873 Merge LL V3.7.30 2015-05-27 00:27:29 +02:00
Nicky 006190f2a1 Merge with tools update. 2015-05-05 13:09:27 +02:00
Brad Payne (Vir Linden) 3ae8a821c3 merge 2015-04-24 08:55:20 -04:00
Merov Linden d631f2fd4d Pull merge from lindenlab/viewer-tools-update (includes viewer-release) 2015-04-14 13:46:01 -07:00
Ansariel 9be423524d Merge LL V3.7.27 2015-04-14 22:08:31 +02:00
Brad Payne (Vir Linden) 32940ee90b merge 2015-04-13 17:19:27 -04:00
Oz Linden a8ef252571 merge changes for 3.7.27-release 2015-04-13 16:23:36 -04:00
Merov Linden 9ba10bf1f2 Merge lindenlab/viewer-tools-update 2015-03-16 09:49:57 -07:00
Brad Payne (Vir Linden) dd7f0e2954 MAINT-4980 WIP - moved canAddWearables() to LLAppearanceMgr 2015-03-13 16:55:19 -04:00
Brad Payne (Vir Linden) fb072c9148 MAINT-4980 WIP - add context menu filtering based on the selection group 2015-03-13 16:38:23 -04:00
Brad Payne (Vir Linden) 64511ce28f SL-103 WIP - comment 2015-03-06 16:05:47 -05:00
Brad Payne (Vir Linden) d44e5b7d9c SL-103 WIP - comment re: possible future work 2015-03-06 15:57:11 -05:00
callum_linden 23711c9275 Rename llround(..) to ll_round(..) because of a collision with MS llround (long long round) in VS2013 2014-12-10 08:44:08 -08:00
andreykproductengine c0ae1fe956 MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected 2014-11-10 17:20:03 +02:00
Ansariel 48fc17d6e1 Merge LL V3.7.16 2015-01-14 17:36:30 +01:00
Ansariel a1fd8230bf Merge LL V3.7.12 2015-01-12 17:56:50 +01:00
andreykproductengine 0ab5b90e4b MAINT-4617 FIXED Viewer chews on "Inventory->Open and Select" until inventory received or recent items selected 2014-10-30 19:02:06 +02:00
Ansariel f4bfb1aadf Merge LL V3.7.9 (AIS3 + SSA) 2014-10-22 02:02:08 +02:00
callum_linden 7359e9300a Update to build on Xcode 6.0: collection of removal of unused const variables [-Wunused-const-variable] 2014-10-17 16:52:32 -07:00
Merov Linden 4b80a5ed05 Pull merge from lindenlab/viewer-release 2014-09-28 21:40:32 -07:00
Merov Linden 87a7eee21d Sync merge with lindenlab/viewer-release 2014-07-22 15:54:53 -07:00
simon d760a6889d Merge downstream code 2014-06-18 19:02:25 -07:00
simon 592024b580 Merge viewer-release and become version 3.7.9 2014-06-17 10:40:42 -07:00
Merov Linden 9c792f03b4 Pull merge from lindenlab/viewer-release 2014-06-17 09:50:48 -07:00
Merov Linden 252ad06b7b DD-84 : Final clean up for this fix 2014-06-04 09:58:11 -07:00
Merov Linden 86d75052f6 DD-84 : Fix all active listing modification actions. Add specific message when listing will unlist. Make update skip consistency check when called from internal level (not public API). 2014-06-03 19:46:33 -07:00
Stinson Linden 8392fde6f6 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-drtvwr-365. 2014-06-02 22:32:16 +01:00
Brad Payne (Vir Linden) 67051b26ba merge 2014-05-19 18:10:45 -04:00
Stinson Linden babd89b770 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2014-05-19 22:19:55 +01:00
andreykproductengine ef26fdca3d MAINT-4072 FIXED Searching object content by typing letters no longer works for non-capitalised names. 2014-05-27 18:56:15 +03:00
Brad Payne (Vir Linden) 7b9708a2e3 sunshine-external merge WIP 2014-05-13 10:02:26 -04:00
Stinson Linden b34cdbaa69 MAINT-4009: Patching a minor leak for when the status text box for the folder view has not been reparented. 2014-05-12 23:43:36 +01:00
simon dc4c184696 Merge downstream version 3.7.8 code 2014-05-07 13:19:05 -07:00
simon 250db74bf9 Pull and merge viewer-release as version 3.7.8 2014-05-07 10:56:41 -07:00
Stinson Linden 001621dfc2 MAINT-4009: Patching a small memory leak for when menu items were being created before the viewer window initialization had created the menu holder. Also, added llasserts in other cases when referencing the menu holder to ensure the holder is non-null. 2014-05-05 23:24:34 +01:00
Xiaohong Bao ae564140c0 Merge 2014-04-22 12:19:28 -06:00
Brad Payne (Vir Linden) d0eb9658f2 merge 2014-04-22 11:19:58 -04:00
simon a5a0a0b136 Merge downstream code 2014-04-21 12:48:50 -07:00
simon 0b9a777bfd Merge downstream code updating version to 3.7.7 2014-04-21 12:36:35 -07:00