diff options
| author | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:28:22 -0500 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2011-02-01 11:28:22 -0500 |
| commit | fbc6e5d63970e081d7543f884fcc0fb897fce28e (patch) | |
| tree | e722e908e0cc1f889be16a4815286172222dac6b /indra/newview/llviewerregion.cpp | |
| parent | 293b35f000ca4e8a4bcf85dc4782b2a72d1887ea (diff) | |
| parent | f0074f1002f36ad680ae04daf3f5e026dca31d54 (diff) | |
Automated merge up from viewer-development into mesh-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 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) |