diff options
| author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-07-16 17:29:01 -0400 |
|---|---|---|
| committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2012-07-16 17:29:01 -0400 |
| commit | 3679631887f0acec0b0d180525a56d318692a0e2 (patch) | |
| tree | 39c2a411c3e63d33ded905466fe7786509fe8527 /indra/newview/llvoavatarself.cpp | |
| parent | 64ad1aba304c50173195e15477c1882c5b6e7d37 (diff) | |
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.
Diffstat (limited to 'indra/newview/llvoavatarself.cpp')
| -rwxr-xr-x | indra/newview/llvoavatarself.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 5355651692..e715a0d2f1 100755 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -2726,6 +2726,11 @@ void LLVOAvatarSelf::onCustomizeStart(bool disable_camera_switch) void LLVOAvatarSelf::onCustomizeEnd(bool disable_camera_switch) { gAgentAvatarp->mIsEditingAppearance = false; + if (!LLAppearanceMgr::instance().useServerTextureBaking()) + { + gAgentAvatarp->mUseLocalAppearance = false; + } + if (isAgentAvatarValid()) { gAgentAvatarp->invalidateAll(); |