diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 24a2db7..2d62b50 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
86 | else | 86 | else |
87 | EventManager.TriggerOnChatFromWorld(this, args); | 87 | EventManager.TriggerOnChatFromWorld(this, args); |
88 | } | 88 | } |
89 | 89 | ||
90 | protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName, | 90 | protected void SimChat(byte[] message, ChatTypeEnum type, int channel, Vector3 fromPos, string fromName, |
91 | UUID fromID, bool fromAgent, bool broadcast) | 91 | UUID fromID, bool fromAgent, bool broadcast) |
92 | { | 92 | { |
@@ -212,13 +212,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
212 | if (groupID != UUID.Zero) | 212 | if (groupID != UUID.Zero) |
213 | { | 213 | { |
214 | GroupMembershipData gmd = m_groupsModule.GetMembershipData(groupID, remoteClient.AgentId); | 214 | GroupMembershipData gmd = m_groupsModule.GetMembershipData(groupID, remoteClient.AgentId); |
215 | 215 | ||
216 | if (gmd == null) | 216 | if (gmd == null) |
217 | { | 217 | { |
218 | // m_log.WarnFormat( | 218 | // m_log.WarnFormat( |
219 | // "[GROUPS]: User {0} is not a member of group {1} so they can't update {2} to this group", | 219 | // "[GROUPS]: User {0} is not a member of group {1} so they can't update {2} to this group", |
220 | // remoteClient.Name, GroupID, objectLocalID); | 220 | // remoteClient.Name, GroupID, objectLocalID); |
221 | 221 | ||
222 | return; | 222 | return; |
223 | } | 223 | } |
224 | } | 224 | } |
@@ -243,7 +243,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
243 | SceneObjectPart part = GetSceneObjectPart(primLocalID); | 243 | SceneObjectPart part = GetSceneObjectPart(primLocalID); |
244 | if (part == null) | 244 | if (part == null) |
245 | return; | 245 | return; |
246 | 246 | ||
247 | bool oldgprSelect = part.ParentGroup.IsSelected; | 247 | bool oldgprSelect = part.ParentGroup.IsSelected; |
248 | 248 | ||
249 | // This is wrong, wrong, wrong. Selection should not be | 249 | // This is wrong, wrong, wrong. Selection should not be |
@@ -259,14 +259,14 @@ namespace OpenSim.Region.Framework.Scenes | |||
259 | 259 | ||
260 | // restore targetOmega | 260 | // restore targetOmega |
261 | if (part.AngularVelocity != Vector3.Zero) | 261 | if (part.AngularVelocity != Vector3.Zero) |
262 | part.ScheduleTerseUpdate(); | 262 | part.ScheduleTerseUpdate(); |
263 | } | 263 | } |
264 | } | 264 | } |
265 | 265 | ||
266 | public virtual void ProcessMoneyTransferRequest(UUID source, UUID destination, int amount, | 266 | public virtual void ProcessMoneyTransferRequest(UUID source, UUID destination, int amount, |
267 | int transactiontype, string description) | 267 | int transactiontype, string description) |
268 | { | 268 | { |
269 | EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(source, destination, amount, | 269 | EventManager.MoneyTransferArgs args = new EventManager.MoneyTransferArgs(source, destination, amount, |
270 | transactiontype, description); | 270 | transactiontype, description); |
271 | 271 | ||
272 | EventManager.TriggerMoneyTransfer(this, args); | 272 | EventManager.TriggerMoneyTransfer(this, args); |
@@ -275,8 +275,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
275 | public virtual void ProcessParcelBuy(UUID agentId, UUID groupId, bool final, bool groupOwned, | 275 | public virtual void ProcessParcelBuy(UUID agentId, UUID groupId, bool final, bool groupOwned, |
276 | bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) | 276 | bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated) |
277 | { | 277 | { |
278 | EventManager.LandBuyArgs args = new EventManager.LandBuyArgs(agentId, groupId, final, groupOwned, | 278 | EventManager.LandBuyArgs args = new EventManager.LandBuyArgs(agentId, groupId, final, groupOwned, |
279 | removeContribution, parcelLocalID, parcelArea, | 279 | removeContribution, parcelLocalID, parcelArea, |
280 | parcelPrice, authenticated); | 280 | parcelPrice, authenticated); |
281 | 281 | ||
282 | // First, allow all validators a stab at it | 282 | // First, allow all validators a stab at it |
@@ -289,7 +289,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
289 | public virtual void ProcessObjectGrab(uint localID, Vector3 offsetPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) | 289 | public virtual void ProcessObjectGrab(uint localID, Vector3 offsetPos, IClientAPI remoteClient, List<SurfaceTouchEventArgs> surfaceArgs) |
290 | { | 290 | { |
291 | SceneObjectPart part = GetSceneObjectPart(localID); | 291 | SceneObjectPart part = GetSceneObjectPart(localID); |
292 | 292 | ||
293 | if (part == null) | 293 | if (part == null) |
294 | return; | 294 | return; |
295 | 295 | ||
@@ -302,7 +302,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
302 | // Currently only grab/touch for the single prim | 302 | // Currently only grab/touch for the single prim |
303 | // the client handles rez correctly | 303 | // the client handles rez correctly |
304 | obj.ObjectGrabHandler(localID, offsetPos, remoteClient); | 304 | obj.ObjectGrabHandler(localID, offsetPos, remoteClient); |
305 | 305 | ||
306 | // If the touched prim handles touches, deliver it | 306 | // If the touched prim handles touches, deliver it |
307 | if ((part.ScriptEvents & scriptEvents.touch_start) != 0) | 307 | if ((part.ScriptEvents & scriptEvents.touch_start) != 0) |
308 | EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg); | 308 | EventManager.TriggerObjectGrab(part.LocalId, 0, part.OffsetPosition, remoteClient, surfaceArg); |
@@ -310,7 +310,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
310 | // Deliver to the root prim if the touched prim doesn't handle touches | 310 | // Deliver to the root prim if the touched prim doesn't handle touches |
311 | // or if we're meant to pass on touches anyway. | 311 | // or if we're meant to pass on touches anyway. |
312 | if (((part.ScriptEvents & scriptEvents.touch_start) == 0) || | 312 | if (((part.ScriptEvents & scriptEvents.touch_start) == 0) || |
313 | (part.PassTouches && (part.LocalId != obj.RootPart.LocalId))) | 313 | (part.PassTouches && (part.LocalId != obj.RootPart.LocalId))) |
314 | { | 314 | { |
315 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg); | 315 | EventManager.TriggerObjectGrab(obj.RootPart.LocalId, part.LocalId, part.OffsetPosition, remoteClient, surfaceArg); |
316 | } | 316 | } |
@@ -337,7 +337,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
337 | // get's it's position on the simulator even if it was the same as before | 337 | // get's it's position on the simulator even if it was the same as before |
338 | // This keeps the moving user's client in sync with the rest of the world. | 338 | // This keeps the moving user's client in sync with the rest of the world. |
339 | group.SendGroupTerseUpdate(); | 339 | group.SendGroupTerseUpdate(); |
340 | 340 | ||
341 | SurfaceTouchEventArgs surfaceArg = null; | 341 | SurfaceTouchEventArgs surfaceArg = null; |
342 | if (surfaceArgs != null && surfaceArgs.Count > 0) | 342 | if (surfaceArgs != null && surfaceArgs.Count > 0) |
343 | surfaceArg = surfaceArgs[0]; | 343 | surfaceArg = surfaceArgs[0]; |
@@ -483,7 +483,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
483 | } | 483 | } |
484 | }); | 484 | }); |
485 | } | 485 | } |
486 | 486 | ||
487 | private bool ShouldSendDiscardableEffect(IClientAPI thisClient, ScenePresence other) | 487 | private bool ShouldSendDiscardableEffect(IClientAPI thisClient, ScenePresence other) |
488 | { | 488 | { |
489 | return Vector3.Distance(other.CameraPosition, thisClient.SceneAgent.AbsolutePosition) < 10; | 489 | return Vector3.Distance(other.CameraPosition, thisClient.SceneAgent.AbsolutePosition) < 10; |
@@ -603,7 +603,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
603 | m_descendentsRequestProcessing = false; | 603 | m_descendentsRequestProcessing = false; |
604 | } | 604 | } |
605 | } | 605 | } |
606 | 606 | ||
607 | /// <summary> | 607 | /// <summary> |
608 | /// Handle an inventory folder creation request from the client. | 608 | /// Handle an inventory folder creation request from the client. |
609 | /// </summary> | 609 | /// </summary> |
@@ -657,7 +657,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
657 | } | 657 | } |
658 | } | 658 | } |
659 | } | 659 | } |
660 | 660 | ||
661 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) | 661 | public void HandleMoveInventoryFolder(IClientAPI remoteClient, UUID folderID, UUID parentID) |
662 | { | 662 | { |
663 | InventoryFolderBase folder = InventoryService.GetFolder(remoteClient.AgentId, folderID); | 663 | InventoryFolderBase folder = InventoryService.GetFolder(remoteClient.AgentId, folderID); |