aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorMW2007-04-30 15:38:51 +0000
committerMW2007-04-30 15:38:51 +0000
commita595881dc06c8359faa731a0af2d8be7290daad1 (patch)
tree3ce516a66b07b4695d9861f52ed91485cd14c2a0 /OpenSim.RegionServer
parentAnd it's fixed (diff)
downloadopensim-SC_OLD-a595881dc06c8359faa731a0af2d8be7290daad1.zip
opensim-SC_OLD-a595881dc06c8359faa731a0af2d8be7290daad1.tar.gz
opensim-SC_OLD-a595881dc06c8359faa731a0af2d8be7290daad1.tar.bz2
opensim-SC_OLD-a595881dc06c8359faa731a0af2d8be7290daad1.tar.xz
fixed the VS 2005 solution/ project files.
and a couple of other small changes
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r--OpenSim.RegionServer/AgentAssetUpload.cs2
-rw-r--r--OpenSim.RegionServer/world/Avatar.cs7
-rw-r--r--OpenSim.RegionServer/world/Primitive2.cs34
-rw-r--r--OpenSim.RegionServer/world/World.cs2
4 files changed, 39 insertions, 6 deletions
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
70 70
71 public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID) 71 public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
72 { 72 {
73 Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString()); 73 // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
74 AssetBase asset = null; 74 AssetBase asset = null;
75 if (pack.AssetBlock.Type == 0) 75 if (pack.AssetBlock.Type == 0)
76 { 76 {
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
102 102
103 public static void SetupTemplate(string name) 103 public static void SetupTemplate(string name)
104 { 104 {
105 /*int i = 0; 105 int i = 0;
106 FileInfo fInfo = new FileInfo(name); 106 FileInfo fInfo = new FileInfo(name);
107 long numBytes = fInfo.Length; 107 long numBytes = fInfo.Length;
108 FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read); 108 FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
@@ -110,12 +110,11 @@ namespace OpenSim.world
110 byte[] data1 = br.ReadBytes((int)numBytes); 110 byte[] data1 = br.ReadBytes((int)numBytes);
111 br.Close(); 111 br.Close();
112 fStream.Close(); 112 fStream.Close();
113 * */ 113
114
115 libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i); 114 libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
116 115
117 SetDefaultPacketValues(objdata); 116 SetDefaultPacketValues(objdata);
118 //objdata.ObjectData = data1; 117 objdata.TextureEntry = data1;
119 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24); 118 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
120 objdata.PathCurve = 16; 119 objdata.PathCurve = 16;
121 objdata.ProfileCurve = 1; 120 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
145 145
146 } 146 }
147 147
148 public void GetProperites(SimClient client)
149 {
150 ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
151 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
152 proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
153 proper.ObjectData[0].ItemID = LLUUID.Zero;
154 proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate;
155 proper.ObjectData[0].CreatorID = this.primData.OwnerID;
156 proper.ObjectData[0].FolderID = LLUUID.Zero;
157 proper.ObjectData[0].FromTaskID = LLUUID.Zero;
158 proper.ObjectData[0].GroupID = LLUUID.Zero;
159 proper.ObjectData[0].InventorySerial = 0;
160 proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
161 proper.ObjectData[0].ObjectID = this.uuid;
162 proper.ObjectData[0].OwnerID = primData.OwnerID;
163 proper.ObjectData[0].TouchName = new byte[0];
164 proper.ObjectData[0].TextureID = new byte[0];
165 proper.ObjectData[0].SitName = new byte[0];
166 proper.ObjectData[0].Name = new byte[0];
167 proper.ObjectData[0].Description = new byte[0];
168 proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
169 proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
170 proper.ObjectData[0].GroupMask = this.primData.GroupMask;
171 proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
172 proper.ObjectData[0].BaseMask = this.primData.BaseMask;
173
174 client.OutPacket(proper);
175 }
176
148 #endregion 177 #endregion
149 178
150 # region Inventory Methods 179 # region Inventory Methods
@@ -291,6 +320,11 @@ namespace OpenSim.world
291 320
292 public void CreateFromPrimData(PrimData primData) 321 public void CreateFromPrimData(PrimData primData)
293 { 322 {
323 this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
324 }
325
326 public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
327 {
294 328
295 } 329 }
296 330
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
72 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap"); 72 OpenSim.Framework.Console.MainConsole.Instance.WriteLine("World.cs - creating LandMap");
73 TerrainManager = new TerrainManager(new SecondLife()); 73 TerrainManager = new TerrainManager(new SecondLife());
74 Terrain = new TerrainEngine(); 74 Terrain = new TerrainEngine();
75 Avatar.SetupTemplate("avatar-template2.dat"); 75 Avatar.SetupTemplate("avatar-texture.dat");
76 // MainConsole.Instance.WriteLine("World.cs - Creating script engine instance"); 76 // MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
77 // Initialise this only after the world has loaded 77 // Initialise this only after the world has loaded
78 // Scripts = new ScriptEngine(this); 78 // Scripts = new ScriptEngine(this);