diff options
| author | Merov Linden <merov@lindenlab.com> | 2010-10-12 16:08:31 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2010-10-12 16:08:31 -0700 |
| commit | e3ecffc180ae50a0e8b726a061ec39cbe591326e (patch) | |
| tree | 3501d25df3c89517988251557e34a9fc268287f1 /indra/newview/lltexturectrl.cpp | |
| parent | 88e33d00cd189aec6ef9b5aa481d4d9a2777b1fb (diff) | |
| parent | a8fbfa40ba6153668e1f713ae0e128224b4f400f (diff) | |
Pull update from viewer-development
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); } |