diff options
| author | Tofu Buzzard <no-email> | 2011-02-01 09:44:47 -0800 |
|---|---|---|
| committer | Tofu Buzzard <no-email> | 2011-02-01 09:44:47 -0800 |
| commit | 7ddf7e17c01242901cef9219e27077e0d1243997 (patch) | |
| tree | 3e256a2e6af59ebed663e8d5bdd31f3b73e1e02d /indra/newview/llviewerregion.h | |
| parent | 622c5f11306c88055fc1be0a290041ef7e3394a4 (diff) | |
| parent | c7d0fab7b9279c5f6a57ee3de103b8fb142fb747 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewerregion.h')
| -rw-r--r-- | indra/newview/llviewerregion.h | 2 |
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; } |