diff options
author | Graham Madarasz <graham@lindenlab.com> | 2013-05-14 05:59:48 -0700 |
---|---|---|
committer | Graham Madarasz <graham@lindenlab.com> | 2013-05-14 05:59:48 -0700 |
commit | c334a185f331a3392c2d0ccaf8241166ef9d8049 (patch) | |
tree | 9be5040e58fd04ff867384fa4ea8e626e8df92f5 /indra/newview/lltexturectrl.h | |
parent | d9e8ee7cfd323872145c23e4032989f9b7770f55 (diff) |
NORSPEC-151 NORSPEC-152 fix handling of disable of bumpy and shiny in graphics panel to also disable deferred properly and add hooks for default norm and spec textures in texture picker
Diffstat (limited to 'indra/newview/lltexturectrl.h')
-rwxr-xr-x | indra/newview/lltexturectrl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/lltexturectrl.h b/indra/newview/lltexturectrl.h index 3fd024082e..a7ef1b3f78 100755 --- a/indra/newview/lltexturectrl.h +++ b/indra/newview/lltexturectrl.h @@ -146,6 +146,9 @@ public: const std::string& getDefaultImageName() const { return mDefaultImageName; } + void setBlankImageAssetID( const LLUUID& id ) { mBlankImageAssetID = id; } + const LLUUID& getBlankImageAssetID() const { return mBlankImageAssetID; } + void setCaption(const std::string& caption); void setCanApplyImmediately(BOOL b); @@ -202,6 +205,7 @@ private: LLUUID mImageItemID; LLUUID mImageAssetID; LLUUID mDefaultImageAssetID; + LLUUID mBlankImageAssetID; LLUIImagePtr mFallbackImage; std::string mDefaultImageName; LLHandle<LLFloater> mFloaterHandle; |