diff options
author | Diva Canto | 2012-09-13 10:00:52 -0700 |
---|---|---|
committer | Diva Canto | 2012-09-13 10:00:52 -0700 |
commit | dd0a89a0e64573fd947928050d03e8389d95c799 (patch) | |
tree | 7920b18d85f6e1e1a43525f548774bca1fa75aac /OpenSim/Region/CoreModules | |
parent | Restarting to work on HGSuitcaseInventoryService: added the ability for the o... (diff) | |
parent | Documentation of parcel-related events (diff) | |
download | opensim-SC-dd0a89a0e64573fd947928050d03e8389d95c799.zip opensim-SC-dd0a89a0e64573fd947928050d03e8389d95c799.tar.gz opensim-SC-dd0a89a0e64573fd947928050d03e8389d95c799.tar.bz2 opensim-SC-dd0a89a0e64573fd947928050d03e8389d95c799.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs index b2f71d1..665875f 100644 --- a/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/PrimCountModule.cs | |||
@@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.World.Land | |||
69 | /// without recounting the whole sim. | 69 | /// without recounting the whole sim. |
70 | /// | 70 | /// |
71 | /// We start out tainted so that the first get call resets the various prim counts. | 71 | /// We start out tainted so that the first get call resets the various prim counts. |
72 | /// <value> | 72 | /// </value> |
73 | private bool m_Tainted = true; | 73 | private bool m_Tainted = true; |
74 | 74 | ||
75 | private Object m_TaintLock = new Object(); | 75 | private Object m_TaintLock = new Object(); |