Commit Graph

3124 Commits (712a4e70c81c1908e4e7668ff1695a9415ec4b71)

Author SHA1 Message Date
Oz Linden 2efe91ef64 merge changes for 3.8.3-release 2015-08-18 15:05:01 -04:00
Oz Linden 1f23f5a65b merge changes for 3.8.2-release 2015-08-11 11:54:57 -04:00
AndreyL ProductEngine b5378f93b2 Merge viewer-release and become version 3.8.3 2015-08-04 05:00:59 +03:00
Oz Linden 71a468c6fb merge changes for other open sourc contributions 2015-07-30 11:09:00 -04: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
Oz Linden 67edc1edf5 merge 3.8.0-release and correct xml errors caused by reformatting 2015-07-14 16:01:15 -04:00
Merov Linden a82d1242d8 DD-410 : Do not extend inventory selections to items that are not visible 2015-06-11 16:51:24 -07: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
Merov Linden 5cd0e7cf90 Pull merge from lindenlab/viewer-release 2015-05-29 17:11:37 -07:00
simon 316bdc0ab0 Merge viewer-release and become version 3.7.30 2015-06-08 14:54:22 -07:00
Mnikolenko ProductEngine 89321a56fd increment viewer version to 3.7.29 2015-04-28 12:03:31 +03:00
Brad Payne (Vir Linden) 3ae8a821c3 merge 2015-04-24 08:55:20 -04:00
simon a219cf1c98 Merge viewer-release 2015-04-15 15:07:13 -07:00
Merov Linden d631f2fd4d Pull merge from lindenlab/viewer-tools-update (includes viewer-release) 2015-04-14 13:46:01 -07:00
simon 99c5f36f20 Merge viewer-release, become version 3.7.28 2015-04-14 10:46:45 -07:00
Oz Linden 034fb74d05 merge changes for STORM-2113 2015-04-14 05:39:36 -04:00
Oz Linden bef5a95caf minimal changes to compile on Xcode 6.2 2015-04-14 05:00:58 -04: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
Cinder 5a282abe18 STORM-2113 - uri parsing cleanup and fixes 2015-04-11 15:23:06 -06:00
Oz Linden 5c6cf3e7fb restore the ll[io]fstream because we need them as wrappers on Windows for wide char paths; on other platforms they are now just typedefs to the std classes 2015-04-10 11:02:37 -04:00
Merov Linden 8952e81775 Merge lindenlab/viewer-tools-update 2015-04-09 16:51:02 -07:00
Oz Linden 8b42c7898e replace llifstream and llofstream with std::ifstream and std::ofstream respectively 2015-04-07 17:59:28 -04:00
Oz Linden 3a57b18896 convert llifstream and llofstream to std::ifstream and std::ofstream respectively 2015-04-07 17:28:05 -04:00
andreykproductengine bd3ee81e8d Merge with viewer-release and become 3.7.27 2015-03-24 19:52:46 +02:00
Oz Linden d06ac0b7ba merge changes for 3.7.26-release 2015-03-24 11:19:47 -04:00
Oz Linden d6f7a16a68 merge changes for 3.7.26-release 2015-03-23 22:39:18 -04:00
Merov Linden 760941d504 Pull merge from lindenlab/viewer-release 2015-03-23 12:43:44 -07: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
Mnikolenko ProductEngine 59a6827847 MAINT-4973 FIXED Clicking on the green part of links (as opposed to the grey) opens the wrong link in all places apart from in a conversation window or chat toast. 2015-03-13 15:45:28 +02: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
Merov Linden 11d9bf6517 Pull merge from lindenlab/viewer-release 2015-02-27 15:32:37 -08:00
Oz Linden 8e21b24a07 merge changes for 3.7.26-release 2015-03-23 14:34:31 -04:00
Mnikolenko ProductEngine adc48a7eff MAINT-2781 FIXED Reset pressed state on focus lost. 2015-02-27 11:40:57 +02:00
Brad Payne (Vir Linden) 2ab9678455 merge 2015-02-25 17:02:06 -05: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
Oz Linden a91482f0af merge changes for MAINT-4790 2015-02-24 10:46:17 -05:00
Mnikolenko ProductEngine 5724d58f34 MAINT-4847 FIXED Select new texture tab on clicking arrow buttons. 2015-02-12 12:38:16 +02:00
Mnikolenko ProductEngine cccdd1fb39 MAINT-4853 FIXED Pressing the ENTER key when entering a location into the Type a location field, doesn't log you in 2015-01-30 15:36:00 +02:00
Mnikolenko ProductEngine 7bd45ab362 MAINT-4790 WIP Show focused background image for login text fields. 2015-01-19 13:09:24 +02:00
Oz Linden 6f3cf79a3a merge changes for 3.7.24-release 2015-01-13 13:46:45 -05:00
andreykproductengine dbafa3c358 MAINT-4975 FIXED Sender's name is hidden out of view for inventory offer popups and payment popups 2015-03-11 15:56:31 +02:00
Mnikolenko ProductEngine f097c731d6 MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey part of the link always appears. 2015-03-04 13:10:58 +02:00
Mnikolenko ProductEngine bf51454223 MAINT-4169 FIXED grey out all but domain name in SL-links, same as it's done for non-Linden URLs 2015-01-09 12:10:32 +02:00
Mnikolenko ProductEngine 427191118e MAINT-4169 ShowGreyQueryInUrls debug setting was removed and the grey part of the link always appears. 2015-01-19 17:52:06 +02:00