diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
index 6c2ccdfb53..7e81836d65 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/CameraOnlyModeModule.cs
@@ -128,17 +128,13 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
             m_log.DebugFormat("[CAMERA-ONLY MODE]: OnSimulatorFeaturesRequest in {0}", m_scene.RegionInfo.RegionName);
             if (m_Helper.UserLevel(agentID) <= m_UserLevel)
             {
-                OSDMap extrasMap;
-                if (features.ContainsKey("OpenSimExtras"))
-                {
-                    extrasMap = (OSDMap)features["OpenSimExtras"];
-                }
-                else
+                if (!features.TryGetValue("OpenSimExtras", out OSD extrasMap))
                 {
                     extrasMap = new OSDMap();
                     features["OpenSimExtras"] = extrasMap;
                 }
-                extrasMap["camera-only-mode"] = OSDMap.FromString("true");
+
+                ((OSDMap)extrasMap)["camera-only-mode"] = OSDMap.FromString("true");
                 m_log.DebugFormat("[CAMERA-ONLY MODE]: Sent in {0}", m_scene.RegionInfo.RegionName);
             }
             else
diff --git a/bin/assets/TexturesAssetSet/32bfbcea-24b1-fb9d-1ef9-48a28a63730f.dat b/bin/assets/TexturesAssetSet/32bfbcea-24b1-fb9d-1ef9-48a28a63730f.dat
new file mode 100644
index 0000000000..7b9d28ae80
Binary files /dev/null and b/bin/assets/TexturesAssetSet/32bfbcea-24b1-fb9d-1ef9-48a28a63730f.dat differ
diff --git a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
index d47962bea7..5f8bba4b30 100644
--- a/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
+++ b/bin/assets/TexturesAssetSet/TexturesAssetSet.xml
@@ -898,4 +898,12 @@
      <Key Name="fileName" Value="moon.jp2"/>
   </Section>
 
+  <Section Name = "DefaultSun">
+    <Key Name = "assetID" Value = "32bfbcea-24b1-fb9d-1ef9-48a28a63730f" />
+    <Key Name = "name" Value = "DefaultSun" />
+    <Key Name = "description" Value = "animation" />
+    <Key Name = "assetType" Value = "0" />
+    <Key Name = "fileName" Value = "32bfbcea-24b1-fb9d-1ef9-48a28a63730f.dat" />
+  </Section>
+
 </Nini>