summaryrefslogtreecommitdiff
path: root/indra/newview/llagentui.cpp
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2013-10-29 13:20:18 +0000
committerDon Kjer <don@lindenlab.com>2013-10-29 13:20:18 +0000
commit7866356d7719413b952787a509ebd3c4ce8d39b1 (patch)
treea200c96afd5ab8ad6da64c14ec6211aac9d5c65f /indra/newview/llagentui.cpp
parent81fecfa9f7e8664ec4f3bcf6662fe34d4e5d41a1 (diff)
parentea1e1b0925b386cf83178539b8eae9e25c573548 (diff)
Merge viewer-release => sunshine-internal
Diffstat (limited to 'indra/newview/llagentui.cpp')
-rwxr-xr-xindra/newview/llagentui.cpp10
1 files changed, 10 insertions, 0 deletions
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index b9ec304b7e..3410a37890 100755
--- a/indra/newview/llagentui.cpp
+++ b/indra/newview/llagentui.cpp
@@ -112,6 +112,11 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
case LOCATION_FORMAT_NORMAL:
buffer = llformat("%s", region_name.c_str());
break;
+ case LOCATION_FORMAT_NORMAL_COORDS:
+ buffer = llformat("%s (%d, %d, %d)",
+ region_name.c_str(),
+ pos_x, pos_y, pos_z);
+ break;
case LOCATION_FORMAT_NO_COORDS:
buffer = llformat("%s%s%s",
region_name.c_str(),
@@ -143,6 +148,11 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
case LOCATION_FORMAT_NORMAL:
buffer = llformat("%s, %s", parcel_name.c_str(), region_name.c_str());
break;
+ case LOCATION_FORMAT_NORMAL_COORDS:
+ buffer = llformat("%s (%d, %d, %d)",
+ parcel_name.c_str(),
+ pos_x, pos_y, pos_z);
+ break;
case LOCATION_FORMAT_NO_MATURITY:
buffer = llformat("%s, %s (%d, %d, %d)",
parcel_name.c_str(),