diff options
Diffstat (limited to 'indra/newview/lltool.h')
| -rw-r--r-- | indra/newview/lltool.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/lltool.h b/indra/newview/lltool.h index 7d565f1574..3cc7f24712 100644 --- a/indra/newview/lltool.h +++ b/indra/newview/lltool.h @@ -47,7 +47,7 @@ class LLTool : public LLMouseHandler { public: - LLTool( const LLString& name, LLToolComposite* composite = NULL ); + LLTool( const std::string& name, LLToolComposite* composite = NULL ); virtual ~LLTool(); // Hack to support LLFocusMgr @@ -61,14 +61,14 @@ 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, LLString& msg, LLRect* sticky_rect_screen); + virtual BOOL handleToolTip(S32 x, S32 y, std::string& msg, LLRect* sticky_rect_screen); // 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 { *local_x = screen_x; *local_y = screen_y; } 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 LLString& getName() const { return mName; } + virtual const std::string& getName() const { return mName; } // New virtual functions virtual LLViewerObject* getEditingObject() { return NULL; } @@ -99,10 +99,10 @@ public: protected: LLToolComposite* mComposite; // Composite will handle mouse captures. - LLString mName; + std::string mName; public: - static const LLString sNameNull; + static const std::string sNameNull; }; #endif |