diff options
author | Justin Clark-Casey (justincc) | 2012-09-26 22:49:44 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-09-26 22:49:44 +0100 |
commit | 327320d1a7acbba969d26c281f92f64ce8ff365f (patch) | |
tree | fe6709dba92015f98cd173f8d2873ed44c4a5d3b /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-327320d1a7acbba969d26c281f92f64ce8ff365f.zip opensim-SC_OLD-327320d1a7acbba969d26c281f92f64ce8ff365f.tar.gz opensim-SC_OLD-327320d1a7acbba969d26c281f92f64ce8ff365f.tar.bz2 opensim-SC_OLD-327320d1a7acbba969d26c281f92f64ce8ff365f.tar.xz |
Enforce existing 5 action hardcoded undo limit.
This was present in the code but not enforced, which led to a memory leak over time as part properties were changed, whether by viewer, script or another source.
This commit enforces that limit, which will soon become configurable.
Regression test for undo limit added
Should help with http://opensimulator.org/mantis/view.php?id=6279
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index e9d1d42..872c061 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; |
@@ -931,6 +932,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
931 | WestBorders.Add(westBorder); | 932 | WestBorders.Add(westBorder); |
932 | BordersLocked = false; | 933 | BordersLocked = false; |
933 | 934 | ||
935 | // TODO: At some point this should be made configurable. | ||
936 | MaxUndoCount = 5; | ||
937 | |||
934 | m_eventManager = new EventManager(); | 938 | m_eventManager = new EventManager(); |
935 | 939 | ||
936 | m_permissions = new ScenePermissions(this); | 940 | m_permissions = new ScenePermissions(this); |