Commit Graph

145 Commits (9ed2f4d3cb02d5161bd8bb77cb7befa7feedf2d9)

Author SHA1 Message Date
Xiaohong Bao 9ed2f4d3cb add a debug setting "InvisibleObjectsInMemoryTime" to adjust the time invisible objects stay in memory. 2013-06-17 15:24:15 -06:00
Xiaohong Bao fc88265cff fix for SH-4241: viewer crash shortly after login in LLViewerRegion::addNewObject and
SH-4261: interesting: crash in LLViewerRegion::addToVOCacheTree
2013-06-13 18:47:51 -06:00
Xiaohong Bao 427490edb5 possible fix and new debug code for SH-4241: viewer crash shortly after login in LLViewerRegion::addNewObject 2013-06-10 22:43:29 -06:00
Richard Linden 0a96b47663 merge with viewer-release 2013-06-05 19:05:43 -07:00
Xiaohong Bao 6827febd30 change the way to handle creating/destroying a same object repeatedly 2013-05-28 14:55:37 -06:00
Xiaohong Bao 774544bc51 Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting 2013-05-23 18:26:14 -06:00
Xiaohong Bao 16616ae48d for SH-4145: Interesting: Implement occlusion culling for object cache 2013-05-23 18:25:21 -06:00
Dave Parks b9bb95f8ae MAINT-2647 Fix for some objects not rendering until first LoD switch/selection. 2013-05-09 15:40:02 -05:00
Richard Linden 6b81b8629e Spring cleaning: removed unused .cpp and.h files, and cleaned up header dependencies 2013-05-05 17:45:35 -07:00
Oz Linden ddd5659f81 merge changes for DRTVWR-294 2013-04-19 10:11:29 -04:00
Graham Madarasz bf6182daa8 Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
Richard Linden 68f9f656cd merge with viewer-release 2013-03-22 00:44:59 -07:00
Richard Linden 8de397b19e SH-3931 WIP Interesting: Add graphs to visualize scene load metrics
changed LLCriticalDamp to LLSmoothInterpolation and sped up interpolator lookup
improvements to stats display of llstatbar
added scene load stats floater accessed with ctrl|shift|2
2013-03-18 08:43:03 -07:00
prep 8e3b190e91 merge 2013-03-11 15:17:13 -04:00
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Richard Linden f07b9c2c69 renamed LLTrace stat gathering classes/methods to make the structure of LLTrace clearer
Count becomes CountStatHandle
Count.sum becomes sum(Count, value), etc.
2013-03-06 11:08:25 -08:00
Graham Madarasz (Graham) 2ea750ebca For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934. 2013-03-05 13:47:02 -08:00
Graham Madarasz (Graham) f352c81f11 For MAINT-2423 fix regression from CHUI merge. Code review: DaveP 2013-03-04 14:18:49 -08:00
prep 11d12f1a99 Merge from viewer-beta 2013-02-13 11:30:36 -05:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -08: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
Nyx Linden 11fe124ae9 merging in viewer-beta.
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
Kelly Washington aee0766f35 MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets
* A fix that doesn't break doors. Reverst MAINT-2247
2013-01-24 13:21:45 -08:00
Kelly Washington 27e13e7330 MAINT-2275 Child prims are "left behind" by animated, moving (physical) linksets 2013-01-24 09:17:02 -08:00
Kelly Washington 7ecfa28c43 MAINT-2247 Child object does not update rotation while selected. 2013-01-16 15:21:11 -08:00
Xiaohong Bao 7cc37d949e fix the merge errors from the changeset 3eadda9666cf 2013-01-09 22:43:10 -07:00
Xiaohong Bao 8315e97453 Merge 2013-01-08 14:50:31 -07:00
Richard Linden cbff0e7ab8 SH-3468 WIP add memory tracking base class
attempted fix for gcc compile errors
can't use typeid() on a class that doesn't have a method
defined in a translation unit
fix is to force classes deriving from LLMemTrackable to
use their own static member named sMemStat
2013-01-04 13:48:35 -08:00
Xiaohong Bao 4e22f3e3ef fix for SH-3624: Object deletion does not work 2012-12-18 23:16:50 -07:00
Xiaohong Bao e1247d631f fix for SH-3619: some objects are missing 2012-12-18 14:36:46 -07:00
prep e0432f98ee SH-3563. Pull and merge from viewer-development. Modest code changes to fix alignment issue in llAppearance. 2012-11-28 16:36:34 -05:00
Dave Parks 0820124bee MAINT-1950 Fix for offscreen objects not getting rebuilt sometimes. 2012-11-21 16:15:35 -06:00
Richard Linden c0224cc47a merge with viewer-development 2012-11-19 19:06:36 -08:00
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
Xiaohong Bao c2859e4663 for SH-3472: prioritize object loading 2012-11-08 21:36:47 -07: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
William Todd Stinson 9da9b2d84b Pull and merge from ssh://stinson@hg.lindenlab.com/richard/viewer-chui/. 2012-10-17 14:32:29 -07:00
Kelly Washington 9d701e563b MAINT-1742 Child object does not update position while selected.
reviewed with Davep
2012-10-17 14:05:14 -07:00
William Todd Stinson 8f9da8b37d Pull and merge from https://bitbucket.org/lindenlab/viewer-development. 2012-10-16 15:19:31 -07:00
Xiaohong Bao c0ba626c80 For SH-3333: Design and implement a new object cache system on viewer side 2012-10-15 21:34:29 -06:00
simon@Simon-PC.lindenlab.com d6e3b0445a Merge in viewer-development code and fix build 2012-10-15 14:23:29 -07:00
Oz Linden 1709952adb pull back 3.4.1-beta6 fixes 2012-10-10 21:40:10 -04:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Dave Parks 830ecff00b DRTVWR-225 Cleanup assertions 2012-10-10 14:13:52 -05:00
William Todd Stinson 4a3bdb6896 Pull and merge from ssh://hg@bitbucket.org/oz_linden/viewer-beta-drtvwr-179. 2012-10-10 15:10:48 -07:00
Dave Parks bc0abc7734 Fix up some assertions in lloctree.h 2012-10-02 12:11:42 -05:00
Dave Parks b5e71964e5 reapply c77cea5c6e41: MAINT-646 Cleanup some warnings from previous changes. 2012-09-20 10:00:56 -04: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