diff options
| author | Richard Linden <none@none> | 2010-09-23 12:00:17 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-09-23 12:00:17 -0700 |
| commit | fbcbfb88059b0d669592407205dd4167257a2395 (patch) | |
| tree | 7855a06b2bf542262c1d50a602d67244d0df6b5e /indra/newview/lltexturectrl.cpp | |
| parent | 18bd7dfae789ce0d6be3de3811d6d779fc4ec63e (diff) | |
| parent | 904776288c7f7ebd945e563567aafbcab387d0b2 (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); } |