aboutsummaryrefslogtreecommitdiffstatshomepage
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
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 '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs7
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs6
-rw-r--r--bin/OpenSimDefaults.ini33
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
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)
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 @@
181 ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago 181 ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago
182 MaximumTimeBeforePersistenceConsidered = 600 182 MaximumTimeBeforePersistenceConsidered = 600
183 183
184 ; Experimental setting to resend appearance updates every 60 seconds.
185 ; These packets are small and this can help with grey avatar syndrome.
186 ; Default is false
187 SendPeriodicAppearanceUpdates = false
188
189 ; ## 184 ; ##
190 ; ## PHYSICS 185 ; ## PHYSICS
191 ; ## 186 ; ##
@@ -347,20 +342,6 @@
347 ; False items will be removed from the scene permanently 342 ; False items will be removed from the scene permanently
348 UseTrashOnDelete = True 343 UseTrashOnDelete = True
349 344
350 ; Persist avatar baked textures
351 ; Persisting baked textures can speed up login and region border
352 ; crossings especially with large numbers of users, though it
353 ; will store potentially large numbers of textures in your asset
354 ; database
355 PersistBakedTextures = false
356
357 ; Control the delay before appearance is sent to other avatars and
358 ; saved in the avatar service. Attempts to limit the impact caused
359 ; by the very chatty dialog that sets appearance when an avatar
360 ; logs in or teleports into a region; values are in seconds
361 DelayBeforeAppearanceSave = 5
362 DelayBeforeAppearanceSend = 2
363
364 345
365[RegionReady] 346[RegionReady]
366 ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled 347 ; Enable this module to get notified once all items and scripts in the region have been completely loaded and compiled
@@ -671,6 +652,20 @@
671 652
672 653
673[Appearance] 654[Appearance]
655 ; Persist avatar baked textures
656 ; Persisting baked textures can speed up login and region border
657 ; crossings especially with large numbers of users, though it
658 ; will store potentially large numbers of textures in your asset
659 ; database
660 PersistBakedTextures = false
661
662 ; Control the delay before appearance is sent to other avatars and
663 ; saved in the avatar service. Attempts to limit the impact caused
664 ; by the very chatty dialog that sets appearance when an avatar
665 ; logs in or teleports into a region; values are in seconds
666 DelayBeforeAppearanceSave = 5
667 DelayBeforeAppearanceSend = 2
668
674 ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds. 669 ; If true, avatar appearance information is resent to other avatars in the simulator every 60 seconds.
675 ; This may help with some situations where avatars are persistently grey, though it will not help 670 ; This may help with some situations where avatars are persistently grey, though it will not help
676 ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others). 671 ; in other situations (e.g. appearance baking failures where the avatar only appears as a cloud to others).