diff options
author | Justin Clark-Casey (justincc) | 2011-09-05 23:42:37 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-09-05 23:42:37 +0100 |
commit | cf73afec356eed30e169be3ce71edad89b4fdb37 (patch) | |
tree | 8e1e05ce4e4c3697de637213c45e700a2afe69f9 /OpenSim/Region/CoreModules/Scripting/WorldComm | |
parent | Allow the HGInventoryBroker to set the UserManager when it instantiates a Rem... (diff) | |
download | opensim-SC_OLD-cf73afec356eed30e169be3ce71edad89b4fdb37.zip opensim-SC_OLD-cf73afec356eed30e169be3ce71edad89b4fdb37.tar.gz opensim-SC_OLD-cf73afec356eed30e169be3ce71edad89b4fdb37.tar.bz2 opensim-SC_OLD-cf73afec356eed30e169be3ce71edad89b4fdb37.tar.xz |
Try disabling the inconsistent attachment state check to see if this actually has an impact.
The code in question is over three years old and just be catching an inconsistency rather than being wholly necessary.
This commit still carries out the check and prints all the previous log warnings but a 'failure' no longer prevents avatar region crossing or teleport, and it doesn't give the client the error message.
This will have some kind of impact on http://opensimulator.org/mantis/view.php?id=5672
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting/WorldComm')
-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 |