diff options
| author | Diva Canto | 2012-09-27 16:43:38 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-27 16:43:38 -0700 |
| commit | 6511c3b5c6346d27f40fbfcedc67ec3bf1c27bd3 (patch) | |
| tree | e0321f352987bee0fe6c57c7e8b3d39ec4d644a5 /OpenSim/Region/Framework/Scenes/Scene.cs | |
| parent | Removed the bits about the TOSModule. That module doesn't go into core. WARNI... (diff) | |
| parent | another osgitbot test from github.. mistakes were made! (diff) | |
| download | opensim-SC_OLD-6511c3b5c6346d27f40fbfcedc67ec3bf1c27bd3.zip opensim-SC_OLD-6511c3b5c6346d27f40fbfcedc67ec3bf1c27bd3.tar.gz opensim-SC_OLD-6511c3b5c6346d27f40fbfcedc67ec3bf1c27bd3.tar.bz2 opensim-SC_OLD-6511c3b5c6346d27f40fbfcedc67ec3bf1c27bd3.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e9d1d42..2e03874 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -151,7 +151,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 151 | // TODO: need to figure out how allow client agents but deny | 151 | // TODO: need to figure out how allow client agents but deny |
| 152 | // root agents when ACL denies access to root agent | 152 | // root agents when ACL denies access to root agent |
| 153 | public bool m_strictAccessControl = true; | 153 | public bool m_strictAccessControl = true; |
| 154 | public int MaxUndoCount = 5; | 154 | |
| 155 | public int MaxUndoCount { get; set; } | ||
| 155 | 156 | ||
| 156 | // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet; | 157 | // Using this for RegionReady module to prevent LoginsDisabled from changing under our feet; |
| 157 | public bool LoginLock = false; | 158 | public bool LoginLock = false; |
| @@ -741,6 +742,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 741 | //Animation states | 742 | //Animation states |
| 742 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); | 743 | m_useFlySlow = startupConfig.GetBoolean("enableflyslow", false); |
| 743 | 744 | ||
| 745 | MaxUndoCount = startupConfig.GetInt("MaxPrimUndos", 20); | ||
| 746 | |||
| 744 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", PhysicalPrims); | 747 | PhysicalPrims = startupConfig.GetBoolean("physical_prim", PhysicalPrims); |
| 745 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", CollidablePrims); | 748 | CollidablePrims = startupConfig.GetBoolean("collidable_prim", CollidablePrims); |
| 746 | 749 | ||