livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

STORM-1128 Sort the results of using search in the World Map

meow-7.2.2
Jonathan Yap 2011-04-13 15:09:44 -04:00
parent f633aef1af
commit efa26485df
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/contributions.txt
View File

@ -414,6 +414,7 @@ Jonathan Yap
STORM-1020
STORM-1064
STORM-1077
STORM-1128
Kage Pixel
VWR-11
Ken March
@ -644,6 +645,7 @@ Robin Cornelius
STORM-422
STORM-960
STORM-1019
STORM-1128
VWR-2488
VWR-9557
VWR-10579

18
indra/newview/llfloaterworldmap.cpp
View File

@ -96,6 +96,14 @@ enum EPanDirection
// Values in pixels per region
static const F32 ZOOM_MAX = 128.f;
struct SortRegionNames
{
inline bool operator ()(std::pair <U64, LLSimInfo*>& _left, std::pair <U64, LLSimInfo*>& _right)
{
return(LLStringUtil::compareInsensitive(_left.second->getName(),_right.second->getName()) < 0);
}
};
//---------------------------------------------------------------------------
// Globals
//---------------------------------------------------------------------------
@ -1483,10 +1491,14 @@ void LLFloaterWorldMap::updateSims(bool found_null_sim)
S32 name_length = mCompletingRegionName.length();
LLSD match;
S32 num_results = 0;
std::map<U64, LLSimInfo*>::const_iterator it;
for (it = LLWorldMap::getInstance()->getRegionMap().begin(); it != LLWorldMap::getInstance()->getRegionMap().end(); ++it)
std::vector<std::pair <U64, LLSimInfo*>> simInfoVec(LLWorldMap::getInstance()->getRegionMap().begin(), LLWorldMap::getInstance()->getRegionMap().end());
std::sort(simInfoVec.begin(), simInfoVec.end(), SortRegionNames());
std::vector<std::pair <U64, LLSimInfo*>>::const_iterator it;
for (it = simInfoVec.begin(); it != simInfoVec.end(); ++it)
{
LLSimInfo* info = it->second;
std::string sim_name_lower = info->getName();