diff options
author | Jeff Ames | 2010-09-12 13:43:49 -0400 |
---|---|---|
committer | Jeff Ames | 2010-09-12 13:43:49 -0400 |
commit | f1f0bc23f4501ba99035283d3407ddad2b21b785 (patch) | |
tree | 2b62a244eddf18f5608405abcefa9f763ab54340 /OpenSim/Region/Framework/Scenes/Scene.cs | |
parent | Add copyright headers. (diff) | |
download | opensim-SC_OLD-f1f0bc23f4501ba99035283d3407ddad2b21b785.zip opensim-SC_OLD-f1f0bc23f4501ba99035283d3407ddad2b21b785.tar.gz opensim-SC_OLD-f1f0bc23f4501ba99035283d3407ddad2b21b785.tar.bz2 opensim-SC_OLD-f1f0bc23f4501ba99035283d3407ddad2b21b785.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 46b84bb..f8877e4 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -1916,7 +1916,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
1916 | sceneObject.ScheduleGroupForFullUpdate(); | 1916 | sceneObject.ScheduleGroupForFullUpdate(); |
1917 | 1917 | ||
1918 | return sceneObject; | 1918 | return sceneObject; |
1919 | } | 1919 | } |
1920 | 1920 | ||
1921 | /// <summary> | 1921 | /// <summary> |
1922 | /// Add an object into the scene that has come from storage | 1922 | /// Add an object into the scene that has come from storage |
@@ -2009,7 +2009,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2009 | /// <returns></returns> | 2009 | /// <returns></returns> |
2010 | public bool AddNewSceneObject( | 2010 | public bool AddNewSceneObject( |
2011 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) | 2011 | SceneObjectGroup sceneObject, bool attachToBackup, Vector3 pos, Quaternion rot, Vector3 vel) |
2012 | { | 2012 | { |
2013 | return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel); | 2013 | return m_sceneGraph.AddNewSceneObject(sceneObject, attachToBackup, pos, rot, vel); |
2014 | } | 2014 | } |
2015 | 2015 | ||
@@ -2102,12 +2102,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2102 | // group has recently been delinked from another group but that this change has not been persisted | 2102 | // group has recently been delinked from another group but that this change has not been persisted |
2103 | // to the DB. | 2103 | // to the DB. |
2104 | ForceSceneObjectBackup(so); | 2104 | ForceSceneObjectBackup(so); |
2105 | so.DetachFromBackup(); | 2105 | so.DetachFromBackup(); |
2106 | m_storageManager.DataStore.RemoveObject(so.UUID, m_regInfo.RegionID); | 2106 | m_storageManager.DataStore.RemoveObject(so.UUID, m_regInfo.RegionID); |
2107 | } | 2107 | } |
2108 | 2108 | ||
2109 | // We need to keep track of this state in case this group is still queued for further backup. | 2109 | // We need to keep track of this state in case this group is still queued for further backup. |
2110 | so.IsDeleted = true; | 2110 | so.IsDeleted = true; |
2111 | 2111 | ||
2112 | return true; | 2112 | return true; |
2113 | } | 2113 | } |
@@ -2394,7 +2394,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2394 | ScenePresence sp = GetScenePresence(userID); | 2394 | ScenePresence sp = GetScenePresence(userID); |
2395 | if (sp != null && AttachmentsModule != null) | 2395 | if (sp != null && AttachmentsModule != null) |
2396 | { | 2396 | { |
2397 | uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID); | 2397 | uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID); |
2398 | AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt); | 2398 | AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt); |
2399 | } | 2399 | } |
2400 | 2400 | ||
@@ -2437,7 +2437,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2437 | sceneObject.RootPart.AddFlag(PrimFlags.Phantom); | 2437 | sceneObject.RootPart.AddFlag(PrimFlags.Phantom); |
2438 | 2438 | ||
2439 | // Don't sent a full update here because this will cause full updates to be sent twice for | 2439 | // Don't sent a full update here because this will cause full updates to be sent twice for |
2440 | // attachments on region crossings, resulting in viewer glitches. | 2440 | // attachments on region crossings, resulting in viewer glitches. |
2441 | AddRestoredSceneObject(sceneObject, false, false, false); | 2441 | AddRestoredSceneObject(sceneObject, false, false, false); |
2442 | 2442 | ||
2443 | // Handle attachment special case | 2443 | // Handle attachment special case |
@@ -2681,7 +2681,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2681 | } | 2681 | } |
2682 | 2682 | ||
2683 | public virtual void SubscribeToClientPrimEvents(IClientAPI client) | 2683 | public virtual void SubscribeToClientPrimEvents(IClientAPI client) |
2684 | { | 2684 | { |
2685 | client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition; | 2685 | client.OnUpdatePrimGroupPosition += m_sceneGraph.UpdatePrimPosition; |
2686 | client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; | 2686 | client.OnUpdatePrimSinglePosition += m_sceneGraph.UpdatePrimSinglePosition; |
2687 | client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimRotation; | 2687 | client.OnUpdatePrimGroupRotation += m_sceneGraph.UpdatePrimRotation; |
@@ -2717,7 +2717,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2717 | client.OnUndo += m_sceneGraph.HandleUndo; | 2717 | client.OnUndo += m_sceneGraph.HandleUndo; |
2718 | client.OnRedo += m_sceneGraph.HandleRedo; | 2718 | client.OnRedo += m_sceneGraph.HandleRedo; |
2719 | client.OnObjectDescription += m_sceneGraph.PrimDescription; | 2719 | client.OnObjectDescription += m_sceneGraph.PrimDescription; |
2720 | client.OnObjectDrop += m_sceneGraph.DropObject; | 2720 | client.OnObjectDrop += m_sceneGraph.DropObject; |
2721 | client.OnObjectIncludeInSearch += m_sceneGraph.MakeObjectSearchable; | 2721 | client.OnObjectIncludeInSearch += m_sceneGraph.MakeObjectSearchable; |
2722 | client.OnObjectOwner += ObjectOwner; | 2722 | client.OnObjectOwner += ObjectOwner; |
2723 | } | 2723 | } |
@@ -3669,7 +3669,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
3669 | public virtual void AgentCrossing(UUID agentID, Vector3 position, bool isFlying) | 3669 | public virtual void AgentCrossing(UUID agentID, Vector3 position, bool isFlying) |
3670 | { | 3670 | { |
3671 | ScenePresence presence = GetScenePresence(agentID); | 3671 | ScenePresence presence = GetScenePresence(agentID); |
3672 | if(presence != null) | 3672 | if (presence != null) |
3673 | { | 3673 | { |
3674 | try | 3674 | try |
3675 | { | 3675 | { |