diff options
| author | Justin Clark-Casey (justincc) | 2013-08-22 22:49:23 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2013-08-22 22:49:23 +0100 |
| commit | beb9d966f9efb571b3d6635ba2500b6b0e685fc0 (patch) | |
| tree | 0a3d6b293aa5c7e46bc105b355969ff82d6772fb | |
| parent | Stop error messages being misleadingly generated when on client connection ac... (diff) | |
| download | opensim-SC-beb9d966f9efb571b3d6635ba2500b6b0e685fc0.zip opensim-SC-beb9d966f9efb571b3d6635ba2500b6b0e685fc0.tar.gz opensim-SC-beb9d966f9efb571b3d6635ba2500b6b0e685fc0.tar.bz2 opensim-SC-beb9d966f9efb571b3d6635ba2500b6b0e685fc0.tar.xz | |
Stop "handle sit user name" command from trying to sit avatars on objects which have sit positions but are attachments
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs index 4a591cf..5a6b284 100644 --- a/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/SitStand/SitStandCommandsModule.cs | |||
| @@ -127,6 +127,9 @@ namespace OpenSim.Region.OptionalModules.Avatar.SitStand | |||
| 127 | 127 | ||
| 128 | foreach (SceneObjectGroup sceneObject in sceneObjects) | 128 | foreach (SceneObjectGroup sceneObject in sceneObjects) |
| 129 | { | 129 | { |
| 130 | if (sceneObject.IsAttachment) | ||
| 131 | continue; | ||
| 132 | |||
| 130 | foreach (SceneObjectPart part in sceneObject.Parts) | 133 | foreach (SceneObjectPart part in sceneObject.Parts) |
| 131 | { | 134 | { |
| 132 | if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero) | 135 | if (part.IsSitTargetSet && part.SitTargetAvatar == UUID.Zero) |