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/llfloatergodtools.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/llfloatergodtools.cpp')
| -rw-r--r-- | linden/indra/newview/llfloatergodtools.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp index 7d54ecf..4b44793 100644 --- a/linden/indra/newview/llfloatergodtools.cpp +++ b/linden/indra/newview/llfloatergodtools.cpp | |||
| @@ -1344,8 +1344,8 @@ void LLPanelRequestTools::refresh() | |||
| 1344 | list->operateOnAll(LLCtrlListInterface::OP_DELETE); | 1344 | list->operateOnAll(LLCtrlListInterface::OP_DELETE); |
| 1345 | list->addSimpleElement(SELECTION); | 1345 | list->addSimpleElement(SELECTION); |
| 1346 | list->addSimpleElement(AGENT_REGION); | 1346 | list->addSimpleElement(AGENT_REGION); |
| 1347 | for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin(); | 1347 | for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); |
| 1348 | iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter) | 1348 | iter != LLWorld::getInstance()->getRegionList().end(); ++iter) |
| 1349 | { | 1349 | { |
| 1350 | LLViewerRegion* regionp = *iter; | 1350 | LLViewerRegion* regionp = *iter; |
| 1351 | std::string name = regionp->getName(); | 1351 | std::string name = regionp->getName(); |
| @@ -1405,8 +1405,8 @@ void LLPanelRequestTools::onClickRequest(void* data) | |||
| 1405 | else | 1405 | else |
| 1406 | { | 1406 | { |
| 1407 | // find region by name | 1407 | // find region by name |
| 1408 | for (LLWorld::region_list_t::iterator iter = LLWorld::getInstance()->mActiveRegionList.begin(); | 1408 | for (LLWorld::region_list_t::const_iterator iter = LLWorld::getInstance()->getRegionList().begin(); |
| 1409 | iter != LLWorld::getInstance()->mActiveRegionList.end(); ++iter) | 1409 | iter != LLWorld::getInstance()->getRegionList().end(); ++iter) |
| 1410 | { | 1410 | { |
| 1411 | LLViewerRegion* regionp = *iter; | 1411 | LLViewerRegion* regionp = *iter; |
| 1412 | if(dest == regionp->getName()) | 1412 | if(dest == regionp->getName()) |