diff options
| author | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-23 14:08:50 -0700 |
| commit | 58ac85223e976556b060ca0ff345f1a96d8f7848 (patch) | |
| tree | 1e8901e1a47304829d67e5e71b178a5f47142c7c /indra/newview/lltexturectrl.cpp | |
| parent | 92195c479f597538a55dfa8b2e02c1b4908a2259 (diff) | |
| parent | fbcbfb88059b0d669592407205dd4167257a2395 (diff) | |
merge
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 1625b4bafd..328298bda4 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -196,8 +196,8 @@ LLFloaterTexturePicker::LLFloaterTexturePicker( mContextConeOpacity(0.f), mSelectedItemPinned( FALSE ) { + buildFromFile("floater_texture_ctrl.xml"); mCanApplyImmediately = can_apply_immediately; - LLUICtrlFactory::getInstance()->buildFloater(this,"floater_texture_ctrl.xml",NULL); setCanMinimize(FALSE); } |