diff options
| author | McCabe Maxsted | 2009-06-09 01:34:48 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2009-06-09 01:34:48 -0700 |
| commit | b582d1a9b804f47b65bca09dc320808338d7e302 (patch) | |
| tree | ff1d2997d0c0644d65cc3505dda55e50452f7723 /linden/indra/newview/llnetmap.cpp | |
| parent | 'IM Received' button to '__ New IMs' (diff) | |
| download | meta-impy-b582d1a9b804f47b65bca09dc320808338d7e302.zip meta-impy-b582d1a9b804f47b65bca09dc320808338d7e302.tar.gz meta-impy-b582d1a9b804f47b65bca09dc320808338d7e302.tar.bz2 meta-impy-b582d1a9b804f47b65bca09dc320808338d7e302.tar.xz | |
Backported LL's version of VWR-2681 from 1.23
Diffstat (limited to 'linden/indra/newview/llnetmap.cpp')
| -rw-r--r-- | linden/indra/newview/llnetmap.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp index 9d92576..cedabf7 100644 --- a/linden/indra/newview/llnetmap.cpp +++ b/linden/indra/newview/llnetmap.cpp | |||
| @@ -257,8 +257,8 @@ void LLNetMap::draw() | |||
| 257 | // figure out where agent is | 257 | // figure out where agent is |
| 258 | S32 region_width = llround(LLWorld::getInstance()->getRegionWidthInMeters()); | 258 | S32 region_width = llround(LLWorld::getInstance()->getRegionWidthInMeters()); |
| 259 | 259 | ||
| 260 | for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin(); | 260 | for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); |
| 261 | iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter) | 261 | iter != LLWorld::getInstance()->getRegionList().end(); ++iter) |
| 262 | { | 262 | { |
| 263 | LLViewerRegion* regionp = *iter; | 263 | LLViewerRegion* regionp = *iter; |
| 264 | // Find x and y position relative to camera's center. | 264 | // Find x and y position relative to camera's center. |
| @@ -374,8 +374,8 @@ void LLNetMap::draw() | |||
| 374 | LLVector3 pos_map; | 374 | LLVector3 pos_map; |
| 375 | 375 | ||
| 376 | // Draw avatars | 376 | // Draw avatars |
| 377 | for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin(); | 377 | for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); |
| 378 | iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter) | 378 | iter != LLWorld::getInstance()->getRegionList().end(); ++iter) |
| 379 | { | 379 | { |
| 380 | LLViewerRegion* regionp = *iter; | 380 | LLViewerRegion* regionp = *iter; |
| 381 | const LLVector3d& origin_global = regionp->getOriginGlobal(); | 381 | const LLVector3d& origin_global = regionp->getOriginGlobal(); |