aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/InnerScene.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-03 13:33:46 +0000
committerJustin Clarke Casey2008-04-03 13:33:46 +0000
commit6ef4f1bdae63d156f2dfad9a440ba52a9b84dc85 (patch)
tree7fe1ee918ce816cdf6cec7c49e186b5ac91aff48 /OpenSim/Region/Environment/Scenes/InnerScene.cs
parentpoint in time update of NHibernate Asset Mapping code (diff)
downloadopensim-SC-6ef4f1bdae63d156f2dfad9a440ba52a9b84dc85.zip
opensim-SC-6ef4f1bdae63d156f2dfad9a440ba52a9b84dc85.tar.gz
opensim-SC-6ef4f1bdae63d156f2dfad9a440ba52a9b84dc85.tar.bz2
opensim-SC-6ef4f1bdae63d156f2dfad9a440ba52a9b84dc85.tar.xz
* Resolve mantis 849
* Scripts in prims within linksets can now be properly edited using the 'edit linked parts' linden ui option
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index c009593..9a720d9 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1081,11 +1081,12 @@ namespace OpenSim.Region.Environment.Scenes
1081 } 1081 }
1082 1082
1083 /// <summary> 1083 /// <summary>
1084 /// 1084 /// Initial method invoked when we receive a link objects request from the client.
1085 /// </summary> 1085 /// </summary>
1086 /// <param name="client"></param>
1086 /// <param name="parentPrim"></param> 1087 /// <param name="parentPrim"></param>
1087 /// <param name="childPrims"></param> 1088 /// <param name="childPrims"></param>
1088 public void LinkObjects(uint parentPrim, List<uint> childPrims) 1089 public void LinkObjects(IClientAPI client, uint parentPrim, List<uint> childPrims)
1089 { 1090 {
1090 List<EntityBase> EntityList = GetEntities(); 1091 List<EntityBase> EntityList = GetEntities();
1091 1092
@@ -1124,6 +1125,10 @@ namespace OpenSim.Region.Environment.Scenes
1124 { 1125 {
1125 parenPrim.LinkToGroup(sceneObj); 1126 parenPrim.LinkToGroup(sceneObj);
1126 } 1127 }
1128
1129 // We need to explicitly resend the newly link prim's object properties since no other actions
1130 // occur on link to invoke this elsewhere (such as object selection)
1131 parenPrim.GetProperties(client);
1127 } 1132 }
1128 1133
1129 /// <summary> 1134 /// <summary>