Katharine Berry: Can load WindLight settings from LLSD notecards ending in ".wl"

1 files changed, 10 insertions, 2 deletions

diff --git a/linden/indra/newview/llwlparammanager.h b/linden/indra/newview/llwlparammanager.h
index 141af3c..c506c11 100644
--- a/linden/indra/newview/llwlparammanager.h
+++ b/linden/indra/newview/llwlparammanager.h
@@ -40,6 +40,9 @@
 #include "llwldaycycle.h"
 #include "llviewercamera.h"
 
+#include "llassettype.h" // Ugh.
+class LLVFS;
+
 class LLGLSLShader;
 
 class LLWLPresetsObserver
@@ -143,11 +146,14 @@ public:
         void savePresets(const std::string & fileName);
 
         /// load an individual preset into the sky
-        void loadPreset(const std::string & name,bool propogate=true);
+        void loadPreset(const std::string & name, bool propogate=true);
 
         /// load an individual preset into the sky from an LLSD stream
         /// Returns whether the stream was actually reasonable XML to load from.
-        bool loadPresetXML(const std::string& name, std::istream& preset_stream, bool check_if_real=false);
+        bool loadPresetXML(const std::string& name, std::istream& preset_stream, bool propogate=false, bool check_if_real=false);
+        
+        /// Load an individual preset from a notecard.
+        void loadPresetNotecard(const std::string& name, const LLUUID& asset_id, const LLUUID& inv_id);
 
         /// save the parameter presets to file
         void savePreset(const std::string & name);
@@ -274,6 +280,8 @@ private:
         
         static std::vector<LLWLPresetsObserver*> sObservers;
 
+        static void loadWindlightNotecard(LLVFS *vfs, const LLUUID& asset_id, LLAssetType::EType asset_type, void *user_data, S32 status, LLExtStat ext_status);
+
 };
 
 inline F32 LLWLParamManager::getDomeOffset(void) const