Commit Graph

25674 Commits (ae1aa461ea3f96c092e2a50ae40f290b03b25356)

Author SHA1 Message Date
Graham Madarasz (Graham) ae1aa461ea Attempt at a faster ThreadSafeRefCount class 2013-02-28 16:37:09 -08:00
Graham Madarasz (Graham) 93eaccae6f Modify LLInstanceTracker to avoid using a map of strings to find a map of foo to find some pointers 2013-02-28 15:35:14 -08:00
Graham Madarasz (Graham) 2dcbbf04c9 Improve curl/ares init behavior by duping handles instead of calling easy_init 2013-02-28 09:45:43 -08:00
Graham Madarasz (Graham) df08808640 Improve perf of GLSL uniform lookups by name 2013-02-28 09:33:41 -08:00
Graham Madarasz (Graham Linden) 2c9636a9e5 For MAINT-2003 Fix sequencing issue causing mem multiplier to be applied after clamping below actual mem available 2013-02-27 12:44:00 -08:00
Graham Madarasz (Graham Linden) 34158130b4 Help the hg stop worrying about comment-only diffs 2013-02-21 16:54:36 -08:00
Graham Madarasz (Graham Linden) 2fd0e6e8f9 Merge viewer-cat and resolve conflict with alternate self 2013-02-21 16:50:04 -08:00
graham linden 69133ca4e3 Merged lindenlab/viewer-cat into default 2013-02-14 10:58:53 -08:00
Graham Madarasz (Graham Linden) e2f3ea50d5 For MAINT-1291 Re-order cubemap disable and shader tex disable to avoid false alarm when using RenderDebugGL. Code Review: DaveP 2013-02-14 10:57:28 -08:00
Dave Parks cc260a6356 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-02-14 12:16:37 -06:00
Dave Parks bc60d34f68 MAINT-2368 Pull in Firestorm fix for textures unloading behind you. 2013-02-14 12:15:59 -06:00
Dave Parks 3fa68c78f8 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-02-13 11:26:28 -06:00
Dave Parks 33016d36e8 MAINT-2355 Fix for corrupt rigged attachments on Intel HD Graphics 2013-02-13 11:25:51 -06:00
simon@Simon-PC.lindenlab.com d706766bae Merge downstream code (viewer-bear, lion and release) 2013-02-12 15:06:04 -08:00
simon@Simon-PC.lindenlab.com 2e6a6c7ac4 Merge downstream code (viewer-lion and viewer-release) 2013-02-12 15:03:21 -08:00
simon@Simon-PC.lindenlab.com 94ae64d6fd Pull and merge viewer-release 2013-02-12 14:59:59 -08:00
Oz Linden e87000ba07 Added tag 3.4.5-release for changeset a49c715243a3 2013-02-12 07:06:24 -05:00
Dave Parks f7c57fe171 Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-02-11 17:33:26 -06:00
Dave Parks 96dc947784 MAINT-2347 Change connect timeout to 30 seconds and request timeout to 4 minutes 2013-02-11 17:32:53 -06:00
Oz Linden 79eeae502c Added tag 3.4.5-beta5 for changeset 852b69ef0b5f 2013-02-05 13:25:24 -05:00
Oz Linden 34c0ed7e99 merge changes for DRTVWR-297 2013-02-05 12:32:52 -05:00
Oz Linden d96c3220f8 tag merge of DRTVWR-297 2013-02-05 12:32:14 -05:00
Oz Linden 3279201c1b merge changes for DRTVWR-296 2013-02-05 12:30:34 -05:00
Oz Linden 702332fc02 tag merge of DRTVWR-296 2013-02-05 12:30:30 -05:00
simon@Simon-PC.lindenlab.com e82da1c820 MAINT-2326 - New viewer restart notifications appear when logging in if not
closed before logging out.
2013-02-04 11:50:25 -08:00
Dave Parks 5a69837345 MAINT-2323 Fix for crash on shutodwn in mesh responder destructors 2013-02-04 12:23:33 -06:00
Whirly 0908b60c1c STORM-1930 Quality & Speed slider has Ultra label where High should be. 2013-02-01 08:10:16 +00:00
simon@Simon-PC.lindenlab.com dbd6b58bf2 Fix funky merge problem 2013-01-31 10:53:03 -08:00
simon@Simon-PC.lindenlab.com 799728b935 Pull in viewer-cat 2013-01-30 15:26:12 -08:00
simon@Simon-PC.lindenlab.com ee87ef2303 merge downstream code from viewer-lion 2013-01-30 15:25:09 -08:00
simon@Simon-PC.lindenlab.com 60d1404b21 Merge in viewer-development 2013-01-30 15:03:39 -08:00
Oz Linden d9eb8e27d5 Added tag 3.4.5-beta4 for changeset 1567de5700c2 2013-01-30 15:04:06 -05:00
Oz Linden e7c0f69c8e pull back more 3.4.5 beta fixes 2013-01-29 22:35:11 -05:00
Oz Linden d331592fc7 merge changes for MAINT-2276 2013-01-29 19:22:00 -05:00
Oz Linden 2fa8205d4d MAINT-2281: correct test for XP (corrected fix I applied incorrectly) 2013-01-29 18:39:51 -05:00
Oz Linden 07deaaef88 tag merge of DRTVWR-292 2013-01-29 18:27:40 -05:00
Dave Parks 4dfd99069f MAINT-2288 Fix for physics shapes not showing up on "active" objects. 2013-01-29 16:10:58 -06:00
Oz Linden bfbf4a6c46 Added tag DRTVWR-291 for changeset 7f09bbc28c29 2013-01-29 14:12:55 -05:00
Graham Madarasz (Graham) 2676f516f2 For MAINT-2276 a workaround to unblock 3.4.5 beta review: ted 2013-01-28 10:15:10 -08:00
Chris Baker 2ce44afc7f [MAINT-2233] Duplicate entries in notifications.xml
- Removed duplicate entry from panel_preferences_general.xml
2013-01-26 01:47:37 +00:00
Dave Parks f566cd861b Automated merge with https://bitbucket.org/lindenlab/viewer-cat 2013-01-25 17:43:41 -06:00
Dave Parks 9f046e6b3f MAINT-2268 Add right-click->"Mute Particle Owner" feature 2013-01-25 17:30:01 -06:00
Dave Parks b8f74b42a7 MAINT-2268 Add right-click->"Mute Particle Owner" feature 2013-01-25 17:29:44 -06:00
Chris Baker 564f11679d [MAINT-2233] Duplicate entries in notifications.xml
- Removed duplicate notification elements
2013-01-25 23:29:09 +00:00
callum_linden 276800e6f2 MAINT-2281: correct test for XP 2013-01-29 18:09:13 -05:00
Oz Linden dae5c6294a merge changes for MAINT-2275, MAINT-2277 2013-01-25 14:43:48 -05:00
Oz Linden cc15a08ac4 merge changes for DRTVWR-290 2013-01-25 13:11:56 -05:00
Oz Linden c1827f7cf9 tag merge of DRTVWR-290 2013-01-25 13:11:52 -05:00
Kelly Washington 4d589df2fd MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets
* A fix that doesn't break tanks. Reverts MAINT-1742
2013-01-24 15:32:36 -08:00
Oz Linden 38ac8aa581 merge changes for MAINT-1481 2013-01-24 18:20:01 -05:00