diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2008-06-26 00:39:00 +0000 |
| commit | 25c10ed028da5c547b11f1f461916897272b0e6d (patch) | |
| tree | 350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/newview/lltoolcomp.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/newview/lltoolcomp.h')
| -rw-r--r-- | indra/newview/lltoolcomp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/lltoolcomp.h b/indra/newview/lltoolcomp.h index d6ec6032cd..8926cd34d2 100644 --- a/indra/newview/lltoolcomp.h +++ b/indra/newview/lltoolcomp.h @@ -47,7 +47,7 @@ class LLTextBox; class LLToolComposite : public LLTool { public: - LLToolComposite(const LLString& name); + LLToolComposite(const std::string& name); virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask) = 0; // Sets the current tool virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); // Returns to the default tool @@ -97,7 +97,7 @@ protected: LLToolSelectRect* mSelectRect; public: - static const LLString sNameComp; + static const std::string sNameComp; }; |