completed: Thu Nov 4 22:06:47 2010
Changes since the last good build (2010-11-04T18:47:03.000Z):
. [ default ]
. changeset: 13360:f38f27da53ca
. tag: tip
. parent: 13359:d734b82239b4
. parent: 13307:1fa563f1c9cf
. user: Oz Linden <oz@lindenlab.com>
. date: Thu Nov 04 16:27:38 2010 -0400
. summary: merging up latest changes from viewer-development
. changeset: 13359:d734b82239b4
. parent: 13298:e6dbb66dae8b
. parent: 13358:a4f0f5f00f16
. user: Loren Shih <seraph@lindenlab.com>
. date: Thu Nov 04 14:44:00 2010 -0400
. summary: automated merge from http://hg.secondlife.com/viewer-beta
. . [ default ]
. . changeset: 13358:a4f0f5f00f16
. . parent: 13357:5b7bb3781580
. . parent: 13310:0658405ae284
. . user: Loren Shih <seraph@lindenlab.com>
. . date: Thu Nov 04 14:28:30 2010 -0400
. . summary: automated merge up from viewer-beta
. . . [ default ]
. . . changeset: 13310:0658405ae284
. . . parent: 13309:66494de281e3
. . . parent: 13308:6b8892b1c06b
. . . user: Dessie Linden <dessie@lindenlab.com>
. . . date: Thu Nov 04 11:15:51 2010 -0700
. . . summary: Pushing 2.3.0-beta2 tag to repo
. . . . [ default ]
. . . . changeset: 13308:6b8892b1c06b
. . . . parent: 13251:5624485abbfb
. . . . user: Eli Linden <eli@lindenlab.com>
. . . . date: Wed Nov 03 11:25:36 2010 -0700
. . . . summary: CT-633 WIP ES translation for Viewer 2.3, Set19
. . . [ default ]
. . . changeset: 13309:66494de281e3
. . . parent: 13249:db0fe9bb6518
. . . user: Dessie Linden <dessie@lindenlab.com>
. . . date: Thu Nov 04 11:11:47 2010 -0700
. . . summary: Added tag 2.3.0-beta2 for changeset db0fe9bb6518
. . [ default ]
. . changeset: 13357:5b7bb3781580
. . parent: 13356:a6a1a2600b53
. . parent: 13295:23e74739c668
. . user: Loren Shih <seraph@lindenlab.com>
. . date: Thu Nov 04 10:32:58 2010 -0400
. . summary: Automated merge up from viewer-development
. . changeset: 13356:a6a1a2600b53
. . user: Dave Parks <davep@lindenlab.com>
. . date: Wed Nov 03 12:10:45 2010 -0500
. . summary: SH-281 Make UI in snapshot off by default.
. . changeset: 13355:ea8ec9fd16f3
. . user: Dave Parks <davep@lindenlab.com>
. . date: Mon Nov 01 12:30:54 2010 -0500
. . summary: SH-281 Fix for snapshots showing interface all the time
. . changeset: 13354:ac45d129e2f3
. . user: Dave Parks <davep@lindenlab.com>
. . date: Mon Nov 01 12:29:09 2010 -0500
. . summary: Remove assert from lldictionary that keeps devs from working with mesh viewer and release viewer.
. . changeset: 13353:b6953213db18
. . user: Dave Parks <davep@lindenlab.com>
. . date: Fri Oct 29 14:44:33 2010 -0500
. . summary: VWR-21349 Don't enable FBO by default on mac or linux when using high/ultra graphics. Cap samples in LLMultiSampleBuffer to 4 samples to avoid using tons of memory when RenderUseFBO is set to TRUE and RenderFSAASamples is > 4. Don't allocate multisample buffers at all when RenderUseFBO is FALSE.
. . changeset: 13352:a711727a4927
. . user: Dave Parks <davep@lindenlab.com>
. . date: Wed Oct 27 16:19:18 2010 -0500
. . summary: SH-392 Port over fix from mesh-development for FBOs on OSX
. . changeset: 13351:9a389aaa20f9
. . parent: 13218:f687381cc6bc
. . parent: 13350:4190cf539d44
. . user: Loren Shih <seraph@lindenlab.com>
. . date: Wed Oct 27 16:19:18 2010 -0400
. . summary: Automated merge from viewer-development-shining
. . . [ default ]
. . . changeset: 13350:4190cf539d44
. . . parent: 13348:5dad637e4d3f
. . . parent: 13349:6c3350fe3dc2
. . . user: Dave Parks <davep@lindenlab.com>
. . . date: Tue Oct 26 16:31:02 2010 -0500
. . . summary: merge
. . . . [ default ]
. . . . changeset: 13349:6c3350fe3dc2
. . . . parent: 13347:4c3b083a0358
. . . . user: Dave Parks <davep@lindenlab.com>
. . . . date: Tue Oct 26 14:31:20 2010 -0500
. . . . summary: Potential fix for crash in renderBloom.
. . . . [ Transplant ]
. . . . changeset: ???:bc2b6a462dd0
. . . . [ default ]
. . . . changeset: 13347:4c3b083a0358
. . . . user: Dave Parks <davep@lindenlab.com>
. . . . date: Fri Oct 22 17:16:44 2010 -0500
. . . . summary: Anisotropic filtering does NOT require a viewer restart.
. . . . changeset: 13346:08751b2029cd
. . . . user: Dave Parks <davep@lindenlab.com>
. . . . date: Thu Oct 21 14:24:49 2010 -0500
. . . . summary: Fix for crash when toggling anisotropic filtering.
. . . . [ Transplant ]
. . . . changeset: ???:2fb7cb828805
. . . . [ default ]
. . . . changeset: 13345:7769fd72a8d9
. . . . user: Dave Parks <davep@lindenlab.com>
. . . . date: Thu Oct 21 14:24:03 2010 -0500
. . . . summary: Fix for crash when toggling anisotropic filtering.
. . . . [ Transplant ]
. . . . changeset: ???:6a089fd66ccd
. . . . [ default ]
. . . . changeset: 13344:e7d6cba01b0f
. . . . user: Dave Parks <davep@lindenlab.com>
. . . . date: Fri Oct 22 16:49:32 2010 -0500
. . . . summary: Non-FBO driven fix for anti-aliasing (make applying of FSAA require restart when FBO is disabled).
. . . . changeset: 13343:13313105c4e6
. . . . user: Dave Parks <davep@lindenlab.com>
. . . . date: Fri Oct 22 16:04:00 2010 -0500
. . . . summary: Disable FBO by default for all settings.
. . . . changeset: 13342:a02fc9383abb
. . . . parent: 13341:0138aafddc30
. . . . parent: 13166:d1c46ac53d90
. . . . user: Loren Shih <seraph@lindenlab.com>
. . . . date: Thu Oct 21 15:47:45 2010 -0400
. . . . summary: Automated merge up from viewer-development
. . . . changeset: 13341:0138aafddc30
. . . . user: Loren Shih <seraph@lindenlab.com>
. . . . date: Thu Oct 21 14:37:51 2010 -0400
. . . . summary: Manual fix for merge compile errors.
. . . . changeset: 13340:4dbe82f06b91
. . . . parent: 13339:987554f2d323
. . . . parent: 13165:d8b6a30299e2
. . . . user: Loren Shih <seraph@lindenlab.com>
. . . . date: Thu Oct 21 14:18:29 2010 -0400
. . . . summary: Automated merge up from viewer-development
. . . . changeset: 13339:987554f2d323
. . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . date: Thu Oct 14 21:23:23 2010 -0600
. . . . summary: more debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer.
. . . . changeset: 13338:1034d73ae9e4
. . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . date: Thu Oct 14 17:01:39 2010 -0600
. . . . summary: for SH-335: create a debug tool to track of memory availability.
. . . . changeset: 13337:4e8995eca59f
. . . . parent: 13331:3fb02e094d6a
. . . . parent: 13336:826faaaff632
. . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . date: Wed Oct 13 20:12:28 2010 -0600
. . . . summary: Automated merge with http://bitbucket.org/seraph/viewer-development-shining
. . . . . [ default ]
. . . . . changeset: 13336:826faaaff632
. . . . . parent: 13335:705a11770356
. . . . . parent: 12580:263ed4d8443a
. . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . date: Wed Oct 13 20:06:30 2010 -0600
. . . . . summary: Merge
. . . . . changeset: 13335:705a11770356
. . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . date: Wed Oct 13 19:56:55 2010 -0600
. . . . . summary: merge REV-13dc54d03e13 from skylight: fix for EXP-195: Custom login progress screen blurry when first presented to user as the image fully loads
. . . . . changeset: 13334:b455c2bb499d
. . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . date: Wed Oct 13 19:33:36 2010 -0600
. . . . . summary: some debug code for SH-288: [crashhunters] LLImageGL::setSubImageFromFrameBuffer
. . . . . changeset: 13333:cb29f1d44863
. . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . date: Tue Oct 12 15:38:52 2010 -0600
. . . . . summary: add debug code for SH-207: viewer crash in LLVertexBuffer::mapBuffer
. . . . . changeset: 13332:372b176716ef
. . . . . parent: 13329:640f69a082af
. . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . date: Tue Oct 12 15:35:39 2010 -0600
. . . . . summary: add a debug function to output gl error information to the log file without crashing the viewer.
. . . . . changeset: 13329:640f69a082af
. . . . . parent: 13328:2b5de4ef1ed6
. . . . . parent: 12576:3683d7c533f9
. . . . . user: Loren Shih <seraph@lindenlab.com>
. . . . . date: Mon Oct 04 11:21:18 2010 -0400
. . . . . summary: Automated merge up from viewer-development
. . . . . changeset: 13328:2b5de4ef1ed6
. . . . . parent: 13327:c3468afe11d5
. . . . . parent: 13325:9072b9c9ce6b
. . . . . user: Loren Shih <seraph@lindenlab.com>
. . . . . date: Mon Oct 04 11:20:29 2010 -0400
. . . . . summary: Automated merge from viewer-development-shining
. . . . . . [ default ]
. . . . . . changeset: 13325:9072b9c9ce6b
. . . . . . parent: 13323:a90fe10ddac9
. . . . . . parent: 13324:70b608b9887d
. . . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . . date: Thu Sep 23 16:16:52 2010 -0600
. . . . . . summary: Automated merge with http://bitbucket.org/seraph/viewer-development-shining
. . . . . . . [ default ]
. . . . . . . changeset: 13324:70b608b9887d
. . . . . . . parent: 13322:32a7317b6662
. . . . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . . . date: Thu Sep 23 16:12:01 2010 -0600
. . . . . . . summary: a try fix for SH-212: crash at LLViewerObjectList::removeFromLocalIDTable(LLViewerObject const &) [secondlife-bin llviewerobjectlist.cpp] line 173
. . . . . . . changeset: 13322:32a7317b6662
. . . . . . . parent: 13320:f6227ea4b293
. . . . . . . parent: 13321:a9aefa70c029
. . . . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . . . date: Wed Sep 22 14:45:22 2010 -0600
. . . . . . . summary: Automated merge with http://bitbucket.org/seraph/viewer-development-shining
. . . . . . . . [ default ]
. . . . . . . . changeset: 13321:a9aefa70c029
. . . . . . . . parent: 13316:b9e23d7fa7d5
. . . . . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . . . . date: Wed Sep 22 14:44:40 2010 -0600
. . . . . . . . summary: fix for SH-173/VWR-22868: Development Viewer freezes just after startup / greedy with file handles / 'WARNING: ll_apr_warn_status: APR: Too many open files'
. . . . . . . . changeset: 13316:b9e23d7fa7d5
. . . . . . . . parent: 13313:d2624c1f86a2
. . . . . . . . parent: 13315:ff3752370ccb
. . . . . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . . . . date: Fri Sep 17 17:24:14 2010 -0600
. . . . . . . . summary: Automated merge with http://bitbucket.org/seraph/viewer-development-shining
. . . . . . . . . [ default ]
. . . . . . . . . changeset: 13315:ff3752370ccb
. . . . . . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . . . . . date: Fri Sep 17 17:23:30 2010 -0600
. . . . . . . . . summary: fix for SH-115: investigate texture related network traffic between viewer 2.x and 1.23.
. . . . . . . . . changeset: 13314:ee5c7c235d4d
. . . . . . . . . parent: 13312:e0d6a280ef31
. . . . . . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . . . . . date: Thu Sep 16 13:13:06 2010 -0600
. . . . . . . . . summary: debug code for SH-115: investigate texture related network traffic between viewer 2.x and 1.23.
. . . . . . . . . changeset: 13312:e0d6a280ef31
. . . . . . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . . . . . date: Mon Sep 13 12:39:14 2010 -0600
. . . . . . . . . summary: for VWR-22936: design test code/plan for the object cache.
. . . . . . . . . changeset: 13311:29c186da7f81
. . . . . . . . . parent: 12163:02833ca9d38a
. . . . . . . . . user: Xiaohong Bao <bao@lindenlab.com>
. . . . . . . . . date: Fri Sep 10 10:26:42 2010 -0600
. . . . . . . . . summary: fix for VWR-22811: crash at LLImageGL::createGLTexture(int,unsigned char const *,int,int) [secondlife-bin llimagegl.cpp] line 1259
. . . . . . . . [ default ]
. . . . . . . . changeset: 13313:d2624c1f86a2
. . . . . . . . parent: 12237:a1b18ff1975f
. . . . . . . . parent: 13312:e0d6a280ef31
. . . . . . . . user: Loren Shih <seraph@lindenlab.com>
. . . . . . . . date: Thu Sep 16 18:41:19 2010 -0400
. . . . . . . . summary: Automated merge from viewer-development-shining
. . . . . . . [ default ]
. . . . . . . changeset: 13320:f6227ea4b293
. . . . . . . parent: 13319:c6c0583120ea
. . . . . . . parent: 12282:7076e22f9f43
. . . . . . . user: Loren Shih <seraph@lindenlab.com>
. . . . . . . date: Tue Sep 21 10:50:34 2010 -0400
. . . . . . . summary: Automated merge from viewer-development-shining
. . . . . . . changeset: 13319:c6c0583120ea
. . . . . . . user: Loren Shih <seraph@lindenlab.com>
. . . . . . . date: Tue Sep 21 10:47:59 2010 -0400
. . . . . . . summary: SH-178 FIXED As a non-god, I don't want to see admin options
. . . . . . . changeset: 13318:ff0d4a2acc7c
. . . . . . . parent: 13317:93099cbc9c2b
. . . . . . . parent: 12271:f6956487f154
. . . . . . . user: Loren Shih <seraph@lindenlab.com>
. . . . . . . date: Mon Sep 20 14:02:24 2010 -0400
. . . . . . . summary: Automated merge from viewer-development-shining
. . . . . . . changeset: 13317:93099cbc9c2b
. . . . . . . user: Loren Shih <seraph@lindenlab.com>
. . . . . . . date: Mon Sep 20 14:01:05 2010 -0400
. . . . . . . summary: Automated merge from viewer-development-shining
. . . . . . [ default ]
. . . . . . changeset: 13323:a90fe10ddac9
. . . . . . user: Nyx (Neal Orman) <nyx@lindenlab.com>
. . . . . . date: Wed Sep 22 18:09:17 2010 -0400
. . . . . . summary: SH-188 FIX crash in llvoavatar.cpp
. . . . . [ default ]
. . . . . changeset: 13327:c3468afe11d5
. . . . . user: Loren Shih <seraph@lindenlab.com>
. . . . . date: Mon Oct 04 11:19:37 2010 -0400
. . . . . summary: SH-270 FIXED As a SL user, I want my speaker order settings to persist between sessions
. . . . . changeset: 13326:cf8f38924824
. . . . . parent: 13320:f6227ea4b293
. . . . . user: Loren Shih <seraph@lindenlab.com>
. . . . . date: Mon Oct 04 11:19:26 2010 -0400
. . . . . summary: SH-270 FIXED As a SL user, I want my speaker order settings to persist between sessions
. . . . [ default ]
. . . . changeset: 13331:3fb02e094d6a
. . . . parent: 13330:24a6d3b39bd1
. . . . parent: 12665:cb55f8673f68
. . . . user: Loren Shih <seraph@lindenlab.com>
. . . . date: Wed Oct 13 17:08:00 2010 -0400
. . . . summary: Automated merge up from viewer-development
. . . . changeset: 13330:24a6d3b39bd1
. . . . user: Loren Shih <seraph@lindenlab.com>
. . . . date: Wed Oct 13 17:05:53 2010 -0400
. . . . summary: SH-325 FIXED Add terminal / to SearchURL in viewer settings.xml
. . . [ default ]
. . . changeset: 13348:5dad637e4d3f
. . . parent: 13347:4c3b083a0358
. . . parent: 13197:d17aef5d329b
. . . user: Loren Shih <seraph@lindenlab.com>
. . . date: Tue Oct 26 11:34:41 2010 -0400
. . . summary: Automated merge up from viewer-development