aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
diff options
context:
space:
mode:
authorMW2007-08-19 13:35:20 +0000
committerMW2007-08-19 13:35:20 +0000
commitc89db49f3cd3bbd60577eb5a1787ccf8dea930e3 (patch)
tree2b51b0d261724427933f543dd2f39ef8cd21127f /OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
parentCode comments on recent changes in EventQueueManager (diff)
downloadopensim-SC-c89db49f3cd3bbd60577eb5a1787ccf8dea930e3.zip
opensim-SC-c89db49f3cd3bbd60577eb5a1787ccf8dea930e3.tar.gz
opensim-SC-c89db49f3cd3bbd60577eb5a1787ccf8dea930e3.tar.bz2
opensim-SC-c89db49f3cd3bbd60577eb5a1787ccf8dea930e3.tar.xz
Sqlite datastore should now save the textures and extraparams data (used by sculpties) correctly. [Really need to add a ExtraParams field to the sqlite database though, but for now I have combined their data so that we don't lose backward compatibility, know a couple of people have been using the datastore already].
Now have a rough day/night cycle (the movement of the sun needs to be made smoother but for now it is better than we had I think). Added dalien's patch (issue 294) for saving and loading prims to a xml file (think he will be modifying these to be import/export functions and maybe writing a xml datastore for backups). Some preliminary work on task inventory (ie object's/prim's inventory). Added place holder data for AvatarProperties (ie a avatar's profile). Should we store this sort of data on the user server or have another server for it (a normal webserver should work). Added a few more method to IClientAPI. Sure there is something I'm forgeting.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs24
1 files changed, 17 insertions, 7 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 421a981..1e6cd8f 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -212,7 +212,6 @@ namespace OpenSim.Region.Environment.Scenes
212 public string ToXmlString() 212 public string ToXmlString()
213 { 213 {
214 StringWriter sw = new StringWriter(); 214 StringWriter sw = new StringWriter();
215 //StreamWriter st = new StreamWriter("testxml.txt");
216 XmlTextWriter writer = new XmlTextWriter(sw); 215 XmlTextWriter writer = new XmlTextWriter(sw);
217 writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty); 216 writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
218 writer.WriteStartElement(String.Empty, "RootPart", String.Empty); 217 writer.WriteStartElement(String.Empty, "RootPart", String.Empty);
@@ -231,11 +230,7 @@ namespace OpenSim.Region.Environment.Scenes
231 writer.WriteEndElement(); 230 writer.WriteEndElement();
232 writer.WriteEndElement(); 231 writer.WriteEndElement();
233 writer.Close(); 232 writer.Close();
234 // System.Console.WriteLine("prim: " + sw.ToString());
235 return sw.ToString(); 233 return sw.ToString();
236 // st.Close();
237 // return "";
238
239 } 234 }
240 235
241 #region Copying 236 #region Copying
@@ -557,12 +552,26 @@ namespace OpenSim.Region.Environment.Scenes
557 /// </summary> 552 /// </summary>
558 /// <param name="remoteClient"></param> 553 /// <param name="remoteClient"></param>
559 /// <param name="localID"></param> 554 /// <param name="localID"></param>
560 public void GetPartInventory(IClientAPI remoteClient, uint localID) 555 public void GetPartInventoryFileName(IClientAPI remoteClient, uint localID)
561 { 556 {
562 SceneObjectPart part = this.GetChildPrim(localID); 557 SceneObjectPart part = this.GetChildPrim(localID);
563 if (part != null) 558 if (part != null)
564 { 559 {
565 part.GetInventory(remoteClient, localID); 560 part.GetInventoryFileName(remoteClient, localID);
561 }
562 }
563
564 /// <summary>
565 ///
566 /// </summary>
567 /// <param name="remoteClient"></param>
568 /// <param name="partID"></param>
569 public void RequestInventoryFile(IClientAPI remoteClient, uint localID, ulong xferID)
570 {
571 SceneObjectPart part = this.GetChildPrim(localID);
572 if (part != null)
573 {
574 part.RequestInventoryFile(remoteClient, xferID);
566 } 575 }
567 } 576 }
568 577
@@ -636,6 +645,7 @@ namespace OpenSim.Region.Environment.Scenes
636 public void UpdateGroupPosition(LLVector3 pos) 645 public void UpdateGroupPosition(LLVector3 pos)
637 { 646 {
638 this.AbsolutePosition = pos; 647 this.AbsolutePosition = pos;
648
639 } 649 }
640 650
641 /// <summary> 651 /// <summary>