livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,591 Commits
2 Branches
0 Tags
297 MiB
Commit Graph

665 Commits (4dfd99069f4f44c2ef970eb41f9e1b66e9bb564d)

Author SHA1 Message Date
Dave Parks 4dfd99069f MAINT-2288 Fix for physics shapes not showing up on "active" objects. 2013-01-29 16:10:58 -06:00
Dave Parks b8f74b42a7 MAINT-2268 Add right-click->"Mute Particle Owner" feature 2013-01-25 17:29:44 -06:00
simon@Simon-PC.lindenlab.com 4de7c27d93 Merge in viewer-development 2013-01-14 09:31:57 -08:00
Dave Parks 1c6f53aa6c MAINT-2136 Add "RenderDepthOfFieldInEditMode" to control whether or not to leave DoF enabled while editing 2012-12-17 15:11:36 -06:00
simon@Simon-PC.lindenlab.com 716e2ea3b1 Pull and merge viewer-development 2012-12-12 10:58:47 -08:00
simon@Simon-PC.lindenlab.com 57db08d792 Fix merge breakage 2012-12-04 17:45:19 -08:00
simon@Simon-PC.lindenlab.com 7fe4fbe674 Pull in upstream viewer-development via viewer-lion 2012-12-04 15:03:34 -08:00
simon@Simon-PC.lindenlab.com 40e78a80cc Pull and merge viewer-development 2012-12-04 14:31:15 -08:00
Dave Parks 99c5b21ee7 MAINT-1958 Trivial change to kick teamcity into behaving. 2012-11-30 19:32:22 -06:00
Dave Parks 9c205ee9e2 MAINT-1958 More robust error handling -- handle the case where the FBO allocation failure occurs when enabling lighting and shadows. 2012-11-30 17:47:12 -06:00
Dave Parks 9a8cf6603f MAINT-1958 Fix for linux build after transplant. 2012-11-30 12:21:01 -06:00
Dave Parks 72cbe5b942 MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering enabled. 
Reviewed by VoidPointer
 2012-11-26 17:10:22 -06:00
Dave Parks 3df1e46588 MAINT-1958 Fix for crash on OSX when resizing window with deferred rendering enabled. 
Reviewed by VoidPointer
 2012-11-26 17:10:22 -06:00
Dave Parks 5d34ac552f Automated merge with https://bitbucket.org/lindenlab/viewer-development 2012-11-20 17:03:55 -06:00
Dave Parks ccad8c9411 Automated merge with http://bitbucket.org/lindenlab/viewer-lion 2012-11-08 14:23:34 -06:00
Dave Parks c431ddf629 Automated merge with http://bitbucket.org/lindenlab/viewer-development 2012-11-08 13:05:29 -06:00
Oz Linden 1d3487e2ea pull back changes from 3.4.1-beta9 2012-10-19 13:38:57 -04:00
Dave Parks 5a2f71b0bc MAINT-1527 Fix for crash on exit when VBO disabled 2012-10-17 18:18:06 -05:00
Dave Parks 161c848e3d MAINT-643 Cleanup some shader compilation errors when atmospheric shaders are enabled. 2012-10-17 13:29:15 -05:00
simon@Simon-PC.lindenlab.com d6e3b0445a Merge in viewer-development code and fix build 2012-10-15 14:23:29 -07:00
William Todd Stinson c6a2ac0489 Pull and merge from ssh://hg@bitbucket.org/stinson_linden/viewer-beta-drtvwr-179. 2012-09-20 19:43:54 -07:00
Dave Parks 683c43c2e0 reapply 448b02f5b56f: MAINT-1147 Fix for frame stall on region crossing. 2012-09-20 10:00:55 -04:00
Dave Parks cf98064700 reapply 52b6c9168974: MAINT-646 Factor std::set out of lloctree 2012-09-20 09:48:55 -04:00
Dave Parks 1ba00693c7 reapply 38b7779af5f9: MAINT-646 Faster traversal of render batch lists. 2012-09-20 09:48:51 -04:00
William Todd Stinson a766e26db4 Backing out the changes contributing to DRTVWR-167 and DRTVWR-179 from the repository. 2012-09-10 10:37:02 -07:00
Oz Linden 0e13bf5f9e merge changes for 3.4.2-beta4 2012-11-14 09:20:55 -05:00
William Todd Stinson 3d21b2302b MAINT-1891: FIX Updating the LLPipeline::clearRebuildGroups() to preserve HUD groups. clearRebuildGroups() is called during the teleport process. In the previous state, HUD objects were being incorrectly removed from the rebuild groups during the teleport process. This change will preserve HUD groups and should resolve this issue. 2012-11-13 15:16:26 -08:00
Nicky 07410567c0 LLDrawable::destroy: Illegal deletion of LLDrawable! 2012-10-22 21:39:48 +02:00
simon@Simon-PC.lindenlab.com 38acb45af8 Merge in latest viewer-development 2012-09-05 17:17:54 -07:00
Oz Linden a7d8b42509 merge up to latest viewer-development 2012-08-16 08:52:26 -04:00
Oz Linden 97106c2dea merge changes for DRTVWR-194 2012-08-15 17:07:10 -04:00
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
Oz Linden df93749819 merge up to latest viewer-development 2012-07-31 14:55:15 -04:00
Brad Payne (Vir Linden) 58d5e223b8 merge 2012-07-30 15:02:02 -04:00
Brad Payne (Vir Linden) a5c9d89b28 merge 2012-07-30 14:57:33 -04:00
Oz Linden 8df3619621 merge to viewer-developmento 2012-07-24 10:51:37 -04:00
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Dave Parks cb96ab1a6f MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled. 2012-07-18 15:49:47 -05:00
simon@Simon-PC.lindenlab.com 173d0fa213 Pull in viewer-development because it's painful. Merge with runitai's help. 2012-07-11 16:15:23 -07:00
simon@Simon-PC.lindenlab.com b7555a3309 Merge back viewer-lion, which has viewer-development and down-stream fixes 2012-08-01 14:07:24 -07:00
simon@Simon-PC.lindenlab.com 0ccecbe966 Fix linux build crankiness 2012-07-30 15:11:00 -07:00
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05:00
Dave Parks cfc5236e64 MAINT-628 Fix for seams in high res snapshots when lighting and shadows is enabled. 2012-07-18 15:49:47 -05:00
Dave Parks bedbbf7c02 Merge 2012-06-28 16:32:54 -05:00
Dave Parks ed72fd0ae9 merge 2012-06-28 13:22:04 -05:00
Oz Linden 764d1e3caf merge up to 3.3.3-release 2012-06-28 10:35:22 -04:00
Dave Parks ba8ddcf241 MAINT-675 Fix for DoF focal point being incorrect when alt-zooming on terrain. 2012-06-26 16:13:09 -05:00
Brad Payne (Vir Linden) 74d4f8af01 v-r to drano merge conflicts wip 2012-06-26 16:43:58 -04:00
Todd Stinson 6e710333e7 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-06-22 18:59:31 -07:00
Dave Parks 28ccf4190e MAINT-653 Fix for shadow acne at high altitudes 2012-06-22 17:31:46 -05:00