summaryrefslogtreecommitdiff
path: root/indra/newview/llworld.cpp
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2012-12-05 19:34:27 +0100
committerKitty Barnett <develop@catznip.com>2012-12-05 19:34:27 +0100
commit4c68faec400e4c6d75a53528d8064a3448707158 (patch)
tree01a30035a359b97b13a48332ba49b74332b44df8 /indra/newview/llworld.cpp
parent1e194eb412bb10c1733ed76e270e45578ac15e0b (diff)
Added LLMaterialMgr::getAll() to retrieve all materials for the specified region
Diffstat (limited to 'indra/newview/llworld.cpp')
-rw-r--r--indra/newview/llworld.cpp13
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp
index 78ee3e4fd9..ed6c8bd32b 100644
--- a/indra/newview/llworld.cpp
+++ b/indra/newview/llworld.cpp
@@ -403,6 +403,19 @@ LLViewerRegion* LLWorld::getRegionFromHandle(const U64 &handle)
return NULL;
}
+LLViewerRegion* LLWorld::getRegionFromID(const LLUUID& region_id)
+{
+ for (region_list_t::iterator iter = mRegionList.begin();
+ iter != mRegionList.end(); ++iter)
+ {
+ LLViewerRegion* regionp = *iter;
+ if (regionp->getRegionID() == region_id)
+ {
+ return regionp;
+ }
+ }
+ return NULL;
+}
void LLWorld::updateAgentOffset(const LLVector3d &offset_global)
{