diff options
| author | cosmic-linden <111533034+cosmic-linden@users.noreply.github.com> | 2024-01-24 10:14:59 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-24 10:14:59 -0800 |
| commit | c22aefafb3d05be37965361913c02568fa10adf6 (patch) | |
| tree | 575757798bdf15d9c58e8e17e5f170de2e074b7a /indra/newview/lltexturectrl.cpp | |
| parent | 2adecc6fac9852974e44e3d58ccf2619b45642a9 (diff) | |
| parent | 7b0372ac1f6191ef9216296cef2f476caadee40c (diff) | |
Merge pull request #657 from secondlife/DRTVWR-592
Merge PBR terrain and put PBR terrain behind feature flag.
Diffstat (limited to 'indra/newview/lltexturectrl.cpp')
| -rw-r--r-- | indra/newview/lltexturectrl.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/lltexturectrl.cpp b/indra/newview/lltexturectrl.cpp index b9cb00b561..916c0194c2 100644 --- a/indra/newview/lltexturectrl.cpp +++ b/indra/newview/lltexturectrl.cpp @@ -1654,7 +1654,7 @@ LLTextureCtrl::LLTextureCtrl(const LLTextureCtrl::Params& p) mShowLoadingPlaceholder( TRUE ), mOpenTexPreview(false), mBakeTextureEnabled(true), - mInventoryPickType(PICK_TEXTURE), + mInventoryPickType(p.pick_type), mImageAssetID(p.image_id), mDefaultImageAssetID(p.default_image_id), mDefaultImageName(p.default_image_name), @@ -2406,6 +2406,16 @@ LLSD LLTextureCtrl::getValue() const return LLSD(getImageAssetID()); } +namespace LLInitParam +{ + void TypeValues<EPickInventoryType>::declareValues() + { + declare("texture_material", PICK_TEXTURE_MATERIAL); + declare("texture", PICK_TEXTURE); + declare("material", PICK_MATERIAL); + } +} + |