aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
diff options
context:
space:
mode:
authorMelanie2012-08-04 03:00:20 +0100
committerMelanie2012-08-04 03:00:20 +0100
commitb9c4a637b46d0c47d5348181dd75c4cc3d44f43d (patch)
tree7cf26233b2aaea5556f9842d7a44e35860098a95 /OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
parentMerge branch 'master' into careminster (diff)
parentStrip experimental tag from --publish option of "save oar" region console com... (diff)
downloadopensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.zip
opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.gz
opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.bz2
opensim-SC-b9c4a637b46d0c47d5348181dd75c4cc3d44f43d.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs6
1 files changed, 3 insertions, 3 deletions
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)