diff options
| author | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-11 13:06:33 +0200 |
|---|---|---|
| committer | Dmitry Zaporozhan <dzaporozhan@productengine.com> | 2009-11-11 13:06:33 +0200 |
| commit | 511d8a0a6072e8f1ac87eb7beb6935940794a882 (patch) | |
| tree | d3dd3a9a76d3a177b9ca1189d31aa4b7a71d8041 /indra/newview/llagentui.cpp | |
| parent | e29fbb572f2e10db1f2f3c448bc59aafec4a62c8 (diff) | |
| parent | f4f3903b60447f694e9a51c85c58233f66cff2ae (diff) | |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llagentui.cpp')
| -rw-r--r-- | indra/newview/llagentui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp index 2911a35581..568ac4164a 100644 --- a/indra/newview/llagentui.cpp +++ b/indra/newview/llagentui.cpp @@ -159,19 +159,19 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const buffer = llformat("%.100s", parcel_name.c_str()); break; case LOCATION_FORMAT_NORMAL: - buffer = llformat("%s, %s", region_name.c_str(), parcel_name.c_str()); + buffer = llformat("%s, %s", parcel_name.c_str(), region_name.c_str()); break; case LOCATION_FORMAT_WITHOUT_SIM: buffer = llformat("%s, %s (%d, %d, %d)", - region_name.c_str(), parcel_name.c_str(), + region_name.c_str(), pos_x, pos_y, pos_z); break; case LOCATION_FORMAT_FULL: std::string sim_access_string = region->getSimAccessString(); buffer = llformat("%s, %s (%d, %d, %d)%s%s", - region_name.c_str(), parcel_name.c_str(), + region_name.c_str(), pos_x, pos_y, pos_z, sim_access_string.empty() ? "" : " - ", sim_access_string.c_str()); |