diff options
| author | Melanie | 2012-03-23 14:24:55 +0000 |
|---|---|---|
| committer | Melanie | 2012-03-23 14:24:55 +0000 |
| commit | 9a67baae2162faf0f2c3d77390c855a5659a167e (patch) | |
| tree | 63e7ad9d3ce24731c1757a8c7197b1e16a873e52 /bin | |
| parent | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ... (diff) | |
| parent | fix yield prolog so it compiles with mono 2.11 there has been a bugzilla (diff) | |
| download | opensim-SC_OLD-9a67baae2162faf0f2c3d77390c855a5659a167e.zip opensim-SC_OLD-9a67baae2162faf0f2c3d77390c855a5659a167e.tar.gz opensim-SC_OLD-9a67baae2162faf0f2c3d77390c855a5659a167e.tar.bz2 opensim-SC_OLD-9a67baae2162faf0f2c3d77390c855a5659a167e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
Diffstat (limited to 'bin')
| -rw-r--r-- | bin/OpenSimDefaults.ini | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini index 8be2427..afeb01a 100644 --- a/bin/OpenSimDefaults.ini +++ b/bin/OpenSimDefaults.ini | |||
| @@ -177,6 +177,11 @@ | |||
| 177 | ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago | 177 | ; Objects will always be considered for persistance in the next sweep if the first change occurred this number of seconds ago |
| 178 | MaximumTimeBeforePersistenceConsidered = 600 | 178 | MaximumTimeBeforePersistenceConsidered = 600 |
| 179 | 179 | ||
| 180 | ; Experimental setting to resend appearance updates every 60 seconds. | ||
| 181 | ; These packets are small and this can help with grey avatar syndrome. | ||
| 182 | ; Default is false | ||
| 183 | SendPeriodicAppearanceUpdates = false | ||
| 184 | |||
| 180 | ; ## | 185 | ; ## |
| 181 | ; ## PHYSICS | 186 | ; ## PHYSICS |
| 182 | ; ## | 187 | ; ## |