diff options
author | Adam Frisby | 2008-05-01 18:04:42 +0000 |
---|---|---|
committer | Adam Frisby | 2008-05-01 18:04:42 +0000 |
commit | 20a9bf08f51351e1e0a9de94f184ff56cd572665 (patch) | |
tree | 52da64dab26353b903c8e4befed0178fa72a188b /OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |
parent | More config cleanup in LaunchSLClient. (diff) | |
download | opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.zip opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.gz opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.bz2 opensim-SC_OLD-20a9bf08f51351e1e0a9de94f184ff56cd572665.tar.xz |
* Rolled back a few changes.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs index b052096..dccc09a 100644 --- a/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Environment/Scenes/Scene.PacketHandlers.cs | |||
@@ -78,12 +78,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
78 | foreach (EntityBase ent in EntitieList) | 78 | foreach (EntityBase ent in EntitieList) |
79 | { | 79 | { |
80 | if (ent is SceneObjectGroup) | 80 | if (ent is SceneObjectGroup) |
81 | { | 81 | { |
82 | if ((ent).LocalId == primLocalID) | 82 | if (((SceneObjectGroup) ent).LocalId == primLocalID) |
83 | { | 83 | { |
84 | // A prim is only tainted if it's allowed to be edited by the person clicking it. | 84 | // A prim is only tainted if it's allowed to be edited by the person clicking it. |
85 | if (m_permissionManager.CanEditObjectPosition(remoteClient.AgentId, (ent).UUID) || | 85 | if (m_permissionManager.CanEditObjectPosition(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID) || m_permissionManager.CanEditObject(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID)) |
86 | m_permissionManager.CanEditObject(remoteClient.AgentId, (ent).UUID)) | ||
87 | { | 86 | { |
88 | ((SceneObjectGroup) ent).GetProperties(remoteClient); | 87 | ((SceneObjectGroup) ent).GetProperties(remoteClient); |
89 | ((SceneObjectGroup) ent).IsSelected = true; | 88 | ((SceneObjectGroup) ent).IsSelected = true; |
@@ -108,10 +107,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
108 | { | 107 | { |
109 | if (ent is SceneObjectGroup) | 108 | if (ent is SceneObjectGroup) |
110 | { | 109 | { |
111 | if ((ent).LocalId == primLocalID) | 110 | if (((SceneObjectGroup) ent).LocalId == primLocalID) |
112 | { | 111 | { |
113 | if (m_permissionManager.CanEditObjectPosition(remoteClient.AgentId, (ent).UUID) || | 112 | if (m_permissionManager.CanEditObjectPosition(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID) || m_permissionManager.CanEditObject(remoteClient.AgentId, ((SceneObjectGroup)ent).UUID)) |
114 | m_permissionManager.CanEditObject(remoteClient.AgentId, (ent).UUID)) | ||
115 | { | 113 | { |
116 | ((SceneObjectGroup) ent).IsSelected = false; | 114 | ((SceneObjectGroup) ent).IsSelected = false; |
117 | LandChannel.setPrimsTainted(); | 115 | LandChannel.setPrimsTainted(); |
@@ -131,20 +129,21 @@ namespace OpenSim.Region.Environment.Scenes | |||
131 | } | 129 | } |
132 | 130 | ||
133 | public virtual void ProcessParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, | 131 | public virtual void ProcessParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, |
134 | bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) | 132 | bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) |
135 | { | 133 | { |
136 | EventManager.LandBuyArgs args = new EventManager.LandBuyArgs( | 134 | EventManager.LandBuyArgs args = new EventManager.LandBuyArgs( |
137 | agentId, groupId, final, groupOwned, removeContribution, parcelLocalID, parcelArea, parcelPrice, authenticated); | 135 | agentId, groupId, final, groupOwned, removeContribution, parcelLocalID, parcelArea, parcelPrice, authenticated); |
138 | 136 | ||
139 | // First, allow all validators a stab at it | 137 | // First, allow all validators a stab at it |
140 | m_eventManager.TriggerValidateLandBuy(this, args); | 138 | m_eventManager.TriggerValidateLandBuy(this, args); |
141 | 139 | ||
142 | // Then, check validation and transfer | 140 | // Then, check validation and transfer |
143 | m_eventManager.TriggerLandBuy(this, args); | 141 | m_eventManager.TriggerLandBuy(this, args); |
144 | } | 142 | } |
145 | 143 | ||
146 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) | 144 | public virtual void ProcessObjectGrab(uint localID, LLVector3 offsetPos, IClientAPI remoteClient) |
147 | { | 145 | { |
146 | |||
148 | List<EntityBase> EntitieList = GetEntities(); | 147 | List<EntityBase> EntitieList = GetEntities(); |
149 | 148 | ||
150 | foreach (EntityBase ent in EntitieList) | 149 | foreach (EntityBase ent in EntitieList) |
@@ -179,6 +178,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
179 | 178 | ||
180 | public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient) | 179 | public virtual void ProcessObjectDeGrab(uint localID, IClientAPI remoteClient) |
181 | { | 180 | { |
181 | |||
182 | List<EntityBase> EntitieList = GetEntities(); | 182 | List<EntityBase> EntitieList = GetEntities(); |
183 | 183 | ||
184 | foreach (EntityBase ent in EntitieList) | 184 | foreach (EntityBase ent in EntitieList) |
@@ -190,7 +190,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
190 | // Is this prim part of the group | 190 | // Is this prim part of the group |
191 | if (obj.HasChildPrim(localID)) | 191 | if (obj.HasChildPrim(localID)) |
192 | { | 192 | { |
193 | SceneObjectPart part = obj.GetChildPart(localID); | 193 | SceneObjectPart part=obj.GetChildPart(localID); |
194 | if (part != null) | 194 | if (part != null) |
195 | { | 195 | { |
196 | // If the touched prim handles touches, deliver it | 196 | // If the touched prim handles touches, deliver it |
@@ -233,8 +233,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
233 | LLUUID translatedIDtem = item.AvatarID; | 233 | LLUUID translatedIDtem = item.AvatarID; |
234 | searchData[i] = new AvatarPickerReplyPacket.DataBlock(); | 234 | searchData[i] = new AvatarPickerReplyPacket.DataBlock(); |
235 | searchData[i].AvatarID = translatedIDtem; | 235 | searchData[i].AvatarID = translatedIDtem; |
236 | searchData[i].FirstName = Helpers.StringToField(item.firstName); | 236 | searchData[i].FirstName = Helpers.StringToField((string) item.firstName); |
237 | searchData[i].LastName = Helpers.StringToField(item.lastName); | 237 | searchData[i].LastName = Helpers.StringToField((string) item.lastName); |
238 | i++; | 238 | i++; |
239 | } | 239 | } |
240 | if (AvatarResponses.Count == 0) | 240 | if (AvatarResponses.Count == 0) |
@@ -245,4 +245,4 @@ namespace OpenSim.Region.Environment.Scenes | |||
245 | client.SendAvatarPickerReply(replyPacket); | 245 | client.SendAvatarPickerReply(replyPacket); |
246 | } | 246 | } |
247 | } | 247 | } |
248 | } \ No newline at end of file | 248 | } |