Commit Graph

32814 Commits (680194deaf7a35caaa629abc16e886d71baff636)

Author SHA1 Message Date
Aura Linden 800409bdfc Maint-3135 Discovered apple made this change in 10.6.8 not 10.7.0 2014-02-18 14:11:17 -08:00
Mnikolenko ProductEngine d1afaf594d MAINT-3735 FIXED Image names are changed 2014-02-18 17:45:58 +02:00
Mnikolenko ProductEngine ee9973ac8e MAINT-3720 Timestamp are added to Places->Teleport History. It is only shown for today and yesterday. 2014-02-18 15:29:35 +02:00
Merov Linden d2b604c611 Pull merge from lindenlab/viewer-release 2014-02-17 14:15:00 -08:00
Monty Brandenberg acb265a394 Merge. Refresh from viewer-release after 3.7.1 release. 2014-02-14 18:49:33 -05:00
Callum Prentice 0f66498c9a MAINT-3675 NUI:Login screen (Work in Progress) Fix text wrapping on First Login 2014-02-14 15:36:01 -08:00
Callum Prentice efe0fa5d64 MAINT-3675 NUI:Login screen (Work in Progress) 2014-02-14 14:58:21 -08:00
Merov Linden 63e7c0c131 Pull merge from viewer-release 2014-02-14 14:26:27 -08:00
Merov Linden fef6ec72f0 Pull merge from lindenlab/viewer-acme 2014-02-14 14:25:44 -08:00
Cho 7bab501b81 Reduced intensity of light leak on Lens Flare filter for ACME-1277 2014-02-14 22:05:44 +00:00
Oz Linden ce7e19d33a increment viewer version to 3.7.2 2014-02-14 16:00:45 -05:00
Oz Linden cb9e53414d Added tag 3.7.1-release for changeset dcb4981ce255 2014-02-14 16:00:45 -05:00
Merov Linden fc4efd1847 ACME-1277 : Delete debug printouts spamming the log 2014-02-14 09:42:57 -08:00
Drake Arconis 254728e00d OPEN-203 dummy commit to satisfy mercurial 2014-02-14 12:21:07 -05:00
Callum Prentice 0f8828edb5 Fixing line endings after cut/paste 2014-02-13 17:10:50 -08:00
Callum Prentice 95f859dc22 Merge with viewer-release 2014-02-13 16:16:24 -08:00
Callum Prentice c5fff11a76 MAINT-3675 NUI:Login screen (Work in Progress) 2014-02-13 16:10:52 -08:00
Richard Linden a347267cf1 cleaned up llmanipscale logic for readability...no change in functionality 2014-02-13 15:35:21 -08:00
Merov Linden cce9595826 Pull merge from lindenlab/viewer-acme 2014-02-13 15:17:37 -08:00
Merov Linden a5366f06ed ACME-1277 : Final set of filters, added a SnapshotFiltersEnabled debug setting 2014-02-13 15:15:05 -08:00
Dave Parks bfe520387e MAINT-2876 Fix for freeze when editing certain rigged meshes at high altitude. 2014-02-13 17:03:36 -06:00
Cho 170b5aed71 Updated test filters 2014-02-13 19:54:58 +00:00
Xiaohong Bao 6661628d5c add two debug settings: "SceneLoadLowMemoryBound" and "SceneLoadHighMemoryBound" 2014-02-12 20:50:32 -07:00
Xiaohong Bao 89d5cef757 Automated merge with http://bitbucket.org/lindenlab/viewer-interesting 2014-02-12 18:15:32 -07:00
Xiaohong Bao f5a63ed31e reduce peak memory usage to fix SH-4574: Interesting: viewer crash in LLJoint::setScale 2014-02-12 18:14:48 -07:00
Merov Linden f95529b3f3 Pull merge from lindenlab/viewer-acme 2014-02-12 17:08:28 -08:00
Merov Linden 063ea9ad22 Pull merge 2014-02-12 17:07:22 -08:00
Merov Linden 2887d191eb ACME-1277 : Add new example filter scripts 2014-02-12 17:05:03 -08:00
Cho bf0f20ef44 Changed Flickr link text for ACME-1320 2014-02-12 19:45:52 +00:00
Callum Prentice b6821ae35a First pass at FirstLogin login page. 2014-02-12 11:08:16 -08:00
Richard Linden 5866bb7ef0 merge with release 2014-02-12 10:32:02 -08:00
Mnikolenko ProductEngine 7e291bb468 MAINT-3465 FIXED Add check mark to selected entry. 2014-02-12 12:34:41 +02:00
Brad Payne (Vir Linden) 969cb45920 merge 2014-02-11 16:04:31 -05:00
Monty Brandenberg 7443819560 Merge. Refresh from viewer-release after 3.7.0 release 2014-02-11 13:41:31 -05:00
Oz Linden b0c255f4e6 merge up to 3.7.0-release and get unit test fixes 2014-02-11 09:20:58 -05:00
Mnikolenko ProductEngine 52fe667671 MAINT-2754 FIXED Call findInstance() instead of getInstance(). 2014-02-11 13:58:44 +02:00
Merov Linden 2e948a8dc6 Pull merge from lindenlab/viewer-release 2014-02-10 21:07:21 -08:00
Merov Linden a5add351e8 Pull merge ACME-1317 emergency fix 2014-02-10 21:03:18 -08:00
Merov Linden 5c82aca910 Merge pull from lindenlab/viewer-release 2014-02-10 20:12:41 -08:00
Jonathan Yap 61dde95630 STORM-1915 Add name to contributors 2014-02-10 20:19:54 -05:00
Jonathan Yap b30bfd3753 STORM-1915 Fix unit tests 2014-02-10 20:06:05 -05:00
Cho 67393b8d26 merge 2014-02-11 00:40:03 +00:00
Cho de89552dc9 Added #SecondLife to default Twitter status for ACME-1319 2014-02-11 00:37:46 +00:00
simon c0141ac423 Merge 2014-02-10 16:18:27 -08:00
simon 49ade5a719 Pointless merge to make hg happy 2014-02-10 16:16:34 -08:00
simon cb2045fcd5 Merge downstream code with viewer-release 2014-02-10 16:11:50 -08:00
Cho 8d0f7fe571 Hack to fix ACME-1317 2014-02-11 00:09:59 +00:00
simon 4acc2dc273 Merge viewer-release 2014-02-10 15:42:25 -08:00
Merov Linden 5f7e462d0f ACME-1318 : Handle No filter a bit more smartly so we don't fail on an unknown filter to do nothing... 2014-02-10 14:22:53 -08:00
Oz Linden 413be91cf5 increment viewer version to 3.7.1 2014-02-10 16:00:37 -05:00