diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:58:49 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2009-05-08 07:58:49 +0000 |
| commit | 5da967dc744f35d5270c7cb0b8b23b993ecda3e1 (patch) | |
| tree | e345385b5bd2b84d94c59650c3637fb1b347394c /indra/llui/llui.cpp | |
| parent | 65d90e0e8b6a3702f799910eee11a9421e269d3a (diff) | |
merge skinning-7 -r 119501-119577 -> viewer-2.0.0-1 *NOTE: This overlaps a little with the skinning-7 -> skinning-8 merge of 119500-119692 -- James
ignore-dead-branch
Diffstat (limited to 'indra/llui/llui.cpp')
| -rw-r--r-- | indra/llui/llui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llui.cpp b/indra/llui/llui.cpp index dfe435d2e3..1cb6972370 100644 --- a/indra/llui/llui.cpp +++ b/indra/llui/llui.cpp @@ -1930,7 +1930,7 @@ LLLocalClipRect::LLLocalClipRect(const LLRect &rect, BOOL enabled) namespace LLInitParam { - TypedParam<LLUIColor >::TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLUIColor& value, ParamDescriptor::validation_func_t func) + TypedParam<LLUIColor >::TypedParam(BlockDescriptor& descriptor, const char* name, const LLUIColor& value, ParamDescriptor::validation_func_t func) : super_t(descriptor, name, value, func), red("red"), green("green"), @@ -1960,7 +1960,7 @@ namespace LLInitParam declare("blue", LLColor4::blue); } - TypedParam<const LLFontGL*>::TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLFontGL*const value, ParamDescriptor::validation_func_t func) + TypedParam<const LLFontGL*>::TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL*const value, ParamDescriptor::validation_func_t func) : super_t(descriptor, name, value, func), name("", std::string("")), size("size", std::string("")), @@ -1991,7 +1991,7 @@ namespace LLInitParam return mData.mValue; } - TypedParam<LLRect>::TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLRect& value, ParamDescriptor::validation_func_t func) + TypedParam<LLRect>::TypedParam(BlockDescriptor& descriptor, const char* name, const LLRect& value, ParamDescriptor::validation_func_t func) : super_t(descriptor, name, value, func), left("left"), top("top"), |