diff options
author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
---|---|---|
committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-07-13 18:54:16 +0300 |
commit | ba1123e3e482fdd061095c1374a41f8d007fbc22 (patch) | |
tree | 499b01923892a406d306eadd4507e6d7a41b471b /indra/llui/lluictrlfactory.h | |
parent | 623dae525dc14a69322266e33421770431c34a66 (diff) | |
parent | c3099df719274556fede1a57bc42e555e5c89fbb (diff) |
Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/llui/lluictrlfactory.h')
-rw-r--r-- | indra/llui/lluictrlfactory.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llui/lluictrlfactory.h b/indra/llui/lluictrlfactory.h index c99acee48e..dc43b311a7 100644 --- a/indra/llui/lluictrlfactory.h +++ b/indra/llui/lluictrlfactory.h @@ -182,7 +182,7 @@ public: void popFactoryFunctions(); template<typename T> - static T* createWidget(typename T::Params& params, LLView* parent = NULL) + static T* createWidget(const typename T::Params& params, LLView* parent = NULL) { T* widget = NULL; |