Second Life viewer sources 1.15.0.2

1 files changed, 7 insertions, 8 deletions

diff --git a/linden/indra/newview/llfloatergodtools.cpp b/linden/indra/newview/llfloatergodtools.cpp
index e1d12d2..7376bba 100644
--- a/linden/indra/newview/llfloatergodtools.cpp
+++ b/linden/indra/newview/llfloatergodtools.cpp
@@ -4,6 +4,7 @@
  *
  * Copyright (c) 2002-2007, Linden Research, Inc.
  * 
+ * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
  * to you under the terms of the GNU General Public License, version 2.0
  * ("GPL"), unless you have obtained a separate licensing agreement
@@ -1344,11 +1345,10 @@ void LLPanelRequestTools::refresh()
         list->operateOnAll(LLCtrlListInterface::OP_DELETE);
         list->addSimpleElement(SELECTION);
         list->addSimpleElement(AGENT_REGION);
-        LLViewerRegion* regionp;
-        for(regionp = gWorldp->mActiveRegionList.getFirstData();
-                regionp != NULL;
-                regionp = gWorldp->mActiveRegionList.getNextData())
+        for (LLWorld::region_list_t::iterator iter = gWorldp->mActiveRegionList.begin();
+                 iter != gWorldp->mActiveRegionList.end(); ++iter)
         {
+                LLViewerRegion* regionp = *iter;
                 LLString name = regionp->getName();
                 if (!name.empty())
                 {
@@ -1406,11 +1406,10 @@ void LLPanelRequestTools::onClickRequest(void* data)
         else
         {
                 // find region by name
-                LLViewerRegion* regionp;
-                for(regionp = gWorldp->mActiveRegionList.getFirstData();
-                        regionp != NULL;
-                        regionp = gWorldp->mActiveRegionList.getNextData())
+                for (LLWorld::region_list_t::iterator iter = gWorldp->mActiveRegionList.begin();
+                         iter != gWorldp->mActiveRegionList.end(); ++iter)
                 {
+                        LLViewerRegion* regionp = *iter;
                         if(dest == regionp->getName())
                         {
                                 // found it