diff options
| author | Melanie | 2012-06-14 00:57:05 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-14 00:57:05 +0100 |
| commit | 36117e079aa8b149b3764d0beb853251ff77ca09 (patch) | |
| tree | 244337e3da7bf5a65c3eaf1396d2a0a8f0d60ef5 /OpenSim/Region/ClientStack/Linden/Caps | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment p... (diff) | |
| download | opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.zip opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.gz opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.bz2 opensim-SC_OLD-36117e079aa8b149b3764d0beb853251ff77ca09.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs index f0f3984..ba902b2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs | |||
| @@ -333,7 +333,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 333 | grp.AbsolutePosition = obj.Position; | 333 | grp.AbsolutePosition = obj.Position; |
| 334 | prim.RotationOffset = obj.Rotation; | 334 | prim.RotationOffset = obj.Rotation; |
| 335 | 335 | ||
| 336 | grp.IsAttachment = false; | ||
| 337 | // Required for linking | 336 | // Required for linking |
| 338 | grp.RootPart.ClearUpdateSchedule(); | 337 | grp.RootPart.ClearUpdateSchedule(); |
| 339 | 338 | ||