Graham Linden
|
970ee73e9a
|
Fix release merge issues (included upstream changes not yet in release from bear)
|
2013-10-25 11:48:43 -07:00 |
|
Graham Linden
|
6480612a91
|
Merge 3.6.9 ShareStorm
|
2013-10-25 10:23:11 -07:00 |
|
Graham Linden
|
79836e32d5
|
MAINT-140 revert to simplified cleanDeadObjects to avoid accidental refcounting crashes
|
2013-09-09 13:26:13 -07:00 |
|
Ansariel
|
be07694b9c
|
MAINT-2773: Disable texture animation doesn't work
|
2013-08-22 00:51:15 +02:00 |
|
simon
|
2722ed29c9
|
Merge in latest viewer-beta
|
2013-05-14 09:17:25 -07: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 |
|
simon
|
c7f7c4bc4d
|
Merge viewer-beta
|
2013-05-09 13:14:49 -07:00 |
|
Oz Linden
|
ddd5659f81
|
merge changes for DRTVWR-294
|
2013-04-19 10:11:29 -04:00 |
|
simon
|
066f2acadf
|
Forgot to commit @#! merge
|
2013-04-11 16:23:36 -07:00 |
|
Graham Madarasz
|
bf6182daa8
|
Update Mac and Windows breakpad builds to latest
|
2013-03-29 07:50:08 -07:00 |
|
simon
|
98a82c50d5
|
Pull in downstream CHUI code from viewer-development
|
2013-03-25 11:12:52 -07:00 |
|
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 |
|
Andrew Meadows
|
eca33374fb
|
MAINT-2123 remove WARNINGS about unknown local_id in KillObject message
We now ignore unkown local_id's in KillObject.
Reviewed with davep.
|
2012-12-13 15:30:46 -08: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 |