OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* refactor: Remove redundent prim id attribute on Scene.AddSceneObject()

0.6.6-post-fixes
Justin Clarke Casey 2009-05-29 21:01:18 +00:00
parent 6eb191c87b
commit 4aad6a07ff
3 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Communications/Services/LoginService.cs
View File

@ -92,7 +92,6 @@ namespace OpenSim.Framework.Communications.Services
{ {
} }
/// <summary> /// <summary>
/// Called when we receive the client's initial XMLRPC login_to_simulator request message /// Called when we receive the client's initial XMLRPC login_to_simulator request message
/// </summary> /// </summary>

2
OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs
View File

@ -172,7 +172,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests
SceneObjectGroup so = new SceneObjectGroup(rp); SceneObjectGroup so = new SceneObjectGroup(rp);
// Need to add the object to the scene so that the request to get script state succeeds // 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); string xml2 = m_serialiserModule.SaveGroupToXml2(so);

11
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -1663,14 +1663,12 @@ namespace OpenSim.Region.Framework.Scenes
/// <returns></returns> /// <returns></returns>
public bool IncomingInterRegionPrimGroup(UUID primID, string objXMLData, int XMLMethod) public bool IncomingInterRegionPrimGroup(UUID primID, string objXMLData, int XMLMethod)
{ {
if (XMLMethod == 0) if (XMLMethod == 0)
{ {
m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID); m_log.DebugFormat("[INTERREGION]: A new prim {0} arrived from a neighbor", primID);
SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData); SceneObjectGroup sceneObject = m_serialiser.DeserializeGroupFromXml2(objXMLData);
return AddSceneObject(primID, sceneObject); return AddSceneObject(sceneObject);
} }
else if ((XMLMethod == 100) && m_allowScriptCrossings) else if ((XMLMethod == 100) && m_allowScriptCrossings)
{ {
@ -1763,7 +1761,7 @@ namespace OpenSim.Region.Framework.Scenes
return false; 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); m_log.DebugFormat("[SCENE]: Problem adding scene object {0} in {1} ", sog.UUID, RegionInfo.RegionName);
return false; return false;
@ -1784,7 +1782,7 @@ namespace OpenSim.Region.Framework.Scenes
return false; 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 // If the user is banned, we won't let any of their objects
// enter. Period. // enter. Period.
@ -1810,12 +1808,9 @@ namespace OpenSim.Region.Framework.Scenes
AddRestoredSceneObject(sceneObject, false, false); AddRestoredSceneObject(sceneObject, false, false);
// Handle attachment special case // Handle attachment special case
//
//SceneObjectPart RootPrim = GetSceneObjectPart(primID);
SceneObjectPart RootPrim = sceneObject.RootPart; SceneObjectPart RootPrim = sceneObject.RootPart;
// Fix up attachment Parent Local ID // Fix up attachment Parent Local ID
//
ScenePresence sp = GetScenePresence(sceneObject.OwnerID); ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
//uint parentLocalID = 0; //uint parentLocalID = 0;