aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-08-03 23:02:39 +0100
committerJustin Clark-Casey (justincc)2012-08-03 23:02:39 +0100
commit205f2326dc17a4926b36ecfd5e67a4da0b755f3b (patch)
treed8cfdf155adba95a653b894b5804fe032e5acf95 /OpenSim/Region
parentRestore SOG constructor chaining removed in recent 513b77b. This is not a fu... (diff)
downloadopensim-SC_OLD-205f2326dc17a4926b36ecfd5e67a4da0b755f3b.zip
opensim-SC_OLD-205f2326dc17a4926b36ecfd5e67a4da0b755f3b.tar.gz
opensim-SC_OLD-205f2326dc17a4926b36ecfd5e67a4da0b755f3b.tar.bz2
opensim-SC_OLD-205f2326dc17a4926b36ecfd5e67a4da0b755f3b.tar.xz
Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket.
All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs7
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs6
2 files changed, 9 insertions, 4 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
123 IConfig sconfig = config.Configs["Startup"]; 123 IConfig sconfig = config.Configs["Startup"];
124 if (sconfig != null) 124 if (sconfig != null)
125 { 125 {
126 m_persistBakedTextures = sconfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
127 m_levelUpload = sconfig.GetInt("LevelUpload", 0); 126 m_levelUpload = sconfig.GetInt("LevelUpload", 0);
128 } 127 }
128
129 IConfig appearanceConfig = config.Configs["Appearance"];
130 if (appearanceConfig != null)
131 {
132 m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
133 }
129 } 134 }
130 135
131 m_assetService = m_Scene.AssetService; 136 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
66 66
67 public void Initialise(IConfigSource source) 67 public void Initialise(IConfigSource source)
68 { 68 {
69 IConfig sconfig = source.Configs["Startup"]; 69 IConfig appearanceConfig = source.Configs["Appearance"];
70 if (sconfig != null) 70 if (appearanceConfig != null)
71 m_persistBakedTextures = sconfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); 71 m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures);
72 } 72 }
73 73
74 public void AddRegion(Scene s) 74 public void AddRegion(Scene s)