Merge branch 'next' of github.com:onefang/meta-impy into nextHEADnext

1 files changed, 3 insertions, 1 deletions

diff --git a/linden/indra/newview/llwaterparamset.h b/linden/indra/newview/llwaterparamset.h
index efbad31..09da42b 100644
--- a/linden/indra/newview/llwaterparamset.h
+++ b/linden/indra/newview/llwaterparamset.h
@@ -47,12 +47,14 @@ class LLWaterParamSet;
 class LLWaterParamSet 
 {
         friend class LLWaterParamManager;
+        friend class LLWLParamManager;
+        friend class LightShare;
 
 public:
         std::string mName;
         LLUUID mInventoryID;
         
-private:
+protected:
 
         LLSD mParamValues;