diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:47:22 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-01-27 09:47:22 -0500 |
| commit | b4c36af1419c980fd6be032b44033852d036a790 (patch) | |
| tree | c3ec2084584eec2203b6661d6cca4650b100300e /indra/newview/llviewerregion.cpp | |
| parent | ff0e3e6177812cdb6b3e044500d50f5d8d10434a (diff) | |
| parent | 92eadc18f3ea3538c36518f7060b4b78a80bc0d7 (diff) | |
merge changes for storm-547
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) |