Merge branch 'master' of ssh://opensimulator.org:/var/git/opensim

2026-08-05 17:05:55 +08:00 · 2021-03-18 18:45:28 +00:00
parent 74d86adc51 73619763b9
commit c295deb262
16 changed files with 233 additions and 47 deletions
--- a/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
+++ b/OpenSim/Framework/Serialization/External/RegionSettingsSerializer.cs
@@ -44,21 +44,25 @@ namespace OpenSim.Framework.Serialization.External
        /// Deserialize settings
        /// </summary>
        /// <param name="serializedSettings"></param>
+        /// <param name="regionEnv"></param>
+        /// <param name="estateSettings">The Estate Settings stored in the archive will be merged into this object</param>
        /// <returns></returns>
        /// <exception cref="System.Xml.XmlException"></exception>
-        public static RegionSettings Deserialize(byte[] serializedSettings, out ViewerEnvironment regionEnv)
+        public static RegionSettings Deserialize(byte[] serializedSettings, out ViewerEnvironment regionEnv, EstateSettings estateSettings)
        {
            // encoding is wrong. old oars seem to be on utf-16
-            return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length), out regionEnv);
+            return Deserialize(Encoding.ASCII.GetString(serializedSettings, 0, serializedSettings.Length), out regionEnv, estateSettings);
        }

        /// <summary>
        /// Deserialize settings
        /// </summary>
        /// <param name="serializedSettings"></param>
+        /// <param name="regionEnv"></param>
+        /// <param name="estateSettings">The Estate Settings stored in the archive will be merged into this object</param>
        /// <returns></returns>
        /// <exception cref="System.Xml.XmlException"></exception>
-        public static RegionSettings Deserialize(string serializedSettings, out ViewerEnvironment regionEnv)
+        public static RegionSettings Deserialize(string serializedSettings, out ViewerEnvironment regionEnv, EstateSettings estateSettings)
        {
            RegionSettings settings = new RegionSettings();
            regionEnv = null;
@@ -237,13 +241,36 @@ namespace OpenSim.Framework.Serialization.External
                }
            }

+            if (xtr.IsStartElement("Estate"))
+            {
+                if (xtr.IsEmptyElement)
+                    xtr.Read();
+                else
+                {
+                    xtr.ReadStartElement("Estate");
+                    while (xtr.Read() && xtr.NodeType != XmlNodeType.EndElement)
+                    {
+                        switch (xtr.Name)
+                        {
+                            case "AllowDirectTeleport":
+                                estateSettings.AllowDirectTeleport = bool.Parse(xtr.ReadElementContentAsString());
+                                break;
+                            case "AllowEnvironmentOverride":
+                                estateSettings.AllowEnvironmentOverride = bool.Parse(xtr.ReadElementContentAsString());
+                                break;
+                        }
+                    }
+                    xtr.ReadEndElement();
+                }
+            }
+
            xtr.Close();
            sr.Close();

            return settings;
        }

-        public static string Serialize(RegionSettings settings, ViewerEnvironment RegionEnv)
+        public static string Serialize(RegionSettings settings, ViewerEnvironment RegionEnv, EstateSettings estateSettings)
        {
            StringWriter sw = new StringWriter();
            XmlTextWriter xtw = new XmlTextWriter(sw);
@@ -308,6 +335,11 @@ namespace OpenSim.Framework.Serialization.External
                xtw.WriteEndElement();
            }

+            xtw.WriteStartElement("Estate");
+            xtw.WriteElementString("AllowDirectTeleport", estateSettings.AllowDirectTeleport.ToString());
+            xtw.WriteElementString("AllowEnvironmentOverride", estateSettings.AllowEnvironmentOverride.ToString());
+            xtw.WriteEndElement();
+
            xtw.WriteEndElement();

            xtw.Close();
--- a/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
+++ b/OpenSim/Framework/Serialization/Tests/RegionSettingsSerializerTests.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Framework.Serialization.Tests
            TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();

-            RegionSettings deserRs = RegionSettingsSerializer.Deserialize(m_serializedRs, out ViewerEnvironment dummy);
+            RegionSettings deserRs = RegionSettingsSerializer.Deserialize(m_serializedRs, out ViewerEnvironment dummy, new EstateSettings());
            Assert.That(deserRs, Is.Not.Null);
            Assert.That(deserRs.TerrainTexture2, Is.EqualTo(m_rs.TerrainTexture2));
            Assert.That(deserRs.DisablePhysics, Is.EqualTo(m_rs.DisablePhysics));
--- a/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
@@ -650,6 +650,8 @@ namespace OpenSim.Framework.Servers.HttpServer

            IRequestHandler requestHandler = null;

+            byte[] responseData = null;
+
            try
            {
                // OpenSim.Framework.WebUtil.OSHeaderRequestID
@@ -671,6 +673,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        request.InputStream.Dispose();

                    requestEndTick = Environment.TickCount;
+                    responseData = response.RawBuffer;
                    response.Send();
                    return;
                }
@@ -692,6 +695,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                            request.InputStream.Dispose();

                        requestEndTick = Environment.TickCount;
+                        responseData = response.RawBuffer;
                        response.Send();
                        return;
                    }
@@ -736,6 +740,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                        request.InputStream.Dispose();

                    requestEndTick = Environment.TickCount;
+                    responseData = response.RawBuffer;
                    response.Send();
                    return;
                }
@@ -744,11 +749,15 @@ namespace OpenSim.Framework.Servers.HttpServer

                if (TryGetSimpleStreamHandler(path, out ISimpleStreamHandler hdr))
                {
+                    if (DebugLevel >= 3)
+                        LogIncomingToStreamHandler(request, hdr);
+
                    hdr.Handle(request, response);
                    if (request.InputStream != null && request.InputStream.CanRead)
                        request.InputStream.Dispose();

                    requestEndTick = Environment.TickCount;
+                    responseData = response.RawBuffer;
                    response.Send();
                    return;
                }
@@ -898,6 +907,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                requestEndTick = Environment.TickCount;

                buffer = null;
+                responseData = response.RawBuffer;
                response.Send();
            }
            catch (SocketException e)
@@ -921,6 +931,7 @@ namespace OpenSim.Framework.Servers.HttpServer
                try
                {
                    response.StatusCode =(int)HttpStatusCode.InternalServerError;
+                    responseData = response.RawBuffer;
                    response.Send();
                }
                catch {}
@@ -951,6 +962,19 @@ namespace OpenSim.Framework.Servers.HttpServer
                        Port,
                        tickdiff);
                }
+
+                if ((DebugLevel >= 5) && (responseData != null))
+                {
+                    string output = Encoding.UTF8.GetString(responseData);
+                    if (DebugLevel == 5)
+                    {
+                        if (output.Length > WebUtil.MaxRequestDiagLength)
+                            output = output.Substring(0, WebUtil.MaxRequestDiagLength) + "...";
+                    }
+                    m_log.DebugFormat("[LOGHTTP] RESPONSE {0}: {1}", RequestNumber, output);
+                }
+
+                responseData = null;
            }
        }

@@ -970,6 +994,21 @@ namespace OpenSim.Framework.Servers.HttpServer
                LogIncomingInDetail(request);
        }

+        private void LogIncomingToStreamHandler(OSHttpRequest request, ISimpleStreamHandler requestHandler)
+        {
+            m_log.DebugFormat(
+                "[LOGHTTP] HTTP IN {0} :{1} stream handler {2} {3} {4} from {5}",
+                RequestNumber,
+                Port,
+                request.HttpMethod,
+                request.Url.PathAndQuery,
+                requestHandler.Name,
+                request.RemoteIPEndPoint);
+
+            if (DebugLevel >= 5)
+                LogIncomingInDetail(request);
+        }
+
        private void LogIncomingToContentTypeHandler(OSHttpRequest request)
        {
            m_log.DebugFormat(
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -1044,7 +1044,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            ViewerEnvironment regionEnv = null;
            try
            {
-                loadedRegionSettings = RegionSettingsSerializer.Deserialize(data, out regionEnv);
+                loadedRegionSettings = RegionSettingsSerializer.Deserialize(data, out regionEnv, scene.RegionInfo.EstateSettings);
            }
            catch (Exception e)
            {
@@ -1104,6 +1104,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            currentRegionSettings.CacheID = UUID.Random();
            currentRegionSettings.Save();

+            scene.EstateDataService.StoreEstateSettings(scene.RegionInfo.EstateSettings);
+
            IEstateModule estateModule = scene.RequestModuleInterface<IEstateModule>();
            if (estateModule != null)
                estateModule.sendRegionHandshakeToAll();
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequest.cs
@@ -579,7 +579,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            // Write out region settings
            string settingsPath = String.Format("{0}{1}{2}.xml",
                regionDir, ArchiveConstants.SETTINGS_PATH, scene.RegionInfo.RegionName);
-            m_archiveWriter.WriteFile(settingsPath, RegionSettingsSerializer.Serialize(scene.RegionInfo.RegionSettings, scene.RegionEnvironment));
+            m_archiveWriter.WriteFile(settingsPath, RegionSettingsSerializer.Serialize(scene.RegionInfo.RegionSettings, scene.RegionEnvironment, scene.RegionInfo.EstateSettings));

            m_log.InfoFormat("[ARCHIVER]: Adding parcel settings to archive.");

--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -657,7 +657,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests
            rs.TelehubObject = UUID.Parse("00000000-0000-0000-0000-111111111111");
            rs.AddSpawnPoint(SpawnPoint.Parse("1,-2,0.33"));

-            tar.WriteFile(ArchiveConstants.SETTINGS_PATH + "region1.xml", RegionSettingsSerializer.Serialize(rs, null));
+            tar.WriteFile(ArchiveConstants.SETTINGS_PATH + "region1.xml", RegionSettingsSerializer.Serialize(rs, null, new EstateSettings()));

            tar.Close();

--- a/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
+++ b/OpenSim/Region/CoreModules/World/LightShare/EnvironmentModule.cs
@@ -65,10 +65,10 @@ namespace OpenSim.Region.CoreModules.World.LightShare
        private ILandChannel m_landChannel;

        private static ViewerEnvironment m_DefaultEnv = null;
-        // 1/1 night day ratio
-        //private static readonly string m_defaultDayAssetID = "5646d39e-d3d7-6aff-ed71-30fc87d64a91";
-        // 3/1 night day ratio
-        private static string m_defaultDayAssetID = "5646d39e-d3d7-6aff-ed71-30fc87d64a92";
+        // 1/1 day-to-night ratio
+        //private static readonly string m_defaultDayAssetID = "5646d39e-d3d7-6aff-ed71-30fc87d64a91";  // Default Daycycle
+        // 3/1 day-to-night ratio
+        private static string m_defaultDayAssetID = "5646d39e-d3d7-6aff-ed71-30fc87d64a92";             // Default Daycycle (More Daylight)
        private static UUID m_defaultDayAssetUUID = new UUID("5646d39e-d3d7-6aff-ed71-30fc87d64a92");
        //private static string m_defaultSkyAssetID = "3ae23978-ac82-bcf3-a9cb-ba6e52dcb9ad";
        private static UUID m_defaultSkyAssetUUID = new UUID("3ae23978-ac82-bcf3-a9cb-ba6e52dcb9ad");
@@ -168,10 +168,10 @@ namespace OpenSim.Region.CoreModules.World.LightShare
                        m_DefaultEnv = new ViewerEnvironment();
                        m_DefaultEnv.CycleFromOSD(oenv);
                    }
-                    catch ( Exception e)
+                    catch (Exception e)
                    {
                        m_DefaultEnv = null;
-                        m_log.WarnFormat("[Environment {0}]: failed to decode default environment asset: {1}", m_scene.Name, e.Message);
+                        m_log.Warn(string.Format("[Environment {0}] failed to decode default environment asset ", m_scene.Name), e);
                    }
                }
            }
@@ -185,16 +185,22 @@ namespace OpenSim.Region.CoreModules.World.LightShare
                {
                    OSD oenv = OSDParser.Deserialize(senv);
                    ViewerEnvironment VEnv = new ViewerEnvironment();
-                    if(oenv is OSDArray)
+                    if (oenv is OSDArray)
+                    {
                        VEnv.FromWLOSD(oenv);
+                        StoreOnRegion(VEnv);
+                        m_log.InfoFormat("[Environment {0}] migrated WindLight environment settings to EEP", m_scene.Name);
+                    }
                    else
+                    {
                        VEnv.FromOSD(oenv);
+                    }
                    scene.RegionEnvironment = VEnv;
                    m_regionEnvVersion = VEnv.version;
                }
                catch (Exception e)
                {
-                    m_log.ErrorFormat("[Environment {0}] failed to load initial Environment {1}", m_scene.Name, e.Message);
+                    m_log.Error(string.Format("[Environment {0}] failed to load initial Environment ", m_scene.Name), e);
                    scene.RegionEnvironment = null;
                    m_regionEnvVersion = -1;
                }
@@ -246,7 +252,7 @@ namespace OpenSim.Region.CoreModules.World.LightShare
            }
            catch (Exception e)
            {
-                m_log.ErrorFormat("[Environment {0}] failed to store Environment {1}", m_scene.Name, e.Message);
+                m_log.Error(string.Format("[Environment {0}] failed to store Environment ", m_scene.Name), e);
            }
        }

--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -6080,7 +6080,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                return -2;

            ScenePresence npcSP = World.GetScenePresence(npc);
-            if(npc == null)
+            if((npcSP == null) || !npcSP.IsNPC)
                return -3;

            if (!UUID.TryParse(objkey, out UUID obj))
--- a/bin/ScriptSyntax.xml
+++ b/bin/ScriptSyntax.xml
@@ -1,4 +1,4 @@
-cd5e081a-b88a-07b6-21a5-612aab0b3398
+727420c2-45b3-4627-8c6e-5c478e6a736e
 <llsd><map><key>llsd-lsl-syntax-version</key><integer>2</integer>
 <key>controls</key>
 <map>
@@ -7196,6 +7196,16 @@ cd5e081a-b88a-07b6-21a5-612aab0b3398
   <map><key>notecard</key><map><key>type</key><string>string</string></map></map>
  </array>
 </map>
+ <key>osNpcLookAt</key>
+ <map>
+  <key>arguments</key><array>
+   <map><key>npc</key><map><key>type</key><string>key</string></map></map>
+   <map><key>type</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>target</key><map><key>type</key><string>key</string></map></map>
+   <map><key>offset</key><map><key>type</key><string>vector</string></map></map>
+  </array>
+  <key>tooltip</key><string>Makes an NPC look at a target. Other effects besides looking are also supported.</string>
+ </map>
 <key>osNpcMoveTo</key>
 <map>
  <key>arguments</key><array>
@@ -7449,6 +7459,19 @@ cd5e081a-b88a-07b6-21a5-612aab0b3398
   <map><key>daycycle</key><map><key>type</key><string>string</string></map></map>
  </array>
 </map>
+ <key>osReplaceRegionEnvironment</key>
+ <map>
+  <key>return</key><string>integer</string>
+  <key>arguments</key><array>
+   <map><key>transition</key><map><key>type</key><string>integer</string></map></map>
+   <map><key>daycycle</key><map><key>type</key><string>string</string></map></map>
+   <map><key>daylen</key><map><key>type</key><string>float</string></map></map>
+   <map><key>dayoffset</key><map><key>type</key><string>float</string></map></map>
+   <map><key>altitude1</key><map><key>type</key><string>float</string></map></map>
+   <map><key>altitude2</key><map><key>type</key><string>float</string></map></map>
+   <map><key>altitude3</key><map><key>type</key><string>float</string></map></map>
+  </array>
+ </map>
 <key>osReplaceString</key>
 <map>
  <key>return</key><string>string</string>
--- a/bin/assets/SettingsAssetSet/SettingsAssetSet.xml
+++ b/bin/assets/SettingsAssetSet/SettingsAssetSet.xml
@@ -1,11 +1,10 @@
 <Nini>
-  <Section Name="Default Daycycle(3/1)">
+  <Section Name="Default Daycycle (More Daylight)">
    <Key Name="assetID" Value="5646d39e-d3d7-6aff-ed71-30fc87d64a92" />
-    <Key Name="name" Value="Default Daycycle(3/1)" />
+    <Key Name="name" Value="Default Daycycle (More Daylight)" />
    <Key Name="assetType" Value="56" />
    <Key Name="fileName" Value="DefaultDaycycle31.dat" />
  </Section>
-  
  <Section Name="Default Daycycle">
    <Key Name="assetID" Value="5646d39e-d3d7-6aff-ed71-30fc87d64a91" />
    <Key Name="name" Value="Default Daycycle" />
@@ -19,35 +18,24 @@
    <Key Name="assetType" Value="56" />
    <Key Name="fileName" Value="DefaultSky.dat" />
  </Section>
-
-  <Section Name="Default Water">
-    <Key Name="assetID" Value="59d1a851-47e7-0e5f-1ed7-6b715154f41a" />
-    <Key Name="name" Value="Default Water" />
-    <Key Name="assetType" Value="56" />
-    <Key Name="fileName" Value="DefaultWater.dat" />
-  </Section>
-
  <Section Name="Sunrise">
    <Key Name="assetID" Value="01e41537-ff51-2f1f-8ef7-17e4df760bfb" />
    <Key Name="name" Value="Sunrise" />
    <Key Name="assetType" Value="56" />
    <Key Name="fileName" Value="Sunrise.dat" />
  </Section>
-
  <Section Name="Midday">
    <Key Name="assetID" Value="6c83e853-e7f8-cad7-8ee6-5f31c453721c" />
    <Key Name="name" Value="Midday" />
    <Key Name="assetType" Value="56" />
    <Key Name="fileName" Value="Midday.dat" />
  </Section>
-
  <Section Name="Sunset">
    <Key Name="assetID" Value="084e26cd-a900-28e8-08d0-64a9de5c15e2" />
    <Key Name="name" Value="Sunset" />
    <Key Name="assetType" Value="56" />
    <Key Name="fileName" Value="Sunset.dat" />
  </Section>
-
  <Section Name="Midnight">
    <Key Name="assetID" Value="8a01b97a-cb20-c1ea-ac63-f7ea84ad0090" />
    <Key Name="name" Value="Midnight" />
@@ -55,5 +43,31 @@
    <Key Name="fileName" Value="Midnight.dat" />
  </Section>

+  <Section Name="Default Water">
+    <Key Name="assetID" Value="59d1a851-47e7-0e5f-1ed7-6b715154f41a" />
+    <Key Name="name" Value="Default Water" />
+    <Key Name="assetType" Value="56" />
+    <Key Name="fileName" Value="Water/DefaultWater.dat" />
+  </Section>
+
+  <Section Name="Altocumulus Clouds">
+    <Key Name="assetID" Value="ffc4de4a-9845-41c1-9f9f-762a059d0bdc" />
+    <Key Name="name" Value="Altocumulus Clouds" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="Textures/Altocumulus_Clouds.j2c" />
+  </Section>
+  <Section Name="Cumulonimbus Clouds">
+    <Key Name="assetID" Value="a3ee7f3c-dc2e-4526-9d7c-67824959c6f6" />
+    <Key Name="name" Value="Cumulonimbus Clouds" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="Textures/Cumulonimbus_Clouds.j2c" />
+  </Section>
+  <Section Name="Layered Clouds">
+    <Key Name="assetID" Value="6e500a99-8831-47d2-b2a8-2e725396d449" />
+    <Key Name="name" Value="Layered Clouds" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="fileName" Value="Textures/Layered_Clouds.j2c" />
+  </Section>
+
 </Nini>

--- a/bin/assets/SettingsAssetSet/Textures/Altocumulus_Clouds.j2c
+++ b/bin/assets/SettingsAssetSet/Textures/Altocumulus_Clouds.j2c
--- a/bin/assets/SettingsAssetSet/Textures/Cumulonimbus_Clouds.j2c
+++ b/bin/assets/SettingsAssetSet/Textures/Cumulonimbus_Clouds.j2c
--- a/bin/assets/SettingsAssetSet/Textures/Layered_Clouds.j2c
+++ b/bin/assets/SettingsAssetSet/Textures/Layered_Clouds.j2c
--- a/bin/assets/SettingsAssetSet/Water/DefaultWater.dat
+++ b/bin/assets/SettingsAssetSet/Water/DefaultWater.dat
--- a/bin/inventory/SettingsLibrary/Folders.xml
+++ b/bin/inventory/SettingsLibrary/Folders.xml
@@ -1,28 +1,32 @@
 <Nini>
-
-  
  <Section Name="Settings Library">
    <Key Name="folderID" Value="00000112-000f-0000-0000-000100bba025"/>
    <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba000"/>
    <Key Name="name" Value="Settings Library"/>
-    <Key Name="type" Value="25"/>
+    <Key Name="type" Value="56"/>
  </Section>
  <Section Name="Water">
    <Key Name="folderID" Value="25000112-000f-0000-0000-000100bba025"/>
    <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
    <Key Name="name" Value="Water"/>
-    <Key Name="type" Value="25"/>
+    <Key Name="type" Value="-1"/>
  </Section>
-  <Section Name="Sky">
+  <Section Name="Skies">
    <Key Name="folderID" Value="25100112-000f-0000-0000-000100bba025"/>
    <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
-    <Key Name="name" Value="Sky"/>
-    <Key Name="type" Value="25"/>
+    <Key Name="name" Value="Skies"/>
+    <Key Name="type" Value="-1"/>
  </Section>
-  <Section Name="Daycycle">
+  <Section Name="Days">
    <Key Name="folderID" Value="25200112-000f-0000-0000-000100bba025"/>
    <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
-    <Key Name="name" Value="Daycycle"/>
-    <Key Name="type" Value="25"/>
+    <Key Name="name" Value="Days"/>
+    <Key Name="type" Value="-1"/>
+  </Section>
+  <Section Name="Textures">
+    <Key Name="folderID" Value="bb567e1a-12cf-4ffc-9bcd-cd55c72d27e7"/>
+    <Key Name="parentFolderID" Value="00000112-000f-0000-0000-000100bba025"/>
+    <Key Name="name" Value="Textures"/>
+    <Key Name="type" Value="0"/>
  </Section>
 </Nini>
--- a/bin/inventory/SettingsLibrary/Items.xml
+++ b/bin/inventory/SettingsLibrary/Items.xml
@@ -16,19 +16,19 @@
    <Key Name="inventoryID" Value="25210112-000f-0000-0000-000100bba025" />
    <Key Name="assetID" Value="5646d39e-d3d7-6aff-ed71-30fc87d64a91" />
    <Key Name="folderID" Value="25200112-000f-0000-0000-000100bba025"/>
-    <Key Name="description" Value="Default Daycycle with equal night and day durations" />
+    <Key Name="description" Value="Default Daycycle with equal day and night durations" />
    <Key Name="name" Value="Default Daycycle" />
    <Key Name="assetType" Value="56" />
    <Key Name="inventoryType" Value="25" />
 	<Key Name="flags" Value="2" />
  </Section>
  
-  <Section Name="Default Daycycle(3/1)">
+  <Section Name="Default Daycycle (More Daylight)">
    <Key Name="inventoryID" Value="25210112-000f-0001-0000-000100bba125" />
    <Key Name="assetID" Value="5646d39e-d3d7-6aff-ed71-30fc87d64a92" />
    <Key Name="folderID" Value="25200112-000f-0000-0000-000100bba025"/>
-    <Key Name="description" Value="Default Daycycle 3 to 1 day/night duration ratio" />
-    <Key Name="name" Value="Default Daycycle(3/1)" />
+    <Key Name="description" Value="Default Daycycle with a 3 to 1 day/night ratio" />
+    <Key Name="name" Value="Default Daycycle (More Daylight)" />
    <Key Name="assetType" Value="56" />
    <Key Name="inventoryType" Value="25" />
 	<Key Name="flags" Value="2" />
@@ -78,4 +78,70 @@
 	<Key Name="flags" Value="0" />
  </Section>

+  <Section Name="Default Water">
+    <Key Name="inventoryID" Value="87d94cf4-bfcd-46d5-bd50-17130a000001" />
+    <Key Name="assetID" Value="59d1a851-47e7-0e5f-1ed7-6b715154f41a" />
+    <Key Name="folderID" Value="25000112-000f-0000-0000-000100bba025"/>
+    <Key Name="description" Value="" />
+    <Key Name="name" Value="Default Water" />
+    <Key Name="assetType" Value="56" />
+    <Key Name="inventoryType" Value="25" />
+	<Key Name="flags" Value="1" />
+  </Section>
+
+  <Section Name="Default Clouds">
+    <Key Name="inventoryID" Value="02385379-afb8-48b3-8848-47c8333fed2d" />
+    <Key Name="assetID" Value="1dc1368f-e8fe-f02d-a08d-9d9f11c1af6b" />
+    <Key Name="folderID" Value="bb567e1a-12cf-4ffc-9bcd-cd55c72d27e7"/>
+    <Key Name="description" Value="" />
+    <Key Name="name" Value="Default Clouds" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="inventoryType" Value="0" />
+  </Section>
+  <Section Name="Altocumulus Clouds">
+    <Key Name="inventoryID" Value="a860475e-6234-40b8-b5b1-3df8fb1d3049" />
+    <Key Name="assetID" Value="ffc4de4a-9845-41c1-9f9f-762a059d0bdc" />
+    <Key Name="folderID" Value="bb567e1a-12cf-4ffc-9bcd-cd55c72d27e7"/>
+    <Key Name="description" Value="" />
+    <Key Name="name" Value="Altocumulus Clouds" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="inventoryType" Value="0" />
+  </Section>
+  <Section Name="Cumulonimbus Clouds">
+    <Key Name="inventoryID" Value="eccad7d7-45e0-408d-b50e-a932603d34f9" />
+    <Key Name="assetID" Value="a3ee7f3c-dc2e-4526-9d7c-67824959c6f6" />
+    <Key Name="folderID" Value="bb567e1a-12cf-4ffc-9bcd-cd55c72d27e7"/>
+    <Key Name="description" Value="" />
+    <Key Name="name" Value="Cumulonimbus Clouds" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="inventoryType" Value="0" />
+  </Section>
+  <Section Name="Layered Clouds">
+    <Key Name="inventoryID" Value="72b43d50-4c00-4344-adb3-b07934743320" />
+    <Key Name="assetID" Value="6e500a99-8831-47d2-b2a8-2e725396d449" />
+    <Key Name="folderID" Value="bb567e1a-12cf-4ffc-9bcd-cd55c72d27e7"/>
+    <Key Name="description" Value="" />
+    <Key Name="name" Value="Layered Clouds" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="inventoryType" Value="0" />
+  </Section>
+  <Section Name="Default Water Normal">
+    <Key Name="inventoryID" Value="03816023-8ec9-4a87-9195-3640893c7ff7" />
+    <Key Name="assetID" Value="822ded49-9a6c-f61c-cb89-6df54f42cdf4" />
+    <Key Name="folderID" Value="bb567e1a-12cf-4ffc-9bcd-cd55c72d27e7"/>
+    <Key Name="description" Value="" />
+    <Key Name="name" Value="Default Water Normal" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="inventoryType" Value="0" />
+  </Section>
+  <Section Name="Default Moon">
+    <Key Name="inventoryID" Value="c2d885cd-d477-4afb-ba51-08c6a13df6f7" />
+    <Key Name="assetID" Value="d07f6eed-b96a-47cd-b51d-400ad4a1c428" />
+    <Key Name="folderID" Value="bb567e1a-12cf-4ffc-9bcd-cd55c72d27e7"/>
+    <Key Name="description" Value="" />
+    <Key Name="name" Value="Default Moon" />
+    <Key Name="assetType" Value="0" />
+    <Key Name="inventoryType" Value="0" />
+  </Section>
+
 </Nini>