summaryrefslogtreecommitdiff
path: root/indra/newview/lltexturectrl.cpp
diff options
context:
space:
mode:
authorpalange <palange@lindenlab.com>2010-05-28 09:35:46 -0700
committerpalange <palange@lindenlab.com>2010-05-28 09:35:46 -0700
commit88d7073593ccf590d7b2b8e69c58c89029f8466e (patch)
tree0070c9addec90cfb9b046f5611ca6ac98f74ed0b /indra/newview/lltexturectrl.cpp
parenta6a9e893930584db90a57263211b7eac787085a0 (diff)
parentc901048d98a68a992cf1945e5802ec34087f67bb (diff)
Automated merge with ssh://hg.lindenlab.com/palange/viewer-2-0
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r--indra/newview/lltexturectrl.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp
index efdddd947b..a1ab051021 100644
--- a/indra/newview/lltexturectrl.cpp
+++ b/indra/newview/lltexturectrl.cpp
@@ -1286,8 +1286,8 @@ void LLTextureCtrl::draw()
LLFontGL::DROP_SHADOW);
}
- // Show more detailed information if this agent is god.
- if (gAgent.isGodlike())
+ // Optionally show more detailed information.
+ if (gSavedSettings.getBOOL("DebugAvatarRezTime"))
{
LLFontGL* font = LLFontGL::getFontSansSerif();
std::string tdesc;