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

166 Commits (5c19f15dcaab304b555bf659f2d309d0d2afbc89)

Author SHA1 Message Date
prep 207d9fd767 Viewer-chui merge 2013-03-11 14:45:53 -04:00
Don Kjer 54cdc322b8 Fixing issues with not detecting when LLSD XML parsing fails. Changing most http error handlers to understand LLSD error responses. Fleshing out most http error handler message spam. 2013-03-05 22:05:22 -08:00
Merov Linden faae38daaa Pull merge from lindenlab/viewer-developement 2013-01-30 20:01:03 -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
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
William Todd Stinson c9044c03b3 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-09 18:51:23 -08:00
Dave Parks c431ddf629 Automated merge with http://bitbucket.org/lindenlab/viewer-development 2012-11-08 13:05:29 -06:00
William Todd Stinson 3b39ec165a Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-beta. 2012-11-02 17:56:35 -07:00
Oz Linden 02afdef369 merge back fixes from 3.4.1-beta12 2012-11-02 16:48:56 -04:00
Dave Parks 44a024d2f5 MAINT-646 Fix for leak introduced by optimizations. 2012-10-31 16:00:56 -05:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Don Kjer d3924200b6 Removing unused gHeadlessClient code from viewer 2012-09-23 03:06:11 +00: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 b4c8a982fc reapply fde2ac0276e2: MAINT-646 Get rid of a hotspot in LLViewerObjectList::update, fix for error in llpolymorph 2012-09-20 10:00:53 -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
Richard Linden 93578f7e51 Automated merge with http://bitbucket.org/lindenlab/viewer-cat 2012-08-24 16:31:29 -07:00
Brad Payne (Vir Linden) 5ee461ab19 merge 2012-08-08 15:52:54 -07:00
Richard Linden 03dd09b162 removed some duplicate fast timer declarations 2012-08-06 16:15:54 -07:00
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
Don Kjer bd1b664d45 Merge viewer-development -> viewer-horde-fixes 2012-07-26 22:59:30 +00: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
Don Kjer cff3469d46 Merge viewer-development -> viewer-horde-fixes 2012-07-17 16:52:19 +00:00
Richard Linden 5564fcb271 SH-3275 WIP Run viewer metrics for object update messages 
clean up of llstats stuff
 2012-07-16 19:15:46 -07:00
Richard Linden 5d32e23a11 SH-3275 WIP Run viewer metrics for object update messages 
improved update logging API and output format
 2012-07-12 22:35:51 -07:00
Don Kjer bc2517215c Skipping shiftObject pipeline method in headless mode 2012-07-09 00:48:02 +00: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
Dave Parks 4a5ad35793 MAINT-570 Remove unused memory tracking system LLMemType 2012-07-20 11:42:15 -05: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