diff options
| author | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-23 02:29:44 -0500 |
| commit | cd2b97b3e6446449443700ae9a1521c402c93850 (patch) | |
| tree | 0c45e5a05cdcb6956fb859c9fef834a5c5613a04 /linden/indra/newview/lltexturectrl.cpp | |
| parent | Commented out Linux tarball building. (diff) | |
| parent | Display selected avatars larger than normal, zoom in at a reasonable speed. I... (diff) | |
| download | meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.zip meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.gz meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.bz2 meta-impy-cd2b97b3e6446449443700ae9a1521c402c93850.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Conflicts:
linden/indra/newview/llfloaterchat.cpp
linden/indra/newview/llfloatermap.cpp
linden/indra/newview/llinventorybridge.cpp
linden/indra/newview/llnetmap.cpp
linden/indra/newview/llviewermessage.cpp
linden/indra/newview/llviewerobjectlist.cpp
Diffstat (limited to 'linden/indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | linden/indra/newview/lltexturectrl.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
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() | |||
| 349 | { | 349 | { |
| 350 | mResolutionLabel->setTextArg("[DIMENSIONS]", std::string("[? x ?]")); | 350 | mResolutionLabel->setTextArg("[DIMENSIONS]", std::string("[? x ?]")); |
| 351 | } | 351 | } |
| 352 | if (gAgent.isGodlike()) | ||
| 353 | { | ||
| 354 | std::string tstring = "Pick: "; | ||
| 355 | std::string image_id_string = mTexturep->getID().asString(); | ||
| 356 | tstring = tstring + image_id_string.replace(24, 35, 12, '*'); // hide last segment to discourage theft | ||
| 357 | setTitle(tstring); | ||
| 358 | } | ||
| 352 | } | 359 | } |
| 353 | } | 360 | } |
| 354 | 361 | ||