diff options
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs | 6 |
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 d397893..88c4d7f 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
@@ -126,9 +126,14 @@ namespace OpenSim.Region.ClientStack.Linden | |||
126 | IConfig sconfig = config.Configs["Startup"]; | 126 | IConfig sconfig = config.Configs["Startup"]; |
127 | if (sconfig != null) | 127 | if (sconfig != null) |
128 | { | 128 | { |
129 | m_persistBakedTextures = sconfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); | ||
130 | m_levelUpload = sconfig.GetInt("LevelUpload", 0); | 129 | m_levelUpload = sconfig.GetInt("LevelUpload", 0); |
131 | } | 130 | } |
131 | |||
132 | IConfig appearanceConfig = config.Configs["Appearance"]; | ||
133 | if (appearanceConfig != null) | ||
134 | { | ||
135 | m_persistBakedTextures = appearanceConfig.GetBoolean("PersistBakedTextures", m_persistBakedTextures); | ||
136 | } | ||
132 | } | 137 | } |
133 | 138 | ||
134 | m_assetService = m_Scene.AssetService; | 139 | 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) |