aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-17 02:07:38 +0000
committerTeravus Ovares2008-05-17 02:07:38 +0000
commitfbc98ca537b9cb1bdbb5f7dc9e75f7d6efa29bf9 (patch)
treed4728b3a63039968b1d37b6595d4f4ec01ed5301
parent* Tweaked patch mantis 1302 and committing it. (diff)
downloadopensim-SC-fbc98ca537b9cb1bdbb5f7dc9e75f7d6efa29bf9.zip
opensim-SC-fbc98ca537b9cb1bdbb5f7dc9e75f7d6efa29bf9.tar.gz
opensim-SC-fbc98ca537b9cb1bdbb5f7dc9e75f7d6efa29bf9.tar.bz2
opensim-SC-fbc98ca537b9cb1bdbb5f7dc9e75f7d6efa29bf9.tar.xz
0001303: [PATCH] Make prim owner and data show for prims not owned. From Melanie. Thanks Melanie!
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
index c486e28..b2f1dec 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs
@@ -84,11 +84,11 @@ namespace OpenSim.Region.Environment.Scenes
84 { 84 {
85 if (((SceneObjectGroup) ent).LocalId == primLocalID) 85 if (((SceneObjectGroup) ent).LocalId == primLocalID)
86 { 86 {
87 ((SceneObjectGroup) ent).GetProperties(remoteClient);
88 ((SceneObjectGroup) ent).IsSelected = true;
87 // A prim is only tainted if it's allowed to be edited by the person clicking it. 89 // A prim is only tainted if it's allowed to be edited by the person clicking it.
88 if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)) 90 if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId))
89 { 91 {
90 ((SceneObjectGroup) ent).GetProperties(remoteClient);
91 ((SceneObjectGroup) ent).IsSelected = true;
92 LandChannel.SetPrimsTainted(); 92 LandChannel.SetPrimsTainted();
93 } 93 }
94 break; 94 break;
@@ -112,9 +112,9 @@ namespace OpenSim.Region.Environment.Scenes
112 { 112 {
113 if (((SceneObjectGroup) ent).LocalId == primLocalID) 113 if (((SceneObjectGroup) ent).LocalId == primLocalID)
114 { 114 {
115 ((SceneObjectGroup) ent).IsSelected = false;
115 if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId)) 116 if (ExternalChecks.ExternalChecksCanEditObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId) || ExternalChecks.ExternalChecksCanMoveObject(((SceneObjectGroup)ent).UUID, remoteClient.AgentId))
116 { 117 {
117 ((SceneObjectGroup) ent).IsSelected = false;
118 LandChannel.SetPrimsTainted(); 118 LandChannel.SetPrimsTainted();
119 ((SceneObjectGroup)ent).ScheduleGroupForTerseUpdate(); 119 ((SceneObjectGroup)ent).ScheduleGroupForTerseUpdate();
120 break; 120 break;