From a595881dc06c8359faa731a0af2d8be7290daad1 Mon Sep 17 00:00:00 2001
From: MW
Date: Mon, 30 Apr 2007 15:38:51 +0000
Subject: fixed the VS 2005 solution/ project files. and a couple of other
 small changes

---
 OpenSim.RegionServer/AgentAssetUpload.cs |  2 +-
 OpenSim.RegionServer/world/Avatar.cs     |  7 +++----
 OpenSim.RegionServer/world/Primitive2.cs | 34 ++++++++++++++++++++++++++++++++
 OpenSim.RegionServer/world/World.cs      |  2 +-
 4 files changed, 39 insertions(+), 6 deletions(-)

(limited to 'OpenSim.RegionServer')

diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
index 071ea63..cdf49c5 100644
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ b/OpenSim.RegionServer/AgentAssetUpload.cs
@@ -70,7 +70,7 @@ namespace OpenSim
 
         public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
         {
-            Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
+           // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
             AssetBase asset = null;
             if (pack.AssetBlock.Type == 0)
             {
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
index 4f13a4a..97ed78d 100644
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ b/OpenSim.RegionServer/world/Avatar.cs
@@ -102,7 +102,7 @@ namespace OpenSim.world
 
         public static void SetupTemplate(string name)
         {
-           /*int i = 0;
+           int i = 0;
             FileInfo fInfo = new FileInfo(name);
             long numBytes = fInfo.Length;
             FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
@@ -110,12 +110,11 @@ namespace OpenSim.world
             byte[] data1 = br.ReadBytes((int)numBytes);
             br.Close();
             fStream.Close();
-            * */
-
+           
             libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); //  new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
 
             SetDefaultPacketValues(objdata);
-            //objdata.ObjectData = data1;
+            objdata.TextureEntry = data1;
             objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
             objdata.PathCurve = 16;
             objdata.ProfileCurve = 1;
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
index 24fc6da..c0d6295 100644
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ b/OpenSim.RegionServer/world/Primitive2.cs
@@ -145,6 +145,35 @@ namespace OpenSim.world
 
         }
 
+        public void GetProperites(SimClient client)
+        {
+            ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
+            proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
+            proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
+            proper.ObjectData[0].ItemID = LLUUID.Zero;
+            proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate;
+            proper.ObjectData[0].CreatorID = this.primData.OwnerID;
+            proper.ObjectData[0].FolderID = LLUUID.Zero;
+            proper.ObjectData[0].FromTaskID = LLUUID.Zero;
+            proper.ObjectData[0].GroupID = LLUUID.Zero;
+            proper.ObjectData[0].InventorySerial = 0;
+            proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
+            proper.ObjectData[0].ObjectID = this.uuid;
+            proper.ObjectData[0].OwnerID = primData.OwnerID;
+            proper.ObjectData[0].TouchName = new byte[0];
+            proper.ObjectData[0].TextureID = new byte[0];
+            proper.ObjectData[0].SitName = new byte[0];
+            proper.ObjectData[0].Name = new byte[0];
+            proper.ObjectData[0].Description = new byte[0];
+            proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
+            proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
+            proper.ObjectData[0].GroupMask = this.primData.GroupMask;
+            proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
+            proper.ObjectData[0].BaseMask = this.primData.BaseMask;
+
+            client.OutPacket(proper);
+        }
+
         #endregion
 
         # region Inventory Methods
@@ -291,6 +320,11 @@ namespace OpenSim.world
 
         public void CreateFromPrimData(PrimData primData)
         {
+            this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
+        }
+
+        public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
+        {
 
         }
 
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
index 5443d38..0ae4ae2 100644
--- a/OpenSim.RegionServer/world/World.cs
+++ b/OpenSim.RegionServer/world/World.cs
@@ -72,7 +72,7 @@ namespace OpenSim.world
                 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap");
                 TerrainManager = new TerrainManager(new SecondLife());
                 Terrain = new TerrainEngine();
-                Avatar.SetupTemplate("avatar-template2.dat");
+                Avatar.SetupTemplate("avatar-texture.dat");
                 //	MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
                 // Initialise this only after the world has loaded
                 //	Scripts = new ScriptEngine(this);
-- 
cgit v1.1