diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-05 13:39:53 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-05 13:39:53 -0700 |
| commit | 81a63ac0886a31a566535a3483e5013f5bc0b424 (patch) | |
| tree | 1bb0319755a5e26e0bc7f9f20632ae8f31538971 /indra/newview/lltool.h | |
| parent | 0f5bbec3747f3ff2b1d580506d35dc080fcd1a98 (diff) | |
| parent | 9818f158366a0df980a2e4b9251177d9a9209cfb (diff) | |
merge with latest from lindenlab/svn-imports-viewer-20
Diffstat (limited to 'indra/newview/lltool.h')
| -rw-r--r-- | indra/newview/lltool.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltool.h b/indra/newview/lltool.h index bef4a2e1fd..c3573cd38c 100644 --- a/indra/newview/lltool.h +++ b/indra/newview/lltool.h @@ -66,7 +66,7 @@ public: virtual BOOL handleDoubleClick(S32 x, S32 y, MASK mask); virtual BOOL handleRightMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleRightMouseUp(S32 x, S32 y, MASK mask); - virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect& sticky_rect_screen); + virtual BOOL handleToolTip(S32 x, S32 y, MASK mask); // Return FALSE to allow context menu to be shown. virtual void screenPointToLocal(S32 screen_x, S32 screen_y, S32* local_x, S32* local_y) const @@ -74,7 +74,7 @@ public: virtual void localPointToScreen(S32 local_x, S32 local_y, S32* screen_x, S32* screen_y) const { *screen_x = local_x; *screen_y = local_y; } - virtual const std::string& getName() const { return mName; } + virtual std::string getName() const { return mName; } // New virtual functions virtual LLViewerObject* getEditingObject() { return NULL; } |