diff options
| author | Richard Nelson <none@none> | 2010-09-09 11:38:34 -0700 |
|---|---|---|
| committer | Richard Nelson <none@none> | 2010-09-09 11:38:34 -0700 |
| commit | 4f442653dcf302b30d049482900c56b7456f94e8 (patch) | |
| tree | bdf3218f3fcb420bde0ea298a3f465e02710f616 /indra/newview/lltexturectrl.cpp | |
| parent | 9dc0cbf6dabf729d8759f4abcf226ed05bb64055 (diff) | |
| parent | e7884bbab54d172957f5ee05df8dad3a4f8931bd (diff) | |
Automated merge with ssh://hg.lindenlab.com/monroe/viewer-experience-3
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index cb9fc4c5fe..328298bda4 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -196,6 +196,7 @@ LLFloaterTexturePicker::LLFloaterTexturePicker( mContextConeOpacity(0.f), mSelectedItemPinned( FALSE ) { + buildFromFile("floater_texture_ctrl.xml"); mCanApplyImmediately = can_apply_immediately; setCanMinimize(FALSE); } |