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 | b5ab9c07031ffadb77792c312ca2bb1131d90fb0 (patch) | |
| tree | 499b01923892a406d306eadd4507e6d7a41b471b /indra/newview/lldndbutton.cpp | |
| parent | eb6153d2c3cb1e2105804e28f81f894873315545 (diff) | |
| parent | c201038aba861b1166d367fcf5986e33644ec018 (diff) | |
Manual merge from default branch
Resolved conflicts in llpaneloutfitedit.cpp
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lldndbutton.cpp')
| -rw-r--r-- | indra/newview/lldndbutton.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lldndbutton.cpp b/indra/newview/lldndbutton.cpp index 22f2bb1d16..4f4c7dead7 100644 --- a/indra/newview/lldndbutton.cpp +++ b/indra/newview/lldndbutton.cpp @@ -42,7 +42,7 @@ LLDragAndDropButton::Params::Params() } -LLDragAndDropButton::LLDragAndDropButton(Params& params) +LLDragAndDropButton::LLDragAndDropButton(const Params& params) : LLButton(params) { |