From c89db49f3cd3bbd60577eb5a1787ccf8dea930e3 Mon Sep 17 00:00:00 2001
From: MW
Date: Sun, 19 Aug 2007 13:35:20 +0000
Subject: 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.

---
 .../Region/Environment/Scenes/SceneObjectGroup.cs  | 24 +++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs')

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
         public string ToXmlString()
         {
             StringWriter sw = new StringWriter();
-            //StreamWriter st = new StreamWriter("testxml.txt");
             XmlTextWriter writer = new XmlTextWriter(sw);
             writer.WriteStartElement(String.Empty, "SceneObjectGroup", String.Empty);
             writer.WriteStartElement(String.Empty, "RootPart", String.Empty);
@@ -231,11 +230,7 @@ namespace OpenSim.Region.Environment.Scenes
             writer.WriteEndElement();
             writer.WriteEndElement();
             writer.Close();
-            // System.Console.WriteLine("prim: " + sw.ToString());
             return sw.ToString();
-            //  st.Close();
-            //   return "";
-
         }
 
         #region Copying
@@ -557,12 +552,26 @@ namespace OpenSim.Region.Environment.Scenes
         /// </summary>
         /// <param name="remoteClient"></param>
         /// <param name="localID"></param>
-        public void GetPartInventory(IClientAPI remoteClient, uint localID)
+        public void GetPartInventoryFileName(IClientAPI remoteClient, uint localID)
         {
             SceneObjectPart part = this.GetChildPrim(localID);
             if (part != null)
             {
-                part.GetInventory(remoteClient, localID);
+                part.GetInventoryFileName(remoteClient, localID);
+            }
+        }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="partID"></param>
+        public void RequestInventoryFile(IClientAPI remoteClient, uint localID, ulong xferID)
+        {
+            SceneObjectPart part = this.GetChildPrim(localID);
+            if (part != null)
+            {
+                part.RequestInventoryFile(remoteClient, xferID);
             }
         }
 
@@ -636,6 +645,7 @@ namespace OpenSim.Region.Environment.Scenes
         public void UpdateGroupPosition(LLVector3 pos)
         {
             this.AbsolutePosition = pos;
+
         }
 
         /// <summary>
-- 
cgit v1.1