diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 14:47:29 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-11 14:47:29 +0000 |
| commit | f210d79443dfd72226677c1574c01846d1bedd04 (patch) | |
| tree | f9087392baa1e07203458362344aa106a9b9acba /indra/newview/llagentui.cpp | |
| parent | 1b8a7fdeaab78216baad1f916e9788c0b90287b3 (diff) | |
| parent | ce46b83538eacd769c78befa31d8f824509342cd (diff) | |
PE 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 |