3 files changed, 23 insertions, 23 deletions

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
index 6c28e78..185f9ce 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
@@ -123,9 +123,14 @@ namespace OpenSim.Region.ClientStack.Linden
                 IConfig sconfig = config.Configs["Startup"];
                 if (sconfig != null)
                 {
-                    m_persistBakedTextures = sconfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
                     m_levelUpload = sconfig.GetInt("LevelUpload", 0);
                 }
+
+                IConfig appearanceConfig = config.Configs["Appearance"];
+                if (appearanceConfig != null)
+                {
+                    m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
+                }
             }
 
             m_assetService = m_Scene.AssetService;
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
index b3d61a8..6aac591 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
@@ -66,9 +66,9 @@ namespace OpenSim.Region.ClientStack.Linden
 
         public void Initialise(IConfigSource source)
         {
-            IConfig sconfig = source.Configs["Startup"];
-            if (sconfig != null)
-                m_persistBakedTextures = sconfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
+            IConfig appearanceConfig = source.Configs["Appearance"];
+            if (appearanceConfig != null)
+                m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
         }
 
         public void AddRegion(Scene s)
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index ab153a5..a27e775 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -181,11 +181,6 @@
     ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
     MaximumTimeBeforePersistenceConsidered = 600
 
-    ; Experimental setting to resend appearance updates every 60 seconds.
-    ; These packets are small and this can help with grey avatar syndrome.
-    ; Default is false
-    SendPeriodicAppearanceUpdates = false
-
     ; ##
     ; ## PHYSICS
     ; ##
@@ -347,20 +342,6 @@
     ; False items will be removed from the scene permanently
     UseTrashOnDelete = True
 
-    ; Persist avatar baked textures
-    ; Persisting baked textures can speed up login and region border 
-    ; crossings especially with large numbers of users, though it
-    ; will store potentially large numbers of textures in your asset
-    ; database
-    PersistBakedTextures = false
-
-    ; Control the delay before appearance is sent to other avatars and
-    ; saved in the avatar service. Attempts to limit the impact caused
-    ; by the very chatty dialog that sets appearance when an avatar
-    ; logs in or teleports into a region; values are in seconds
-    DelayBeforeAppearanceSave = 5
-    DelayBeforeAppearanceSend = 2
-
 
 [RegionReady]
     ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
@@ -671,6 +652,20 @@
 
 
 [Appearance]
+    ; Persist avatar baked textures
+    ; Persisting baked textures can speed up login and region border 
+    ; crossings especially with large numbers of users, though it
+    ; will store potentially large numbers of textures in your asset
+    ; database
+    PersistBakedTextures = false
+
+    ; Control the delay before appearance is sent to other avatars and
+    ; saved in the avatar service. Attempts to limit the impact caused
+    ; by the very chatty dialog that sets appearance when an avatar
+    ; logs in or teleports into a region; values are in seconds
+    DelayBeforeAppearanceSave = 5
+    DelayBeforeAppearanceSend = 2
+
     ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds.
     ; This may help with some situations where avatars are persistently grey, though it will not help 
     ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).