diff options
| author | Tom | 2011-09-14 19:11:32 -0700 |
|---|---|---|
| committer | Tom | 2011-09-14 19:11:32 -0700 |
| commit | 5484c9b585a2a6289456e9492ac2989d489b555c (patch) | |
| tree | c9b79199722fe09c993c237dce40febf731264e3 /OpenSim/Region/CoreModules/Scripting | |
| parent | Merge fixes, and fix the build (diff) | |
| parent | Don't try and delete attachments for child agent close (diff) | |
| download | opensim-SC-5484c9b585a2a6289456e9492ac2989d489b555c.zip opensim-SC-5484c9b585a2a6289456e9492ac2989d489b555c.tar.gz opensim-SC-5484c9b585a2a6289456e9492ac2989d489b555c.tar.bz2 opensim-SC-5484c9b585a2a6289456e9492ac2989d489b555c.tar.xz | |
Bring us up to date.
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs index b20a875..a14a84b 100644 --- a/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs | |||
| @@ -323,7 +323,8 @@ namespace OpenSim.Region.CoreModules.Scripting.WorldComm | |||
| 323 | List<UUID> targets = new List<UUID>(); | 323 | List<UUID> targets = new List<UUID>(); |
| 324 | foreach (SceneObjectGroup sog in attachments) | 324 | foreach (SceneObjectGroup sog in attachments) |
| 325 | { | 325 | { |
| 326 | targets.Add(sog.UUID); | 326 | if (!sog.IsDeleted) |
| 327 | targets.Add(sog.UUID); | ||
| 327 | } | 328 | } |
| 328 | 329 | ||
| 329 | // Need to check each attachment | 330 | // Need to check each attachment |