From efa26485dfa20d138cb654e27cb90e209dd1f395 Mon Sep 17 00:00:00 2001
From: Jonathan Yap <none@none>
Date: Wed, 13 Apr 2011 15:09:44 -0400
Subject: STORM-1128 Sort the results of using search in the World Map
---
indra/newview/llfloaterworldmap.cpp | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
(limited to 'indra')
diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp
index 03cf0332a9..bf5f569e36 100755
--- a/indra/newview/llfloaterworldmap.cpp
+++ b/indra/newview/llfloaterworldmap.cpp
@@ -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();
--
cgit v1.2.3