diff options
| author | Xiaohong Bao <bao@lindenlab.com> | 2011-01-24 15:51:33 -0700 |
|---|---|---|
| committer | Xiaohong Bao <bao@lindenlab.com> | 2011-01-24 15:51:33 -0700 |
| commit | eec332cfbe200f585d8fd382867b90d89d1ab5c0 (patch) | |
| tree | 84ddc599c33a916a8996ca05ef36ecd41d119311 /indra/newview/llviewerregion.cpp | |
| parent | de83bd5c6b1e103993ba74321d600f1c413785ce (diff) | |
| parent | 2a14079563ce323452a8088cca994e4f5c0edcd4 (diff) | |
Automated merge with http://hg.secondlife.com/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) |