summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.h
diff options
context:
space:
mode:
authorTofu Buzzard <no-email>2011-02-01 09:45:28 -0800
committerTofu Buzzard <no-email>2011-02-01 09:45:28 -0800
commitce90d8f8da4f0d2ca6b3aa3a96c0ce68a64bd495 (patch)
treed4d31830e96d75a8062074c3ce98b5884a0b47ba /indra/newview/llviewerregion.h
parent3f139aa20ab0ebd983837c2d041ca53a0e7c5fb8 (diff)
parent7ddf7e17c01242901cef9219e27077e0d1243997 (diff)
merge
Diffstat (limited to 'indra/newview/llviewerregion.h')
-rw-r--r--indra/newview/llviewerregion.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerregion.h b/indra/newview/llviewerregion.h
index 7c6559203e..dd40b876cd 100644
--- a/indra/newview/llviewerregion.h
+++ b/indra/newview/llviewerregion.h
@@ -245,7 +245,7 @@ public:
LLEventPump& getCapAPI() { return mCapabilityListener.getCapAPI(); }
/// implements LLCapabilityProvider
- virtual LLHost getHost() const { return mHost; }
+ /*virtual*/ const LLHost& getHost() const;
const U64 &getHandle() const { return mHandle; }
LLSurface &getLand() const { return *mLandp; }