diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-08-28 22:30:09 +0000 |
| commit | 51500f82e23b7deff9a0e1bc23f5bfa40aec1fb9 (patch) | |
| tree | 2ed65f1dd0a8404eda670cf1fe2e37769758f74a /indra/newview/llagentui.cpp | |
| parent | b2b980d6979b10a08b56c10b71c12ae4f9e6ff59 (diff) | |
svn merge https://svn.aws.productengine.com/secondlife/export-from-ll/viewer-2-0@1480 https://svn.aws.productengine.com/secondlife/pe/stable-2@1489 -> viewer-2.0.0-3
* EXT-97 EXT-576 EXT-593 EXT-613 EXT-649 EXT-697 EXT-707 EXT-708 EXT-726 EXT-737
Diffstat (limited to 'indra/newview/llagentui.cpp')
| -rw-r--r-- | indra/newview/llagentui.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp index 93d88bf3df..1a69f1d975 100644 --- a/indra/newview/llagentui.cpp +++ b/indra/newview/llagentui.cpp @@ -89,7 +89,7 @@ std::string LLAgentUI::buildSLURL(const bool escaped /*= true*/) return slurl; } -BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat fmt,const LLVector3& agent_pos_region) +BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const LLVector3& agent_pos_region) { LLViewerRegion* region = gAgent.getRegion(); LLParcel* parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); @@ -128,14 +128,14 @@ BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat f // the parcel doesn't have a name switch (fmt) { - case LLAgent::LOCATION_FORMAT_LANDMARK: + case LOCATION_FORMAT_LANDMARK: buffer = llformat("%.100s", region_name.c_str()); break; - case LLAgent::LOCATION_FORMAT_NORMAL: + case LOCATION_FORMAT_NORMAL: buffer = llformat("%s", region_name.c_str()); break; - case LLAgent::LOCATION_FORMAT_WITHOUT_SIM: - case LLAgent::LOCATION_FORMAT_FULL: + case LOCATION_FORMAT_WITHOUT_SIM: + case LOCATION_FORMAT_FULL: buffer = llformat("%s (%d, %d, %d)", region_name.c_str(), pos_x, pos_y, pos_z); @@ -147,19 +147,19 @@ BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat f // the parcel has a name, so include it in the landmark name switch (fmt) { - case LLAgent::LOCATION_FORMAT_LANDMARK: + case LOCATION_FORMAT_LANDMARK: buffer = llformat("%.100s", parcel_name.c_str()); break; - case LLAgent::LOCATION_FORMAT_NORMAL: + case LOCATION_FORMAT_NORMAL: buffer = llformat("%s, %s", region_name.c_str(), parcel_name.c_str()); break; - case LLAgent::LOCATION_FORMAT_WITHOUT_SIM: + case LOCATION_FORMAT_WITHOUT_SIM: buffer = llformat("%s, %s (%d, %d, %d)", region_name.c_str(), parcel_name.c_str(), pos_x, pos_y, pos_z); break; - case LLAgent::LOCATION_FORMAT_FULL: + case LOCATION_FORMAT_FULL: std::string sim_access_string = region->getSimAccessString(); buffer = llformat("%s, %s (%d, %d, %d)%s%s", region_name.c_str(), @@ -173,7 +173,7 @@ BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat f str = buffer; return TRUE; } -BOOL LLAgentUI::buildLocationString(std::string& str, LLAgent::ELocationFormat fmt) +BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt) { return buildLocationString(str,fmt, gAgent.getPositionAgent()); } |