aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDr Scofield2008-07-25 10:13:26 +0000
committerDr Scofield2008-07-25 10:13:26 +0000
commit031e1407615be4fe016e4185ef041eaafbc19e49 (patch)
treeb326ac9dac00aa905ed942ba56ea021c1e9c8065
parentcompleting rename of ChatFromViewerArgs to OSChatMessage (diff)
downloadopensim-SC_OLD-031e1407615be4fe016e4185ef041eaafbc19e49.zip
opensim-SC_OLD-031e1407615be4fe016e4185ef041eaafbc19e49.tar.gz
opensim-SC_OLD-031e1407615be4fe016e4185ef041eaafbc19e49.tar.bz2
opensim-SC_OLD-031e1407615be4fe016e4185ef041eaafbc19e49.tar.xz
From: Christopher Yeoh <yeohc@au1.ibm.com>
The LL Server sets the CreateSelected flag for a prim when sending a property update when objects are linked. The following patch gets OpenSim to do the same.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs1
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs1
2 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 7df70a0..2b2e087 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1364,6 +1364,7 @@ namespace OpenSim.Region.Environment.Scenes
1364 1364
1365 // We need to explicitly resend the newly link prim's object properties since no other actions 1365 // We need to explicitly resend the newly link prim's object properties since no other actions
1366 // occur on link to invoke this elsewhere (such as object selection) 1366 // occur on link to invoke this elsewhere (such as object selection)
1367 parenPrim.RootPart.AddFlag(LLObject.ObjectFlags.CreateSelected);
1367 parenPrim.TriggerScriptChangedEvent(Changed.LINK); 1368 parenPrim.TriggerScriptChangedEvent(Changed.LINK);
1368 if (client != null) 1369 if (client != null)
1369 parenPrim.GetProperties(client); 1370 parenPrim.GetProperties(client);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 87e69f7..e982c35 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -1756,6 +1756,7 @@ namespace OpenSim.Region.Environment.Scenes
1756 linkPart.LinkNum = m_parts.Count; 1756 linkPart.LinkNum = m_parts.Count;
1757 1757
1758 linkPart.SetParent(this); 1758 linkPart.SetParent(this);
1759 linkPart.AddFlag(LLObject.ObjectFlags.CreateSelected);
1759 1760
1760 //if (linkPart.PhysActor != null) 1761 //if (linkPart.PhysActor != null)
1761 //{ 1762 //{