summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-03 07:50:40 -0500
committerOz Linden <oz@lindenlab.com>2011-03-03 07:50:40 -0500
commit856a6992ebb0989e5d143d987a3e9ba79bb6492e (patch)
tree030b791d9b0d0622ab90ef7e19d6d038eaf80260 /indra/newview/llviewerregion.cpp
parent0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff)
parentb7c49f0f47f53d200df5afe4a4b68a83dd789918 (diff)
pull latest changes from viewer-vs2010
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index c7649001c5..23b7b921b8 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -322,6 +322,12 @@ LLViewerRegion::~LLViewerRegion()
std::for_each(mObjectPartition.begin(), mObjectPartition.end(), DeletePointer());
}
+/*virtual*/
+const LLHost& LLViewerRegion::getHost() const
+{
+ return mHost;
+}
+
void LLViewerRegion::loadObjectCache()
{
if (mCacheLoaded)