1 files changed, 17 insertions, 6 deletions

diff --git a/linden/indra/newview/llworldmap.cpp b/linden/indra/newview/llworldmap.cpp
index 3ada36f..bd3996d 100644
--- a/linden/indra/newview/llworldmap.cpp
+++ b/linden/indra/newview/llworldmap.cpp
@@ -237,15 +237,26 @@ LLSimInfo* LLWorldMap::simInfoFromPosGlobal(const LLVector3d& pos_global)
         return simInfoFromHandle(handle);
 }
 
-LLSimInfo* LLWorldMap::simInfoFromHandle(const U64 handle)
+LLSimInfo* LLWorldMap::simInfoFromHandle(const U64 findhandle)
 {
-        sim_info_map_t::iterator it = mSimInfoMap.find(handle);
-        if (it != mSimInfoMap.end())
+        std::map<U64, LLSimInfo*>::const_iterator it;
+        for (it = LLWorldMap::getInstance()->mSimInfoMap.begin(); it != LLWorldMap::getInstance()->mSimInfoMap.end(); ++it)
         {
-                LLSimInfo* sim_info = (*it).second;
-                if (sim_info)
+                const U64 handle = (*it).first;
+                LLSimInfo* info = (*it).second;
+                if(handle == findhandle)
+                {
+                        return info;
+                }
+                U32 x = 0, y = 0;
+                from_region_handle(findhandle, &x, &y);
+                U32 checkRegionX, checkRegionY;
+                from_region_handle(handle, &checkRegionX, &checkRegionY);
+
+        if(x > checkRegionX && x < (checkRegionX + info->msizeX) &&
+                        y > checkRegionY && y < (checkRegionY + info->msizeY))
                 {
-                        return sim_info;
+                        return info;
                 }
         }
         return NULL;