diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 38 |
1 files changed, 18 insertions, 20 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 8541024..3e250da 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
196 | 196 | ||
197 | } | 197 | } |
198 | sceneObject.UpdateParentIDs(); | 198 | sceneObject.UpdateParentIDs(); |
199 | 199 | ||
200 | AddSceneObject(sceneObject); | 200 | AddSceneObject(sceneObject); |
201 | } | 201 | } |
202 | 202 | ||
@@ -215,14 +215,14 @@ namespace OpenSim.Region.Environment.Scenes | |||
215 | // QuadTree.AddSceneObject(sceneObject); | 215 | // QuadTree.AddSceneObject(sceneObject); |
216 | Entities.Add(sceneObject.UUID, sceneObject); | 216 | Entities.Add(sceneObject.UUID, sceneObject); |
217 | m_numPrim++; | 217 | m_numPrim++; |
218 | 218 | ||
219 | return true; | 219 | return true; |
220 | } | 220 | } |
221 | 221 | ||
222 | return false; | 222 | return false; |
223 | } | 223 | } |
224 | } | 224 | } |
225 | 225 | ||
226 | /// <summary> | 226 | /// <summary> |
227 | /// Delete an object from the scene | 227 | /// Delete an object from the scene |
228 | /// </summary> | 228 | /// </summary> |
@@ -236,11 +236,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
236 | { | 236 | { |
237 | Entities.Remove(uuid); | 237 | Entities.Remove(uuid); |
238 | m_numPrim--; | 238 | m_numPrim--; |
239 | 239 | ||
240 | return true; | 240 | return true; |
241 | } | 241 | } |
242 | } | 242 | } |
243 | 243 | ||
244 | return false; | 244 | return false; |
245 | } | 245 | } |
246 | 246 | ||
@@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
313 | { | 313 | { |
314 | m_activeScripts += number; | 314 | m_activeScripts += number; |
315 | } | 315 | } |
316 | 316 | ||
317 | protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient) | 317 | protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient) |
318 | { | 318 | { |
319 | List<EntityBase> EntityList = GetEntities(); | 319 | List<EntityBase> EntityList = GetEntities(); |
@@ -340,9 +340,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
340 | SceneObjectPart part = m_parentScene.GetSceneObjectPart(primId); | 340 | SceneObjectPart part = m_parentScene.GetSceneObjectPart(primId); |
341 | if (part != null) | 341 | if (part != null) |
342 | part.Undo(); | 342 | part.Undo(); |
343 | } | 343 | } |
344 | } | 344 | } |
345 | 345 | ||
346 | protected internal void HandleObjectGroupUpdate( | 346 | protected internal void HandleObjectGroupUpdate( |
347 | IClientAPI remoteClient, LLUUID GroupID, uint objectLocalID, LLUUID Garbage) | 347 | IClientAPI remoteClient, LLUUID GroupID, uint objectLocalID, LLUUID Garbage) |
348 | { | 348 | { |
@@ -360,12 +360,11 @@ namespace OpenSim.Region.Environment.Scenes | |||
360 | group.SetGroup(GroupID, remoteClient); | 360 | group.SetGroup(GroupID, remoteClient); |
361 | else | 361 | else |
362 | remoteClient.SendAgentAlertMessage("You don't have permission to set the group", false); | 362 | remoteClient.SendAgentAlertMessage("You don't have permission to set the group", false); |
363 | |||
364 | } | 363 | } |
365 | } | 364 | } |
366 | } | 365 | } |
367 | } | 366 | } |
368 | 367 | ||
369 | /// <summary> | 368 | /// <summary> |
370 | /// Event Handling routine for Attach Object | 369 | /// Event Handling routine for Attach Object |
371 | /// </summary> | 370 | /// </summary> |
@@ -379,7 +378,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
379 | 378 | ||
380 | AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, LLVector3.Zero); | 379 | AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, LLVector3.Zero); |
381 | } | 380 | } |
382 | 381 | ||
383 | protected internal void RezSingleAttachment( | 382 | protected internal void RezSingleAttachment( |
384 | IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask) | 383 | IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,uint ItemFlags, uint NextOwnerMask) |
385 | { | 384 | { |
@@ -492,7 +491,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
492 | newAvatar.IsChildAgent = child; | 491 | newAvatar.IsChildAgent = child; |
493 | 492 | ||
494 | AddScenePresence(newAvatar); | 493 | AddScenePresence(newAvatar); |
495 | 494 | ||
496 | return newAvatar; | 495 | return newAvatar; |
497 | } | 496 | } |
498 | 497 | ||
@@ -528,7 +527,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
528 | ScenePresences[presence.UUID] = presence; | 527 | ScenePresences[presence.UUID] = presence; |
529 | } | 528 | } |
530 | } | 529 | } |
531 | 530 | ||
532 | /// <summary> | 531 | /// <summary> |
533 | /// Remove a presence from the scene | 532 | /// Remove a presence from the scene |
534 | /// </summary> | 533 | /// </summary> |
@@ -545,9 +544,9 @@ namespace OpenSim.Region.Environment.Scenes | |||
545 | m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene Entities list", agentID); | 544 | m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene Entities list", agentID); |
546 | } | 545 | } |
547 | } | 546 | } |
548 | 547 | ||
549 | lock (ScenePresences) | 548 | lock (ScenePresences) |
550 | { | 549 | { |
551 | if (ScenePresences.Remove(agentID)) | 550 | if (ScenePresences.Remove(agentID)) |
552 | { | 551 | { |
553 | //m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID); | 552 | //m_log.InfoFormat("[SCENE] Removed scene presence {0}", agentID); |
@@ -556,7 +555,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
556 | { | 555 | { |
557 | m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID); | 556 | m_log.WarnFormat("[SCENE] Tried to remove non-existent scene presence with agent ID {0} from scene ScenePresences list", agentID); |
558 | } | 557 | } |
559 | } | 558 | } |
560 | } | 559 | } |
561 | 560 | ||
562 | protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F) | 561 | protected internal void SwapRootChildAgent(bool direction_RC_CR_T_F) |
@@ -622,7 +621,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
622 | m_scriptLPS = 0; | 621 | m_scriptLPS = 0; |
623 | return returnval; | 622 | return returnval; |
624 | } | 623 | } |
625 | 624 | ||
626 | #endregion | 625 | #endregion |
627 | 626 | ||
628 | #region Get Methods | 627 | #region Get Methods |
@@ -863,7 +862,6 @@ namespace OpenSim.Region.Environment.Scenes | |||
863 | { | 862 | { |
864 | break; | 863 | break; |
865 | } | 864 | } |
866 | |||
867 | } | 865 | } |
868 | grp.scriptScore = 0; | 866 | grp.scriptScore = 0; |
869 | } | 867 | } |
@@ -964,7 +962,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
964 | } | 962 | } |
965 | } | 963 | } |
966 | } | 964 | } |
967 | 965 | ||
968 | protected internal void UpdatePrimGroupScale(uint localID, LLVector3 scale, IClientAPI remoteClient) | 966 | protected internal void UpdatePrimGroupScale(uint localID, LLVector3 scale, IClientAPI remoteClient) |
969 | { | 967 | { |
970 | SceneObjectGroup group = GetGroupByPrim(localID); | 968 | SceneObjectGroup group = GetGroupByPrim(localID); |