diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:50:40 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-03-03 07:50:40 -0500 |
| commit | 856a6992ebb0989e5d143d987a3e9ba79bb6492e (patch) | |
| tree | 030b791d9b0d0622ab90ef7e19d6d038eaf80260 /indra/newview/llviewerregion.h | |
| parent | 0d93ce2e4a3daabc8d653290e39b67e5cddabb14 (diff) | |
| parent | b7c49f0f47f53d200df5afe4a4b68a83dd789918 (diff) | |
pull latest changes from viewer-vs2010
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; } |