diff options
author | Dave SIMmONs <simon@lindenlab.com> | 2011-02-24 17:42:16 -0800 |
---|---|---|
committer | Dave SIMmONs <simon@lindenlab.com> | 2011-02-24 17:42:16 -0800 |
commit | 52ae219d502d182a7e6c000070e5935b923f30e7 (patch) | |
tree | 556151d5097feb5ae079786044188cb0d0400d16 /indra/newview/llviewerregion.cpp | |
parent | 1c8c28a8de73228c06fdf2d84045433c7231cd19 (diff) | |
parent | 609c70eb5a48389bef1ad33358774764ee9615e2 (diff) |
Merge again lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r-- | indra/newview/llviewerregion.cpp | 6 |
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) |