Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some crap with baked textures

Browse Source
This commit is contained in:
Hazim Gazov
2010-05-09 07:29:10 -03:00
parent 40cd4c3034
commit efc658ccf1
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
indra/newview/llfloateravatartextures.cpp
View File

@@ -89,7 +89,9 @@ void LLFloaterAvatarTextures::draw()
LLFloater::draw(); LLFloater::draw();
} }
#if !LL_RELEASE_FOR_DOWNLOAD // <edit>
//#if !LL_RELEASE_FOR_DOWNLOAD
// </edit>
static void update_texture_ctrl(LLVOAvatar* avatarp, static void update_texture_ctrl(LLVOAvatar* avatarp,
LLTextureCtrl* ctrl, LLTextureCtrl* ctrl,
ETextureIndex te) ETextureIndex te)
@@ -146,6 +148,9 @@ void LLFloaterAvatarTextures::refresh()
} }
} }
// <edit>
/*
// </edit>
#else #else
void LLFloaterAvatarTextures::refresh() void LLFloaterAvatarTextures::refresh()
@@ -153,11 +158,16 @@ void LLFloaterAvatarTextures::refresh()
} }
#endif #endif
// <edit>
*/
// </edit>
// static // static
void LLFloaterAvatarTextures::onClickDump(void* data) void LLFloaterAvatarTextures::onClickDump(void* data)
{ {
#if !LL_RELEASE_FOR_DOWNLOAD // <edit>
//#if !LL_RELEASE_FOR_DOWNLOAD
// </edit>
LLFloaterAvatarTextures* self = (LLFloaterAvatarTextures*)data; LLFloaterAvatarTextures* self = (LLFloaterAvatarTextures*)data;
LLVOAvatar* avatarp = find_avatar(self->mID); LLVOAvatar* avatarp = find_avatar(self->mID);
if (!avatarp) return; if (!avatarp) return;
@@ -169,5 +179,7 @@ void LLFloaterAvatarTextures::onClickDump(void* data)
llinfos << "Avatar TE " << i << " id " << te->getID() << llendl; llinfos << "Avatar TE " << i << " id " << te->getID() << llendl;
} }
#endif // <edit>
//#endif
// </edit>
} }

4
indra/newview/llviewermenu.cpp
View File

@@ -2461,11 +2461,15 @@ class LLAvatarDebug : public view_listener_t
if( avatar ) if( avatar )
{ {
avatar->dumpLocalTextures(); avatar->dumpLocalTextures();
// <edit> hell no don't tell them about that
/*
llinfos << "Dumping temporary asset data to simulator logs for avatar " << avatar->getID() << llendl; llinfos << "Dumping temporary asset data to simulator logs for avatar " << avatar->getID() << llendl;
std::vector<std::string> strings; std::vector<std::string> strings;
strings.push_back(avatar->getID().asString()); strings.push_back(avatar->getID().asString());
LLUUID invoice; LLUUID invoice;
send_generic_message("dumptempassetdata", strings, invoice); send_generic_message("dumptempassetdata", strings, invoice);
*/
// </edit>
LLFloaterAvatarTextures::show( avatar->getID() ); LLFloaterAvatarTextures::show( avatar->getID() );
} }
return true; return true;