diff options
| author | Melanie | 2012-09-16 04:11:20 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-16 04:11:20 +0100 |
| commit | db774d4292588db1e2ac4a9fafe977ddbec353ee (patch) | |
| tree | 5fc381d7cb96cc0d2b47e4807821f488c339ec13 /OpenSim/Region/CoreModules/World/Land | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.zip opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.gz opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.bz2 opensim-SC-db774d4292588db1e2ac4a9fafe977ddbec353ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Land')
| -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 102b4d7..cbb3abe 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(); |