diff options
author | Richard Nelson <none@none> | 2010-08-16 17:57:03 -0700 |
---|---|---|
committer | Richard Nelson <none@none> | 2010-08-16 17:57:03 -0700 |
commit | 0399d49e52d16c4335a933ac8d8f2ae251aeec6d (patch) | |
tree | f7d80e317e3f2c0bcab7efc1117df403cb1f2af0 /indra/newview/lltexturectrl.cpp | |
parent | 7dce65a5db84988b2cab3d9c977a86c08124701c (diff) | |
parent | 98bcaa1071ac4fb0b98a719c7fc7bdb3682dae4c (diff) |
merge
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
-rw-r--r-- | indra/newview/lltexturectrl.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index 127e4010ca..2bf9483a23 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -203,7 +203,6 @@ LLFloaterTexturePicker::LLFloaterTexturePicker( mSelectedItemPinned( FALSE ) { mCanApplyImmediately = can_apply_immediately; - LLUICtrlFactory::getInstance()->buildFloater(this,"floater_texture_ctrl.xml",NULL); setCanMinimize(FALSE); } |