summaryrefslogtreecommitdiff
path: root/indra/llui/llui.h
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2009-05-08 07:58:49 +0000
committerSteven Bennetts <steve@lindenlab.com>2009-05-08 07:58:49 +0000
commit5da967dc744f35d5270c7cb0b8b23b993ecda3e1 (patch)
treee345385b5bd2b84d94c59650c3637fb1b347394c /indra/llui/llui.h
parent65d90e0e8b6a3702f799910eee11a9421e269d3a (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.h')
-rw-r--r--indra/llui/llui.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/llui/llui.h b/indra/llui/llui.h
index b5a42bce13..18aa1aa143 100644
--- a/indra/llui/llui.h
+++ b/indra/llui/llui.h
@@ -706,7 +706,7 @@ namespace LLInitParam
width,
height;
- TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLRect& value, ParamDescriptor::validation_func_t func);
+ TypedParam(BlockDescriptor& descriptor, const char* name, const LLRect& value, ParamDescriptor::validation_func_t func);
LLRect getValueFromBlock() const;
};
@@ -729,7 +729,7 @@ namespace LLInitParam
Optional<F32> alpha;
Optional<std::string> control;
- TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLUIColor& value, ParamDescriptor::validation_func_t func);
+ TypedParam(BlockDescriptor& descriptor, const char* name, const LLUIColor& value, ParamDescriptor::validation_func_t func);
LLUIColor getValueFromBlock() const;
};
@@ -743,7 +743,7 @@ namespace LLInitParam
Optional<std::string> size;
Optional<std::string> style;
- TypedParam(BlockDescriptor& descriptor, const std::string& name, const LLFontGL* const value, ParamDescriptor::validation_func_t func);
+ TypedParam(BlockDescriptor& descriptor, const char* name, const LLFontGL* const value, ParamDescriptor::validation_func_t func);
const LLFontGL* getValueFromBlock() const;
};