diff options
| author | Melanie Thielker | 2009-01-02 16:24:44 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2009-01-02 16:24:44 +0000 |
| commit | 24f0d97075595251ecae8a4c86bbd180885c338f (patch) | |
| tree | 2127866ca0b2d96d449a196c8b11befd08fc01a2 | |
| parent | * Adding some recognizable and search-able test to some WriteLine(e.ToString(... (diff) | |
| download | opensim-SC_OLD-24f0d97075595251ecae8a4c86bbd180885c338f.zip opensim-SC_OLD-24f0d97075595251ecae8a4c86bbd180885c338f.tar.gz opensim-SC_OLD-24f0d97075595251ecae8a4c86bbd180885c338f.tar.bz2 opensim-SC_OLD-24f0d97075595251ecae8a4c86bbd180885c338f.tar.xz | |
Small fix to prevent client thread crash in multi-region instances when
a scripted object is paid
| -rw-r--r-- | OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs index bb939fb..8355b60 100644 --- a/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs +++ b/OpenSim/Region/ScriptEngine/XEngine/EventManager.cs | |||
| @@ -70,8 +70,17 @@ namespace OpenSim.Region.ScriptEngine.XEngine | |||
| 70 | private void HandleObjectPaid(UUID objectID, UUID agentID, | 70 | private void HandleObjectPaid(UUID objectID, UUID agentID, |
| 71 | int amount) | 71 | int amount) |
| 72 | { | 72 | { |
| 73 | // Since this is an event from a shared module, all scenes will | ||
| 74 | // get it. But only one has the object in question. The others | ||
| 75 | // just ignore it. | ||
| 76 | // | ||
| 73 | SceneObjectPart part = | 77 | SceneObjectPart part = |
| 74 | myScriptEngine.World.GetSceneObjectPart(objectID); | 78 | myScriptEngine.World.GetSceneObjectPart(objectID); |
| 79 | |||
| 80 | if (part == null) | ||
| 81 | return; | ||
| 82 | |||
| 83 | Console.WriteLine("Paid: {0} from {1}, amount {2}", objectID,agentID,amount); | ||
| 75 | if (part.ParentGroup != null) | 84 | if (part.ParentGroup != null) |
| 76 | part = part.ParentGroup.RootPart; | 85 | part = part.ParentGroup.RootPart; |
| 77 | 86 | ||