diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-12 13:46:21 -0500 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2010-02-12 13:46:21 -0500 |
| commit | dc8a9dc57d41723338a0881a29c5652924977ccf (patch) | |
| tree | 272cd5624749a1ff720ad9674412060c33978cdb /indra/newview/llagentui.cpp | |
| parent | 1e76fc2b1f4e735105f2d45d73ea5a92dbad4e05 (diff) | |
| parent | 6e0ebfe18c431465f6d1bc52e079c7a745419de5 (diff) | |
merge
Diffstat (limited to 'indra/newview/llagentui.cpp')
| -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 |