diff options
-rw-r--r-- | OpenSim/Region/Application/HGOpenSimNode.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Application/HGOpenSimNode.cs b/OpenSim/Region/Application/HGOpenSimNode.cs index 6f6d6cb..03e22ca 100644 --- a/OpenSim/Region/Application/HGOpenSimNode.cs +++ b/OpenSim/Region/Application/HGOpenSimNode.cs | |||
@@ -244,6 +244,7 @@ namespace OpenSim | |||
244 | } | 244 | } |
245 | } | 245 | } |
246 | 246 | ||
247 | /* | ||
247 | private void LoadXmlLinkFile(string[] cmdparams) | 248 | private void LoadXmlLinkFile(string[] cmdparams) |
248 | { | 249 | { |
249 | try | 250 | try |
@@ -289,6 +290,7 @@ namespace OpenSim | |||
289 | Console.WriteLine(e.ToString()); | 290 | Console.WriteLine(e.ToString()); |
290 | } | 291 | } |
291 | } | 292 | } |
293 | */ | ||
292 | 294 | ||
293 | private void ReadLinkFromConfig(IConfig config) | 295 | private void ReadLinkFromConfig(IConfig config) |
294 | { | 296 | { |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index fd979a3..18245e5 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2224,10 +2224,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
2224 | // | 2224 | // |
2225 | ScenePresence sp = GetScenePresence(sceneObject.OwnerID); | 2225 | ScenePresence sp = GetScenePresence(sceneObject.OwnerID); |
2226 | 2226 | ||
2227 | uint parentLocalID = 0; | 2227 | //uint parentLocalID = 0; |
2228 | if (sp != null) | 2228 | if (sp != null) |
2229 | { | 2229 | { |
2230 | parentLocalID = sp.LocalId; | 2230 | //parentLocalID = sp.LocalId; |
2231 | 2231 | ||
2232 | //sceneObject.RootPart.IsAttachment = true; | 2232 | //sceneObject.RootPart.IsAttachment = true; |
2233 | //sceneObject.RootPart.SetParentLocalId(parentLocalID); | 2233 | //sceneObject.RootPart.SetParentLocalId(parentLocalID); |
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs index 997cce5..4b165ce 100644 --- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs +++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||
@@ -726,7 +726,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
726 | public void ToXml(XmlTextWriter writer) | 726 | public void ToXml(XmlTextWriter writer) |
727 | { | 727 | { |
728 | //m_log.DebugFormat("[SOG]: Starting serialization of {0}", Name); | 728 | //m_log.DebugFormat("[SOG]: Starting serialization of {0}", Name); |
729 | int time = System.Environment.TickCount; | 729 | //int time = System.Environment.TickCount; |
730 | 730 | ||
731 | writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); | 731 | writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); |
732 | writer.WriteStartElement(String.Empty, "RootPart", String.Empty); | 732 | writer.WriteStartElement(String.Empty, "RootPart", String.Empty); |