Commit Graph

277 Commits (9934cd2e29c8ea11e0859cd881d286fd56fae96e)

Author SHA1 Message Date
Brad Payne (Vir Linden) ebce476bd6 SH-3484 WIP, SH-3546 WIP, SH-3541 WIP - restrict useBakedTexture when in local update, minor readability tweaks 2012-11-15 11:13:45 -05:00
Brad Payne (Vir Linden) 2540568a83 SH-3541 WIP - prioritize local textures when in local appearance 2012-11-14 14:50:05 -05:00
Brad Payne (Vir Linden) 51a1d510a5 SH-3541 WIP - fixed one cause of local textures failing to load 2012-11-14 13:09:54 -05:00
Brad Payne (Vir Linden) f5a4c277cb SH-3500 FIX - added additional logging to allow params in various locations to be distinguished 2012-11-07 15:28:38 -05:00
Brad Payne (Vir Linden) 2390e21a9d additional diagnostics, improved shape stability at cost of increasing entanglement between baked and local appearance 2012-10-17 18:32:26 -04:00
Brad Payne (Vir Linden) 22f53c8558 additional debugging info, including tracking where visual params live 2012-10-15 18:41:55 -04:00
Don Kjer c06c35609c Updating linux build to gcc4.6 2012-10-11 00:09:04 +00:00
Brad Payne (Vir Linden) e29b66ed6c additional fixes for avoiding avatar param manipulation via wearables, setting correct state from avatar appearance 2012-10-03 17:13:18 -04:00
Brad Payne (Vir Linden) 05ee87af14 Fixed problems caused by defaulting mUseServerBakes to false 2012-09-26 17:02:46 -04:00
Brad Payne (Vir Linden) 93e210d91f more state management stuff, DRANO flags for problematic areas 2012-09-26 15:45:58 -04:00
Brad Payne (Vir Linden) ab83fab72c error checking, comments for areas needing fix/check in appearance 2012-09-26 11:52:19 -04:00
Brad Payne (Vir Linden) 04b0862b3b use accessors for mUseLocalAppearance, mIsEditingAppearance, mUseServerBakes 2012-09-26 11:27:13 -04:00
Brad Payne (Vir Linden) ae0bb92290 renamed isUsingBakedTextures to more accurate isUsingServerBakes. Commented some areas we are probably using the function incorrectly 2012-09-26 06:36:24 -04:00
Nyx (Neal Orman) 8b2cb3766e BUILDFIX: WIN fixing up windows building issues
Cleaned up a couple of things that the windows compiler was warning about, with our inheritance structure
2012-09-14 11:29:17 -04:00
Don Kjer 5bb8962c4e Merge sunshine -> sunshine-experimental 2012-09-13 22:14:53 +00:00
Nyx (Neal Orman) f1d6052e36 SH-3264 Moved over a few more items to llappearance
moved over:
isWearingWearableType
wearable::writeToAvatar
wearable::mTEMap (stores LocalTextureObject*)
more from wearable::import/export
wearable::createVisualParams, etc
2012-09-11 11:59:45 -04:00
Brad Payne (Vir Linden) fc84d68450 dumpArchetypeXML tweaks, appearance debugging 2012-09-10 18:46:52 -04:00
Don Kjer e1580128ab Fixed crashes on login. Moved most of the remaining character/skeleton generation code into llappearance. Moved non-rendering related LLViewerJoint functionality into LLAvatarJoint. 2012-09-09 12:12:19 +00:00
Nyx (Neal Orman) 77b33d9623 SH-3264 Porting over the XML loading of the avatar structure to llappearance
Moved over the necessary classes to llappearance to support the loading of the
avatar's structure & params from file.
2012-09-07 23:17:34 -04:00
Don Kjer 2e933100bb Merge 2012-09-06 03:04:10 +00:00
Don Kjer 85d0bcc063 Extracted mWearableDatas from LLAgentWearables into llappearance/LLWearableData. Moved LLDriverParam into llappearance 2012-09-06 02:53:55 +00:00
Nyx (Neal Orman) b146490e1b SH-3264 Worked to move over mBakedTextureDatas from LLVOAvatar to LLAvatarAppearance.
Appear to have been able to move over the parts that are common to both the backend and the viewer
into LLAvatarAppearance.
2012-09-05 17:46:11 -04:00
Don Kjer 204be2ba52 Split LLTexLayerSetBuffer into llappearance portion, and viewer-specific LLViewerTexLayerSetBuffer 2012-09-04 15:18:15 +00:00
Don Kjer 403d1b6404 Merge VirLinden/sunshine -> don_linden/sunshine-experimental 2012-09-03 20:12:47 +00:00
Don Kjer 21c364c4d4 Renamed LLVOAvatarDefines to LLAvatarAppearanceDefines 2012-09-03 09:10:24 +00:00
Don Kjer c355fb98d3 Extracted texture baking system into llappearance library. 2012-09-03 06:12:50 +00:00
Brad Payne (Vir Linden) 6e2739b76c SH-3625 - some associated cleanup, do_update field is useless in various calls because of possible race conditions 2012-08-22 16:16:54 -04:00
Nyx (Neal Orman) 48b7eff758 Automated merge with https://bitbucket.org/VirLinden/sunshine 2012-08-14 17:13:46 -04:00
Nyx (Neal Orman) e7a63cb356 SH-3310 WIP setting up architecture for switching texture baking on per-region basis
Set up an architecture to minimize the use of the baked texture debug setting.
Instead concentrating on setting a per-region flag at the region handshake point.
This should be processed once the new regions are using the updated handshake.
The debug setting is being used in this one location as a placeholder.

Builds, but not fully tested/commented yet, passing this work off to Vir.
2012-08-14 17:12:01 -04:00
Brad Payne (Vir Linden) 5ee461ab19 merge 2012-08-08 15:52:54 -07:00
simon@Simon-PC.lindenlab.com 83f5d0c616 Merge in viewer-development 2012-07-31 15:42:02 -07:00
Brad Payne (Vir Linden) 6ae4802e6d merge 2012-07-30 19:10:46 -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
Todd Stinson 4feef5af63 Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release. 2012-07-23 19:21:34 -07:00
Nyx (Neal Orman) 3679631887 SH-3261 WIP Updated texture switching code
Updated texture switching code to use the proper request URL, even if
reverting to a "last known good" baked texture UUID. Viewer should now
switch to a locally-generated composite on entering appearance mode, and
should remain using such until a new appearance message is received.

Still to do: handling adjacent regions with varying support for the new
system, fixing switch back to server-generated bakes.
2012-07-16 17:29:01 -04:00
Nyx (Neal Orman) 64ad1aba30 SH-3258 WIP initial work: refactoring appearance editing mode
Added flags for appearance editing status as well as which textures we should be using at a time.

Also refactored so we are not using camera state to track appearance editing mode.

Need to add more handling for which textures we actually use.
2012-07-11 18:30:39 -04:00
Dave Parks bedbbf7c02 Merge 2012-06-28 16:32:54 -05:00
Brad Payne (Vir Linden) d8b89bdb26 merge 2012-06-28 14:24:37 -04:00
Brad Payne (Vir Linden) e4a0dda457 SH-3228 WIP - always respond to processAppearance for self, convert baked textures to checkerboards 2012-06-28 14:24:04 -04:00
Nyx (Neal Orman) 14fef9f08a SH-3230 Disable texture readback & upload
If we're utilizing server-side texture baking, upload requests are
discarded.

Note: this breaks viewer in that it will *always* use the baked textures
sent by the cache request/ initial login. Without a server-generated
update, you will see those textures on your avatar for the entire session,
even if you switch outfits.
2012-06-28 11:05:32 -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 9e9d32de38 merge 2012-06-22 14:04:33 -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
Brad Payne (Vir Linden) ebe5aff98b avatar metrics - removed unused fields 2012-06-08 10:49:43 -04:00
Brad Payne (Vir Linden) 4f073a8d01 SH-3039 WIP - track sequence number and other standard fields in avatar appearance metrics 2012-05-30 18:15:10 -04:00
Dave Parks e3a5125b41 MAINT-616 Potential fix for corrupted mip maps. 2012-05-25 17:58:12 -05:00
simon@Simon-PC.lindenlab.com 1777fa5187 Merge pull from lindenlab/viewer-development as requested by Oz for DRTVWR-148 2012-05-25 15:07:22 -07:00
Dave Parks efda0814cb MAINT-616 Fix for corrupted mipmaps. Cleanup based on code review feedback. 2012-05-24 10:50:48 -05:00
Dave Parks b7cfd8c7f0 MAINT-616 Factor out calls to glGenFoo where possible, add setting to control synchronizing strategy WRT occlusion queries, add experimental transform feedback driven LoD update 2012-05-21 23:33:25 -05:00