Applied SNOW-378: debug setting to compile inventory scripts in Mono

4 files changed, 27 insertions, 14 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7648c58..0911110 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,22 +1,16 @@
 2010-01-07 McCabe Maxsted  <hakushakukun@gmail.com>
 
+        * Applied SNOW-378: debug setting to compile inventory scripts in Mono.
+        
+          modified:   linden/doc/contributions.txt
+          modified:   linden/indra/newview/app_settings/settings.xml
+          modified:   linden/indra/newview/llpreviewscript.cpp
+
+
         * Fixed GStreamer missing libpng12-0.dll (TODO: update gstreamer).
         
           modified:   linden/indra/cmake/CopyWinLibs.cmake
           modified:   linden/install.xml
-          
-        
-2010-01-06 McCabe Maxsted  <hakushakukun@gmail.com>
-
-        * Applied VWR-4232: some particles do not disappear when UI is hidden, from snowglobe.
-        
-          modified:   linden/indra/newview/llhudeffectbeam.cpp
-          modified:   linden/indra/newview/llhudeffectbeam.h
-          modified:   linden/indra/newview/llhudeffecttrail.cpp
-          modified:   linden/indra/newview/llhudeffecttrail.h
-          modified:   linden/indra/newview/llhudobject.cpp
-          modified:   linden/indra/newview/llhudobject.h
-          modified:   linden/indra/newview/pipeline.cpp
 
 
 2010-01-03  Armin Weatherwax  <Armin.Weatherwax@gmail.com>
diff --git a/linden/doc/contributions.txt b/linden/doc/contributions.txt
index ff433c4..7b7d313 100644
--- a/linden/doc/contributions.txt
+++ b/linden/doc/contributions.txt
@@ -240,6 +240,7 @@ Hamncheese Omlet
 HappySmurf Papp
         CT-193
 Henri Beauchamp
+        SNOW-378
         VWR-1320
         VWR-1406
         VWR-4157
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 945f241..7194dac 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -8365,6 +8365,17 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
+    <key>SaveInventoryScriptsAsMono</key>
+    <map>
+      <key>Comment</key>
+      <string>When editing and saving a script in inventory, configure it to compile as mono when dragged into a task</string>
+      <key>Persist</key>
+      <integer>1</integer>
+      <key>Type</key>
+      <string>Boolean</string>
+      <key>Value</key>
+      <real>0</real>
+    </map>
     <key>SaveMinidump</key>
     <map>
       <key>Comment</key>
diff --git a/linden/indra/newview/llpreviewscript.cpp b/linden/indra/newview/llpreviewscript.cpp
index ccec75b..2718c2f 100644
--- a/linden/indra/newview/llpreviewscript.cpp
+++ b/linden/indra/newview/llpreviewscript.cpp
@@ -1418,7 +1418,14 @@ void LLPreviewLSL::uploadAssetViaCaps(const std::string& url,
         llinfos << "Update Agent Inventory via capability" << llendl;
         LLSD body;
         body["item_id"] = item_id;
-        body["target"] = "lsl2";
+        if (gSavedSettings.getBOOL("SaveInventoryScriptsAsMono"))
+        {
+                body["target"] = "mono";
+        }
+        else
+        {
+                body["target"] = "lsl2";
+        }
         LLHTTPClient::post(url, body, new LLUpdateAgentInventoryResponder(body, filename, LLAssetType::AT_LSL_TEXT));
 }