diff options
| author | Paul Guslisty <pguslisty@productengine.com> | 2010-02-11 13:08:28 +0200 |
|---|---|---|
| committer | Paul Guslisty <pguslisty@productengine.com> | 2010-02-11 13:08:28 +0200 |
| commit | 05db845c884b076540283a4a91c2806cb5f018bc (patch) | |
| tree | 12f7aa3c573bcf119f8696727151338f0ba58ab9 /indra/newview | |
| parent | cf18a1d22c7a4c315a651bc39085bc6d723e8e7d (diff) | |
| parent | 8fb772094815ede47ddcde67676c8c2cb161bef0 (diff) | |
Merge
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llagentui.cpp | 8 |
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 |