From 287284331af10af8a55914d00b2c61d5fd40642f Mon Sep 17 00:00:00 2001 From: McCabe Maxsted Date: Wed, 9 Sep 2009 16:57:26 -0700 Subject: Applied ReinstateShowTextureUUID Cool Viewer patch (reverts the fix for VWR-1919) --- ChangeLog.txt | 9 +++++++++ linden/indra/newview/lltexturectrl.cpp | 7 +++++++ linden/indra/newview/llviewermenu.cpp | 5 ++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index 83b6e09..6c4cf5e 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,12 @@ + 2009-09-09 McCabe Maxsted + + * Applied ReinstateShowTextureUUID Cool Viewer patch (reverts the "fix" for VWR-1919). + Patch by Henri Beauchamp, modified by McCabe Maxsted. + + modified: linden/indra/newview/lltexturectrl.cpp + modified: linden/indra/newview/llviewermenu.cpp + + 2009-09-08 McCabe Maxsted * Created my own version of Emerald's chat channel tool. diff --git a/linden/indra/newview/lltexturectrl.cpp b/linden/indra/newview/lltexturectrl.cpp index be0b8eb..71135d7 100644 --- a/linden/indra/newview/lltexturectrl.cpp +++ b/linden/indra/newview/lltexturectrl.cpp @@ -349,6 +349,13 @@ void LLFloaterTexturePicker::updateImageStats() { mResolutionLabel->setTextArg("[DIMENSIONS]", std::string("[? x ?]")); } + if (gAgent.isGodlike()) + { + std::string tstring = "Pick: "; + std::string image_id_string = mTexturep->getID().asString(); + tstring = tstring + image_id_string.replace(24, 35, 12, '*'); // hide last segment to discourage theft + setTitle(tstring); + } } } diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp index 36ffc21..efadf67 100644 --- a/linden/indra/newview/llviewermenu.cpp +++ b/linden/indra/newview/llviewermenu.cpp @@ -6085,7 +6085,10 @@ void handle_selected_texture_info(void*) S32 height = img->getHeight(); S32 width = img->getWidth(); S32 components = img->getComponents(); - msg = llformat("%dx%d %s on face ", + std::string image_id_string = image_id.asString(); + image_id_string = image_id_string.replace(24, 35, 12, '*') + " "; // hide last segment to discourage theft + msg = llformat("%s%dx%d %s on face ", + image_id_string.c_str(), width, height, (components == 4 ? "alpha" : "opaque")); -- cgit v1.1