diff options
author | Melanie Thielker | 2008-09-08 22:19:06 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-08 22:19:06 +0000 |
commit | 1034c1cdc1a75b6e37a266e15048b9f9ab965b04 (patch) | |
tree | fae96225599ab434aef75322704eca257b8a58f4 /OpenSim/Region/Environment | |
parent | fix an issue where we got coliding namespaces that prevented a sim start (diff) | |
download | opensim-SC-1034c1cdc1a75b6e37a266e15048b9f9ab965b04.zip opensim-SC-1034c1cdc1a75b6e37a266e15048b9f9ab965b04.tar.gz opensim-SC-1034c1cdc1a75b6e37a266e15048b9f9ab965b04.tar.bz2 opensim-SC-1034c1cdc1a75b6e37a266e15048b9f9ab965b04.tar.xz |
Correct state handling and state event masks. Prims will now show
touch, pay, etc script states correctly.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs index 5f6b4d7..17c5f04 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs | |||
@@ -1897,9 +1897,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
1897 | // remove values from aggregated script events | 1897 | // remove values from aggregated script events |
1898 | AggregateScriptEvents &= ~oldparts; | 1898 | AggregateScriptEvents &= ~oldparts; |
1899 | m_scriptEvents.Remove(scriptid); | 1899 | m_scriptEvents.Remove(scriptid); |
1900 | aggregateScriptEvents(); | ||
1900 | } | 1901 | } |
1901 | } | 1902 | } |
1902 | aggregateScriptEvents(); | ||
1903 | } | 1903 | } |
1904 | 1904 | ||
1905 | /// <summary> | 1905 | /// <summary> |
@@ -2354,6 +2354,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
2354 | // oldparts = m_scriptEvents[scriptid]; | 2354 | // oldparts = m_scriptEvents[scriptid]; |
2355 | 2355 | ||
2356 | // remove values from aggregated script events | 2356 | // remove values from aggregated script events |
2357 | if (m_scriptEvents[scriptid] == (scriptEvents) events) | ||
2358 | return; | ||
2357 | m_scriptEvents[scriptid] = (scriptEvents) events; | 2359 | m_scriptEvents[scriptid] = (scriptEvents) events; |
2358 | } | 2360 | } |
2359 | else | 2361 | else |
@@ -3205,6 +3207,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
3205 | 3207 | ||
3206 | public void aggregateScriptEvents() | 3208 | public void aggregateScriptEvents() |
3207 | { | 3209 | { |
3210 | AggregateScriptEvents = 0; | ||
3211 | |||
3208 | // Aggregate script events | 3212 | // Aggregate script events |
3209 | lock (m_scriptEvents) | 3213 | lock (m_scriptEvents) |
3210 | { | 3214 | { |