Commit Graph

141 Commits (ca7abc4c3be9310f4e5fec00b7d6ffadaba58ff0)

Author SHA1 Message Date
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07: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 bedbbf7c02 Merge 2012-06-28 16:32:54 -05:00
Dave Parks 39ee498af0 MAINT-678 Fix for inconsistent data in physics shape display 2012-06-28 15:47:18 -05:00
Dave Parks ed72fd0ae9 merge 2012-06-28 13:22:04 -05: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 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Dave Parks 7929db82d1 MAINT-794 Move flexi idleUpdate and texture animation to their own update queues. 2012-06-20 18:29:18 -05:00
Dave Parks 029103133e MAINT-794 Factor out a lot of CPU overhead around updating objects. 2012-06-19 18:08:39 -05:00
Dave Parks b93a23aa82 MAINT-1147 Fix for frame stall on region crossing. 2012-06-13 18:05:56 -05:00
Dave Parks 184d5ee79d MAINT-646 Get rid of a hotspot in LLViewerObjectList::update, fix for error in llpolymorph 2012-06-11 12:53:36 -05:00
simon@Simon-PC.lindenlab.com 71bbb384b0 MAINT-753 : [crashhunters] crash at LLVOVolume::updateFaceFlags(). Null pointer checks are good.
Reviewed by Kelly
2012-05-07 13:24:52 -07:00
Richard Linden 3672956f0d added stats tracking for texture/object cache hit rates and texture cache read latency 2012-03-15 11:57:29 -07:00
Todd Stinson 4d77d3cca1 PATH-199: Cleaning up code related to object flags so that I can better use the flags to managed pathfinding flags such as permanent and character. 2012-02-28 19:07:44 -08:00
Brad Payne (Vir Linden) 4b269f67ea merge 2011-09-14 14:54:20 -04:00
Leslie Linden c64bd7d5cb Reduced text spam on exit by not trying to set all objects to a NULL region.
Reviewed by Richard.
2011-09-07 12:46:37 -07:00
Nyx (Neal Orman) 402a2de765 merging latest viewer-mesh into nyx's sidebranch 2011-08-15 11:41:00 -04:00
Brad Payne (Vir Linden) 6732f5fbca merge viewer-development to mesh-development 2011-08-10 17:53:11 -04:00
prep linden b9247373fb Sh-2129 Viewer caps implementation for resource cost selected. Also cleanup of old code related to earlier accounting work. 2011-08-02 17:01:46 -04:00
Nyx (Neal Orman) 60d15f78e1 merge with latest mesh-dev 2011-07-26 15:51:44 -04:00
Nyx (Neal Orman) c07f55e605 merging latest viewer-development to mesh merge candidate. 2011-07-25 18:26:14 -04:00
Dave Parks 65d82fe192 SH-2031 Fix for stall in "Cleanup" 2011-07-21 13:10:28 -05:00
Dave Parks ec0ee4f7c8 SH-2052 Fix for reported PE being too low when selecting more than 500 objects. 2011-07-12 12:04:58 -05:00
Don Kjer b9d6b5ef9a Merge viewer-development -> mesh-development 2011-07-08 18:25:07 -07:00
Dave Parks 03d22f5366 SH-1913 Fix for PE cost not updating appropriately when editing child prims of a linked set. 2011-07-01 12:24:52 -05:00
Oz Linden 13de92740e merge latest viewer-development 2011-06-22 11:45:43 -04:00
Oz Linden 8bfd3201de merge changes for latest viewer-development 2011-06-01 22:07:12 -04:00
Dave Parks 53e890f4fd SH-1359 General octree tune-up -- increase maximum capacity of an octree node and rework requested octree node sizes for minimum triangles per frame and maximum triangles per drawing call. 2011-05-26 20:37:15 -05:00
Oz Linden 0eb13bb682 storm-1189: remove more of the code for classic clouds 2011-05-26 11:30:39 -04:00
prep b76d15ed14 SH-1252 & SH-1253 accesor cleanup 2011-05-25 12:40:51 -04:00
prep linden 0b612741d5 SH-1252 and SH-1253 WIP. 2011-05-20 14:26:05 -04:00
Nyx (Neal Orman) 8f94ff85f9 merging up latest mesh-development to nyx-mesh-development 2011-05-17 12:13:54 -04:00
Nyx (Neal Orman) 29dc641fbe initial effort to enable a debug display to show render complexity.
Using for internal demo, will get it code reviewed if it merges in.
2011-03-22 20:39:31 -04:00
Loren Shih 13705596af Automated merge up from viewer-development into mesh-development 2011-03-14 12:03:14 -04:00
Oz Linden ca55bce3ab correct merge error in llviewerobjectlist.cpp 2011-03-10 19:14:42 -05:00
Loren Shih c8293e29ca Automated merge up from viewer-development into mesh-development 2011-03-09 11:24:54 -05:00
Xiaohong Bao 409cc0cf93 fix for STORM-1046:[crashhunters] crash in LWorld::removeRegion
STORM-1014: Viewer crash in LLSurface::getWaterHeight
STORM-1047:[crashhunters] crash at LLViewerObjectList::renderObjectsForMap
2011-03-07 18:10:28 -07:00
Xiaohong Bao e841d62f81 fix for STORM-1046:[crashhunters] crash in LWorld::removeRegion
STORM-1014: Viewer crash in LLSurface::getWaterHeight
STORM-1047:[crashhunters] crash at LLViewerObjectList::renderObjectsForMap
2011-03-07 18:10:28 -07:00
Xiaohong Bao ec6092c321 fix for STORM-1046:[crashhunters] crash in LWorld::removeRegion
STORM-1014: Viewer crash in LLSurface::getWaterHeight
STORM-1047:[crashhunters] crash at LLViewerObjectList::renderObjectsForMap
2011-03-07 18:10:28 -07:00
Dave Parks 3b5d6eed12 merge 2011-04-19 14:55:11 -05:00
Oz Linden b5c834c6fd merge changes for STORM-1051 2011-04-05 07:23:43 -04:00
Don Kjer 8330a4d0fd Merge of ssh://hg.lindenlab.com/nat/viewer-eventapi2/ 2011-02-19 00:17:12 +00:00
Don Kjer 774405e92b Cleanup of headless client (was: DisableRendering mode)
* Now called 'HeadlessClient' instead of 'DisableRendering'
* Removed most cases where we skipped certain behaviors in the client when in this mode.  This gets us closer to a 'true' client, for testing purposes.
2011-02-18 23:16:38 +00:00
Loren Shih e3ed1565f8 Automated merge up from viewer-development into mesh-development 2011-02-10 10:44:21 -05:00
Xiaohong Bao 8d43cb2701 trivial: remove some redundant code. 2011-02-09 12:15:21 -07:00
Xiaohong Bao 54cced2356 debug code for SH-924: [PUBLIC-JIRA-USERS] Viewer crash in LLSurface::getWaterHeight 2011-02-09 10:33:07 -07:00
Loren Shih fbc6e5d639 Automated merge up from viewer-development into mesh-development 2011-02-01 11:28:22 -05:00
Xiaohong Bao 4af7e9eb64 Merge viewer-development-shining up to REV 3bf724ecb7c6 (fix for SH-829: Viewer attempting to load precached images in file types that are not being used.) 2011-01-21 16:25:23 -07:00
Dave Parks ebbaa00ed9 merge 2011-01-18 14:49:38 -06:00