aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9a9ef5f..6d2ae5a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1952,7 +1952,7 @@ namespace OpenSim.Region.Framework.Scenes
1952 sceneObject.ScheduleGroupForFullUpdate(); 1952 sceneObject.ScheduleGroupForFullUpdate();
1953 1953
1954 return sceneObject; 1954 return sceneObject;
1955 } 1955 }
1956 1956
1957 /// <summary> 1957 /// <summary>
1958 /// Add an object into the scene that has come from storage 1958 /// Add an object into the scene that has come from storage
@@ -2045,7 +2045,7 @@ namespace OpenSim.Region.Framework.Scenes
2045 /// <returns></returns> 2045 /// <returns></returns>
2046 public bool AddNewSceneObject( 2046 public bool AddNewSceneObject(
2047 SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) 2047 SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel)
2048 { 2048 {
2049 return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel); 2049 return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel);
2050 } 2050 }
2051 2051
@@ -2430,7 +2430,7 @@ namespace OpenSim.Region.Framework.Scenes
2430 ScenePresence sp = GetScenePresence(userID); 2430 ScenePresence sp = GetScenePresence(userID);
2431 if (sp != null && AttachmentsModule != null) 2431 if (sp != null && AttachmentsModule != null)
2432 { 2432 {
2433 uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID); 2433 uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID);
2434 AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt); 2434 AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt);
2435 } 2435 }
2436 2436
@@ -2473,7 +2473,7 @@ namespace OpenSim.Region.Framework.Scenes
2473 sceneObject.RootPart.AddFlag(PrimFlags.Phantom); 2473 sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
2474 2474
2475 // Don't sent a full update here because this will cause full updates to be sent twice for 2475 // Don't sent a full update here because this will cause full updates to be sent twice for
2476 // attachments on region crossings, resulting in viewer glitches. 2476 // attachments on region crossings, resulting in viewer glitches.
2477 AddRestoredSceneObject(sceneObject, false, false, false); 2477 AddRestoredSceneObject(sceneObject, false, false, false);
2478 2478
2479 // Handle attachment special case 2479 // Handle attachment special case
@@ -2717,7 +2717,7 @@ namespace OpenSim.Region.Framework.Scenes
2717 } 2717 }
2718 2718
2719 public virtual void SubscribeToClientPrimEvents(IClientAPI client) 2719 public virtual void SubscribeToClientPrimEvents(IClientAPI client)
2720 { 2720 {
2721 client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition; 2721 client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition;
2722 client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; 2722 client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition;
2723 client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimRotation; 2723 client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimRotation;
@@ -2753,7 +2753,7 @@ namespace OpenSim.Region.Framework.Scenes
2753 client.OnUndo += m_sceneGraph.HandleUndo; 2753 client.OnUndo += m_sceneGraph.HandleUndo;
2754 client.OnRedo += m_sceneGraph.HandleRedo; 2754 client.OnRedo += m_sceneGraph.HandleRedo;
2755 client.OnObjectDescription += m_sceneGraph.PrimDescription; 2755 client.OnObjectDescription += m_sceneGraph.PrimDescription;
2756 client.OnObjectDrop += m_sceneGraph.DropObject; 2756 client.OnObjectDrop += m_sceneGraph.DropObject;
2757 client.OnObjectIncludeInSearch += m_sceneGraph.MakeObjectSearchable; 2757 client.OnObjectIncludeInSearch += m_sceneGraph.MakeObjectSearchable;
2758 client.OnObjectOwner += ObjectOwner; 2758 client.OnObjectOwner += ObjectOwner;
2759 } 2759 }
@@ -3705,7 +3705,7 @@ namespace OpenSim.Region.Framework.Scenes
3705 public virtual void AgentCrossing(UUID agentID, Vector3 position, bool isFlying) 3705 public virtual void AgentCrossing(UUID agentID, Vector3 position, bool isFlying)
3706 { 3706 {
3707 ScenePresence presence = GetScenePresence(agentID); 3707 ScenePresence presence = GetScenePresence(agentID);
3708 if(presence != null) 3708 if (presence != null)
3709 { 3709 {
3710 try 3710 try
3711 { 3711 {