diff options
author | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
---|---|---|
committer | Rick Pasetto <rick@lindenlab.com> | 2009-11-03 09:44:09 -0800 |
commit | a0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (patch) | |
tree | 279f3421a88280d6003d6973dcb5556702e2c52f /indra/newview/llviewermedia.h | |
parent | c59e2d21174415842b1418c5f389becb7c013706 (diff) | |
parent | c9d121dd01625790cb963372c861f8e4072430d2 (diff) |
merge from remote repo
Diffstat (limited to 'indra/newview/llviewermedia.h')
-rw-r--r-- | indra/newview/llviewermedia.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llviewermedia.h b/indra/newview/llviewermedia.h index dac0482078..d6dde0c93e 100644 --- a/indra/newview/llviewermedia.h +++ b/indra/newview/llviewermedia.h @@ -228,7 +228,7 @@ public: /*virtual*/ BOOL handleToolTip(S32 x, S32 y, MASK mask) { return FALSE; }; /*virtual*/ BOOL handleMiddleMouseDown(S32 x, S32 y, MASK mask) { return FALSE; }; /*virtual*/ BOOL handleMiddleMouseUp(S32 x, S32 y, MASK mask) {return FALSE; }; - /*virtual*/ std::string getName() const { return LLStringUtil::null; }; + /*virtual*/ std::string getName() const; /*virtual*/ void screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const {}; /*virtual*/ void localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const {}; @@ -258,7 +258,7 @@ public: void calculateInterest(); F64 getInterest() const { return mInterest; }; F64 getApproximateTextureInterest(); - S32 getProximity() { return mProximity; }; + S32 getProximity() const { return mProximity; }; // Mark this object as being used in a UI panel instead of on a prim // This will be used as part of the interest sorting algorithm. |