Skip to content
Snippets Groups Projects
Commit 64f4246f authored by Gilbert Gonzales's avatar Gilbert Gonzales
Browse files

ACME-471: Code cleanup, just moving some code.

parent 3d40f4d8
No related branches found
No related tags found
No related merge requests found
...@@ -112,6 +112,11 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const ...@@ -112,6 +112,11 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
case LOCATION_FORMAT_NORMAL: case LOCATION_FORMAT_NORMAL:
buffer = llformat("%s", region_name.c_str()); buffer = llformat("%s", region_name.c_str());
break; break;
case LOCATION_FORMAT_NORMAL_COORDS:
buffer = llformat("%s (%d, %d, %d)",
region_name.c_str(),
pos_x, pos_y, pos_z);
break;
case LOCATION_FORMAT_NO_COORDS: case LOCATION_FORMAT_NO_COORDS:
buffer = llformat("%s%s%s", buffer = llformat("%s%s%s",
region_name.c_str(), region_name.c_str(),
...@@ -130,11 +135,6 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const ...@@ -130,11 +135,6 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
sim_access_string.empty() ? "" : " - ", sim_access_string.empty() ? "" : " - ",
sim_access_string.c_str()); sim_access_string.c_str());
break; break;
case LOCATION_FORMAT_NORMAL_COORDS:
buffer = llformat("%s (%d, %d, %d)",
region_name.c_str(),
pos_x, pos_y, pos_z);
break;
} }
} }
else else
...@@ -148,6 +148,11 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const ...@@ -148,6 +148,11 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
case LOCATION_FORMAT_NORMAL: case LOCATION_FORMAT_NORMAL:
buffer = llformat("%s, %s", parcel_name.c_str(), region_name.c_str()); buffer = llformat("%s, %s", parcel_name.c_str(), region_name.c_str());
break; break;
case LOCATION_FORMAT_NORMAL_COORDS:
buffer = llformat("%s (%d, %d, %d)",
parcel_name.c_str(),
pos_x, pos_y, pos_z);
break;
case LOCATION_FORMAT_NO_MATURITY: case LOCATION_FORMAT_NO_MATURITY:
buffer = llformat("%s, %s (%d, %d, %d)", buffer = llformat("%s, %s (%d, %d, %d)",
parcel_name.c_str(), parcel_name.c_str(),
...@@ -169,11 +174,6 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const ...@@ -169,11 +174,6 @@ BOOL LLAgentUI::buildLocationString(std::string& str, ELocationFormat fmt,const
sim_access_string.empty() ? "" : " - ", sim_access_string.empty() ? "" : " - ",
sim_access_string.c_str()); sim_access_string.c_str());
break; break;
case LOCATION_FORMAT_NORMAL_COORDS:
buffer = llformat("%s (%d, %d, %d)",
parcel_name.c_str(),
pos_x, pos_y, pos_z);
break;
} }
} }
str = buffer; str = buffer;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment