aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObject.cs
diff options
context:
space:
mode:
authorMW2007-08-01 16:50:20 +0000
committerMW2007-08-01 16:50:20 +0000
commitedc572dacf3ff65c5584f8c02bb291abce0c7122 (patch)
tree0e1c8802d3bb8406883d01a1648b20d36215ec4e /OpenSim/Region/Environment/Scenes/SceneObject.cs
parentremove Adam's work around, this shouldn't be needed any more (diff)
downloadopensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.zip
opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.gz
opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.bz2
opensim-SC-edc572dacf3ff65c5584f8c02bb291abce0c7122.tar.xz
Some more work on SceneObject/primitive rewrites (AllNewSceneObjectGroup2 /Part2).
Updated the JavaVM to a later version I did (basically some clean up and a little bit more functional). Added SendLoadURL method to IClientAPI.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObject.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObject.cs12
1 files changed, 11 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObject.cs b/OpenSim/Region/Environment/Scenes/SceneObject.cs
index 03a7f55..2fae556 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObject.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObject.cs
@@ -27,6 +27,9 @@
27*/ 27*/
28using System.Collections.Generic; 28using System.Collections.Generic;
29using System.Text; 29using System.Text;
30using System.IO;
31using System.Xml;
32using System.Xml.Serialization;
30using libsecondlife; 33using libsecondlife;
31using libsecondlife.Packets; 34using libsecondlife.Packets;
32using OpenSim.Framework.Interfaces; 35using OpenSim.Framework.Interfaces;
@@ -93,7 +96,6 @@ namespace OpenSim.Region.Environment.Scenes
93 this.CreateRootFromShape(ownerID, localID, shape, pos); 96 this.CreateRootFromShape(ownerID, localID, shape, pos);
94 97
95 registerEvents(); 98 registerEvents();
96
97 } 99 }
98 100
99 /// <summary> 101 /// <summary>
@@ -185,6 +187,14 @@ namespace OpenSim.Region.Environment.Scenes
185 /// <summary> 187 /// <summary>
186 /// 188 ///
187 /// </summary> 189 /// </summary>
190 public void Serialise()
191 {
192
193 }
194
195 /// <summary>
196 ///
197 /// </summary>
188 public void DeleteAllChildren() 198 public void DeleteAllChildren()
189 { 199 {
190 this.m_children.Clear(); 200 this.m_children.Clear();