summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorleyla_linden <none@none>2011-02-01 15:42:52 -0800
committerleyla_linden <none@none>2011-02-01 15:42:52 -0800
commit990a6206604b0a5e33902145b496f39927f6d5b9 (patch)
treec0d7561dc56b9003387554a640505af8fcc7cc51 /indra/newview/llviewerregion.cpp
parent1b366dfe72c5852904468aaf8ff66e8e7be88318 (diff)
parent7c5c82cb116b2dfd163055994803e07a1bfd5a8b (diff)
Merge
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 7fd6979702..1d18858750 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)