aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llhoverview.cpp
diff options
context:
space:
mode:
authorArmin Weatherwax2010-07-30 14:05:09 +0200
committerJacek Antonelli2010-08-02 00:11:24 -0500
commit000b378f59bcd8bbdb4b50e5e5b60376ba239976 (patch)
treeef7a400fcbbaa9ec956bf672b3ca0f2d8a1ef2fc /linden/indra/newview/llhoverview.cpp
parentdon't show textures without fetcher in texture-console (backport from Viewer ... (diff)
downloadmeta-impy-000b378f59bcd8bbdb4b50e5e5b60376ba239976.zip
meta-impy-000b378f59bcd8bbdb4b50e5e5b60376ba239976.tar.gz
meta-impy-000b378f59bcd8bbdb4b50e5e5b60376ba239976.tar.bz2
meta-impy-000b378f59bcd8bbdb4b50e5e5b60376ba239976.tar.xz
small show client name of others tweaking
Diffstat (limited to 'linden/indra/newview/llhoverview.cpp')
-rw-r--r--linden/indra/newview/llhoverview.cpp26
1 files changed, 26 insertions, 0 deletions
diff --git a/linden/indra/newview/llhoverview.cpp b/linden/indra/newview/llhoverview.cpp
index 5d59818..8c367ab 100644
--- a/linden/indra/newview/llhoverview.cpp
+++ b/linden/indra/newview/llhoverview.cpp
@@ -64,6 +64,7 @@
64#include "llviewerparcelmgr.h" 64#include "llviewerparcelmgr.h"
65#include "llviewerregion.h" 65#include "llviewerregion.h"
66#include "llviewerwindow.h" 66#include "llviewerwindow.h"
67#include "llvoavatar.h"
67#include "llglheaders.h" 68#include "llglheaders.h"
68#include "llviewerimagelist.h" 69#include "llviewerimagelist.h"
69//#include "lltoolobjpicker.h" 70//#include "lltoolobjpicker.h"
@@ -272,6 +273,31 @@ void LLHoverView::updateText()
272 line.append(LLTrans::getString("TooltipPerson")); 273 line.append(LLTrans::getString("TooltipPerson"));
273 } 274 }
274 mText.push_back(line); 275 mText.push_back(line);
276
277 if (gSavedSettings.getBOOL("ShowClientNameHoverTip"))
278 {
279 LLColor4 color;
280 std::string client;
281 LLVOAvatar* avatar = (LLVOAvatar*)hit_object;
282 if (avatar->isSelf())
283 {
284 client="Client: Imprudence";
285 }
286 else
287 {
288 LLVOAvatar::resolveClient(color, client, avatar);
289 if(client.empty() ||client == "Invalid" || client == "Failure")
290 {
291 client = "Client: <not available>";
292 }
293 else
294 {
295 client = "Client: " + client;
296 }
297 }
298 mText.push_back(client);
299
300 }
275 } 301 }
276 else 302 else
277 { 303 {