aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs9
2 files changed, 3 insertions, 14 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 29751ff..20bc59c 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -5218,13 +5218,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5218 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " + 5218 update.NameValue = Utils.StringToBytes("FirstName STRING RW SV " + data.Firstname + "\nLastName STRING RW SV " +
5219 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle); 5219 data.Lastname + "\nTitle STRING RW SV " + data.Grouptitle);
5220 update.ObjectData = objectData; 5220 update.ObjectData = objectData;
5221 5221 update.ParentID = data.ParentID;
5222 SceneObjectPart parentPart = data.ParentPart;
5223 if (parentPart != null)
5224 update.ParentID = parentPart.ParentGroup.LocalId;
5225 else
5226 update.ParentID = 0;
5227
5228 update.PathCurve = 16; 5222 update.PathCurve = 16;
5229 update.PathScaleX = 100; 5223 update.PathScaleX = 100;
5230 update.PathScaleY = 100; 5224 update.PathScaleY = 100;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index ea8e4fe..7243db1 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -2312,10 +2312,8 @@ namespace OpenSim.Region.Framework.Scenes
2312 cameraEyeOffset = part.GetCameraEyeOffset(); 2312 cameraEyeOffset = part.GetCameraEyeOffset();
2313 forceMouselook = part.GetForceMouselook(); 2313 forceMouselook = part.GetForceMouselook();
2314 2314
2315 // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is
2316 // being sat upon.
2317 ControllingClient.SendSitResponse( 2315 ControllingClient.SendSitResponse(
2318 part.ParentGroup.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook); 2316 part.UUID, offset, sitOrientation, false, cameraAtOffset, cameraEyeOffset, forceMouselook);
2319 2317
2320 m_requestedSitTargetUUID = part.UUID; 2318 m_requestedSitTargetUUID = part.UUID;
2321 2319
@@ -2594,10 +2592,7 @@ namespace OpenSim.Region.Framework.Scenes
2594 } 2592 }
2595 else 2593 else
2596 { 2594 {
2597 // An viewer expects to specify sit positions as offsets to the root prim, even if a child prim is 2595 m_pos -= part.AbsolutePosition;
2598 // being sat upon.
2599 m_pos -= part.GroupPosition;
2600
2601 ParentPosition = part.AbsolutePosition; 2596 ParentPosition = part.AbsolutePosition;
2602 2597
2603// m_log.DebugFormat( 2598// m_log.DebugFormat(