livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

EXT-6666 : Enable debug avatar textures in God, versus non-Release, mode

master
Loren Shih 2010-03-31 15:16:44 -04:00
parent fc8c4ea485
commit 1ee1004e12
2 changed files with 59 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

116
indra/newview/llfloateravatartextures.cpp
View File

@ -31,15 +31,14 @@
*/
#include "llviewerprecompiledheaders.h"
#include "llfloateravatartextures.h"
#include "llagent.h"
#include "llagentwearables.h"
#include "lltexturectrl.h"
#include "lluictrlfactory.h"
#include "llviewerobjectlist.h"
#include "llvoavatar.h"
#include "llagentwearables.h"
using namespace LLVOAvatarDefines;
@ -75,7 +74,6 @@ void LLFloaterAvatarTextures::draw()
LLFloater::draw();
}
#if !LL_RELEASE_FOR_DOWNLOAD
static void update_texture_ctrl(LLVOAvatar* avatarp,
LLTextureCtrl* ctrl,
ETextureIndex te)
@ -132,72 +130,68 @@ static LLVOAvatar* find_avatar(const LLUUID& id)
void LLFloaterAvatarTextures::refresh()
{
LLVOAvatar *avatarp = find_avatar(mID);
if (avatarp)
if (gAgent.isGodlike())
{
std::string fullname;
if (gCacheName->getFullName(avatarp->getID(), fullname))
LLVOAvatar *avatarp = find_avatar(mID);
if (avatarp)
{
setTitle(mTitle + ": " + fullname);
}
for (U32 i=0; i < TEX_NUM_INDICES; i++)
{
update_texture_ctrl(avatarp, mTextures[i], ETextureIndex(i));
}
}
else
{
setTitle(mTitle + ": " + getString("InvalidAvatar") + " (" + mID.asString() + ")");
}
}
#else
void LLFloaterAvatarTextures::refresh()
{
}
#endif
// static
void LLFloaterAvatarTextures::onClickDump(void* data)
{
#if !LL_RELEASE_FOR_DOWNLOAD
LLFloaterAvatarTextures* self = (LLFloaterAvatarTextures*)data;
LLVOAvatar* avatarp = find_avatar(self->mID);
if (!avatarp) return;
for (S32 i = 0; i < avatarp->getNumTEs(); i++)
{
const LLTextureEntry* te = avatarp->getTE(i);
if (!te) continue;
if (LLVOAvatar::isIndexLocalTexture((ETextureIndex)i))
{
LLUUID id = IMG_DEFAULT_AVATAR;
EWearableType wearable_type = LLVOAvatarDictionary::getInstance()->getTEWearableType((ETextureIndex)i);
LLWearable *wearable = gAgentWearables.getWearable(wearable_type, 0);
if (wearable)
std::string fullname;
if (gCacheName->getFullName(avatarp->getID(), fullname))
{
LLLocalTextureObject *lto = wearable->getLocalTextureObject(i);
if (lto)
{
id = lto->getID();
}
setTitle(mTitle + ": " + fullname);
}
if (id != IMG_DEFAULT_AVATAR)
for (U32 i=0; i < TEX_NUM_INDICES; i++)
{
llinfos << "Avatar TE " << i << " id " << id << llendl;
}
else
{
llinfos << "Avatar TE " << i << " id " << "<DEFAULT>" << llendl;
update_texture_ctrl(avatarp, mTextures[i], ETextureIndex(i));
}
}
else
{
llinfos << "Avatar TE " << i << " id " << te->getID() << llendl;
setTitle(mTitle + ": " + getString("InvalidAvatar") + " (" + mID.asString() + ")");
}
}
}
// static
void LLFloaterAvatarTextures::onClickDump(void* data)
{
if (gAgent.isGodlike())
{
LLFloaterAvatarTextures* self = (LLFloaterAvatarTextures*)data;
LLVOAvatar* avatarp = find_avatar(self->mID);
if (!avatarp) return;
for (S32 i = 0; i < avatarp->getNumTEs(); i++)
{
const LLTextureEntry* te = avatarp->getTE(i);
if (!te) continue;
if (LLVOAvatar::isIndexLocalTexture((ETextureIndex)i))
{
LLUUID id = IMG_DEFAULT_AVATAR;
EWearableType wearable_type = LLVOAvatarDictionary::getInstance()->getTEWearableType((ETextureIndex)i);
LLWearable *wearable = gAgentWearables.getWearable(wearable_type, 0);
if (wearable)
{
LLLocalTextureObject *lto = wearable->getLocalTextureObject(i);
if (lto)
{
id = lto->getID();
}
}
if (id != IMG_DEFAULT_AVATAR)
{
llinfos << "Avatar TE " << i << " id " << id << llendl;
}
else
{
llinfos << "Avatar TE " << i << " id " << "<DEFAULT>" << llendl;
}
}
else
{
llinfos << "Avatar TE " << i << " id " << te->getID() << llendl;
}
}
}
#endif
}

7
indra/newview/llviewermenu.cpp
View File

@ -1802,9 +1802,10 @@ class LLAdvancedDebugAvatarTextures : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
#ifndef LL_RELEASE_FOR_DOWNLOAD
handle_debug_avatar_textures(NULL);
#endif
if (gAgent.isGodlike())
{
handle_debug_avatar_textures(NULL);
}
return true;
}
};