summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2013-06-05 14:54:10 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2013-06-05 14:54:10 -0700
commit64f4246f17b8270870fae84eca26e18a567a2174 (patch)
tree8cd412007ec5a8eed8d9d3d80bfb7e6ba8926aa6 /indra/newview
parent3d40f4d82f067421e63ac3719ce22c18e29b0e20 (diff)
ACME-471: Code cleanup, just moving some code.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llagentui.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp
index 125f911e0d..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(),
@@ -130,11 +135,6 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
sim_access_string.empty() ? "" : " - ",
sim_access_string.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;
}
}
else
@@ -148,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(),
@@ -169,11 +174,6 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
sim_access_string.empty() ? "" : " - ",
sim_access_string.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;
}
}
str = buffer;