diff options
| author | Ptolemy <ptolemy@lindenlab.com> | 2022-06-27 14:59:54 -0700 |
|---|---|---|
| committer | Ptolemy <ptolemy@lindenlab.com> | 2022-06-27 14:59:54 -0700 |
| commit | 3bc1c69caabc62bd38c10d15443dea52f3d5c0c8 (patch) | |
| tree | dbddcb2209963441b92b87ed52a28a92144eac1b /indra/newview/lltexturectrl.cpp | |
| parent | 7ac0923e3375c490daa1ff1ae34a68b99e41afad (diff) | |
| parent | cc535ecccc3c415655a52cc597b33102e5ea21db (diff) | |
Merge branch 'DRTVWR-559' of bitbucket.org:lindenlab/viewer into DRTVWR-559
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 b761f34790..ee83d9eb57 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -121,8 +121,8 @@ LLFloaterTexturePicker::LLFloaterTexturePicker( mOnUpdateImageStatsCallback(NULL), mBakeTextureEnabled(FALSE) { - buildFromFile("floater_texture_ctrl.xml"); mCanApplyImmediately = can_apply_immediately; + buildFromFile("floater_texture_ctrl.xml"); setCanMinimize(FALSE); } |