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/llui/llviewborder.h | |
| parent | 6dd125d375b38455997a0c4b8747659f4c2351aa (diff) | |
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llui/llviewborder.h')
| -rw-r--r-- | indra/llui/llviewborder.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/llviewborder.h b/indra/llui/llviewborder.h index 3353103e96..d1bea62cb7 100644 --- a/indra/llui/llviewborder.h +++ b/indra/llui/llviewborder.h @@ -41,7 +41,7 @@ public: enum EBevel { BEVEL_IN, BEVEL_OUT, BEVEL_BRIGHT, BEVEL_NONE }; enum EStyle { STYLE_LINE, STYLE_TEXTURE }; - LLViewBorder( const LLString& name, const LLRect& rect, EBevel bevel = BEVEL_OUT, EStyle style = STYLE_LINE, S32 width = 1 ); + LLViewBorder( const std::string& name, const LLRect& rect, EBevel bevel = BEVEL_OUT, EStyle style = STYLE_LINE, S32 width = 1 ); virtual void setValue(const LLSD& val) { setRect(LLRect(val)); } |