summaryrefslogtreecommitdiff
path: root/indra/newview/llagentui.cpp
diff options
context:
space:
mode:
authorMike Antipov <mantipov@productengine.com>2010-02-11 15:21:52 +0200
committerMike Antipov <mantipov@productengine.com>2010-02-11 15:21:52 +0200
commitce46b83538eacd769c78befa31d8f824509342cd (patch)
tree9c4270c1d65ab76c641f458a071bb9908c7a489b /indra/newview/llagentui.cpp
parent82086067d99ad91be252321193222fc25ea01294 (diff)
parent23bc796a7f8cbe3163041c4a81018b1d89008cc2 (diff)
Merged
--HG-- branch : product-engine
Diffstat (limited to 'indra/newview/llagentui.cpp')
-rw-r--r--indra/newview/llagentui.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index 7404fe5bc4..72ab9235cf 100644
--- a/indra/newview/llagentui.cpp
+++ b/indra/newview/llagentui.cpp
@@ -150,11 +150,17 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
sim_access_string.c_str());
break;
case LOCATION_FORMAT_NO_MATURITY:
- case LOCATION_FORMAT_FULL:
buffer = llformat("%s (%d, %d, %d)",
region_name.c_str(),
pos_x, pos_y, pos_z);
break;
+ case LOCATION_FORMAT_FULL:
+ buffer = llformat("%s (%d, %d, %d)%s%s",
+ region_name.c_str(),
+ pos_x, pos_y, pos_z,
+ sim_access_string.empty() ? "" : " - ",
+ sim_access_string.c_str());
+ break;
}
}
else