summaryrefslogtreecommitdiff
path: root/indra/llinventory/llsettingswater.h
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-05-15 17:17:51 -0700
committerRider Linden <rider@lindenlab.com>2018-05-15 17:17:51 -0700
commit3925e37532476c526375fd76143b2b5e1dcce9b9 (patch)
tree978f583f61b141676fb3b17764ed0091cabca1b1 /indra/llinventory/llsettingswater.h
parent885853b41775296d536f9bcb3614264109430c2b (diff)
Fix the blend code to record the amount of the blend and to store what is being blended towards.
Diffstat (limited to 'indra/llinventory/llsettingswater.h')
-rw-r--r--indra/llinventory/llsettingswater.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/llinventory/llsettingswater.h b/indra/llinventory/llsettingswater.h
index 92190fa7b1..64de4486ca 100644
--- a/indra/llinventory/llsettingswater.h
+++ b/indra/llinventory/llsettingswater.h
@@ -199,6 +199,13 @@ public:
return mWaterFogKS;
}
+ //-------------------------------------------
+ LLUUID getNextNormalMapID() const
+ {
+ return mNextNormalMapID;
+ }
+
+
virtual validation_list_t getValidationList() const override;
static validation_list_t validationList();
@@ -224,7 +231,7 @@ protected:
F32 mWaterFogKS;
private:
-
+ LLUUID mNextNormalMapID;
};
#endif