From 4aad6a07ffbf1190836940b14476f24b7e8cecb1 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Fri, 29 May 2009 21:01:18 +0000
Subject: * refactor: Remove redundent prim id attribute on
 Scene.AddSceneObject()

---
 OpenSim/Framework/Communications/Services/LoginService.cs     |  3 +--
 .../CoreModules/World/Serialiser/Tests/SerialiserTests.cs     |  2 +-
 OpenSim/Region/Framework/Scenes/Scene.cs                      | 11 +++--------
 3 files changed, 5 insertions(+), 11 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/Communications/Services/LoginService.cs b/OpenSim/Framework/Communications/Services/LoginService.cs
index 68a1819..2847887 100644
--- a/OpenSim/Framework/Communications/Services/LoginService.cs
+++ b/OpenSim/Framework/Communications/Services/LoginService.cs
@@ -91,8 +91,7 @@ namespace OpenSim.Framework.Communications.Services
         public virtual void LogOffUser(UserProfileData theUser, string message)
         {
         }
-
-
+        
         /// <summary>
         /// Called when we receive the client's initial XMLRPC login_to_simulator request message
         /// </summary>
diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
index 1c7cd7e..60387c6 100644
--- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
+++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
@@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
             SceneObjectGroup so = new SceneObjectGroup(rp);
 
             // Need to add the object to the scene so that the request to get script state succeeds
-            m_scene.AddSceneObject(UUID.Zero, so);
+            m_scene.AddSceneObject(so);
 
             string xml2 = m_serialiserModule.SaveGroupToXml2(so);
 
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 28d5bad..842bf1e 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1663,14 +1663,12 @@ namespace OpenSim.Region.Framework.Scenes
         /// <returns></returns>
         public bool IncomingInterRegionPrimGroup(UUID primID, string objXMLData, int XMLMethod)
         {
-
             if (XMLMethod == 0)
             {
                 m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID);
                 SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData);
 
-                return AddSceneObject(primID, sceneObject);
-
+                return AddSceneObject(sceneObject);
             }
             else if ((XMLMethod == 100) && m_allowScriptCrossings)
             {
@@ -1763,7 +1761,7 @@ namespace OpenSim.Region.Framework.Scenes
                 return false;
             }
 
-            if (!AddSceneObject(newObject.UUID, newObject))
+            if (!AddSceneObject(newObject))
             {
                 m_log.DebugFormat("[SCENE]: Problem adding scene object {0} in {1} ", sog.UUID, RegionInfo.RegionName);
                 return false;
@@ -1784,7 +1782,7 @@ namespace OpenSim.Region.Framework.Scenes
             return false;
         }
 
-        public bool AddSceneObject(UUID primID, SceneObjectGroup sceneObject)
+        public bool AddSceneObject(SceneObjectGroup sceneObject)
         {
             // If the user is banned, we won't let any of their objects
             // enter. Period.
@@ -1810,12 +1808,9 @@ namespace OpenSim.Region.Framework.Scenes
                     AddRestoredSceneObject(sceneObject, false, false);
 
                     // Handle attachment special case
-                    //
-                    //SceneObjectPart RootPrim = GetSceneObjectPart(primID);
                     SceneObjectPart RootPrim = sceneObject.RootPart;
 
                     // Fix up attachment Parent Local ID
-                    //
                     ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
 
                     //uint parentLocalID = 0;
-- 
cgit v1.1