summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-24 22:27:08 -0500
committerOz Linden <oz@lindenlab.com>2011-02-24 22:27:08 -0500
commited73c8bf6357ca1e1a8009ead6b3b664e25c29c9 (patch)
tree36a9cb02c09caed35696d35686948190b697cb7a /indra/newview/llviewerregion.h
parent2e7461277801dc0daa1e9ea509e079c980045f42 (diff)
parent4c343c4506604b8dd0ac2d99a2b9661a1d382fc7 (diff)
pull latest changes from viewer-vs2010
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; }