summaryrefslogtreecommitdiff
path: root/indra/newview/llwlparamset.h
diff options
context:
space:
mode:
authorGraham Madarasz (Graham) <graham@lindenlab.com>2013-03-01 11:21:35 -0800
committerGraham Madarasz (Graham) <graham@lindenlab.com>2013-03-01 11:21:35 -0800
commitdfda8826eb4654845430520dac48c011e058e1c0 (patch)
tree7ace15924b286393cc312f312bb632bc0d6eef86 /indra/newview/llwlparamset.h
parentae1aa461ea3f96c092e2a50ae40f290b03b25356 (diff)
Make WL updates use pre-hashed strings for uniform sets
Diffstat (limited to 'indra/newview/llwlparamset.h')
-rw-r--r--indra/newview/llwlparamset.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/newview/llwlparamset.h b/indra/newview/llwlparamset.h
index b087119dd5..3e9f77ba6c 100644
--- a/indra/newview/llwlparamset.h
+++ b/indra/newview/llwlparamset.h
@@ -29,9 +29,11 @@
#include <string>
#include <map>
+#include <vector>
#include "v4math.h"
#include "v4color.h"
+#include "llstaticstringtable.h"
class LLWLParamSet;
class LLGLSLShader;
@@ -47,9 +49,12 @@ public:
private:
LLSD mParamValues;
-
+ std::vector<LLStaticHashedString> mParamHashedNames;
+
float mCloudScrollXOffset, mCloudScrollYOffset;
+ void updateHashedNames();
+
public:
LLWLParamSet();
@@ -177,6 +182,8 @@ inline void LLWLParamSet::setAll(const LLSD& val)
if(val.isMap()) {
mParamValues = val;
}
+
+ updateHashedNames();
}
inline const LLSD& LLWLParamSet::getAll()