aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim.RegionServer
diff options
context:
space:
mode:
authorMW2007-05-24 12:16:50 +0000
committerMW2007-05-24 12:16:50 +0000
commit3376b82501000692d6dac24b051af738cdaf2737 (patch)
tree90ed0a5d4955236f011fa63fce9d555186b0d179 /OpenSim.RegionServer
parentAdded "terrain save grdmap <filename> <gradientmap>" function to console. Gra... (diff)
downloadopensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.zip
opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.gz
opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.bz2
opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.xz
Some more code refactoring, plus a restructuring of the directories so that the Grid servers can be a separate solution to the region server.
Diffstat (limited to 'OpenSim.RegionServer')
-rw-r--r--OpenSim.RegionServer/AgentAssetUpload.cs232
-rw-r--r--OpenSim.RegionServer/Assets/AssetCache.cs574
-rw-r--r--OpenSim.RegionServer/Assets/InventoryCache.cs336
-rw-r--r--OpenSim.RegionServer/AuthenticateSessionsBase.cs105
-rw-r--r--OpenSim.RegionServer/AuthenticateSessionsLocal.cs31
-rw-r--r--OpenSim.RegionServer/AuthenticateSessionsRemote.cs46
-rw-r--r--OpenSim.RegionServer/CAPS/AdminWebFront.cs256
-rw-r--r--OpenSim.RegionServer/ClientView.Grid.cs164
-rw-r--r--OpenSim.RegionServer/ClientView.PacketHandlers.cs184
-rw-r--r--OpenSim.RegionServer/ClientView.ProcessPackets.cs471
-rw-r--r--OpenSim.RegionServer/ClientView.cs440
-rw-r--r--OpenSim.RegionServer/ClientViewBase.cs299
-rw-r--r--OpenSim.RegionServer/Grid.cs90
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.csproj258
-rw-r--r--OpenSim.RegionServer/OpenSim.RegionServer.dll.build90
-rw-r--r--OpenSim.RegionServer/OpenSimMain.cs531
-rw-r--r--OpenSim.RegionServer/OpenSimNetworkHandler.cs18
-rw-r--r--OpenSim.RegionServer/PacketServer.cs89
-rw-r--r--OpenSim.RegionServer/RegionInfo.cs261
-rw-r--r--OpenSim.RegionServer/RegionInfoBase.cs32
-rw-r--r--OpenSim.RegionServer/RegionServerBase.cs103
-rw-r--r--OpenSim.RegionServer/UDPServer.cs205
-rw-r--r--OpenSim.RegionServer/VersionInfo.cs37
-rw-r--r--OpenSim.RegionServer/types/Mesh.cs28
-rw-r--r--OpenSim.RegionServer/types/Triangle.cs28
-rw-r--r--OpenSim.RegionServer/world/Avatar.Client.cs33
-rw-r--r--OpenSim.RegionServer/world/Avatar.Update.cs317
-rw-r--r--OpenSim.RegionServer/world/Avatar.cs417
-rw-r--r--OpenSim.RegionServer/world/AvatarAnimations.cs163
-rw-r--r--OpenSim.RegionServer/world/Entity.cs124
-rw-r--r--OpenSim.RegionServer/world/Primitive.cs570
-rw-r--r--OpenSim.RegionServer/world/Primitive2.cs491
-rw-r--r--OpenSim.RegionServer/world/SceneObject.cs77
-rw-r--r--OpenSim.RegionServer/world/World.PacketHandlers.cs257
-rw-r--r--OpenSim.RegionServer/world/World.Scripting.cs124
-rw-r--r--OpenSim.RegionServer/world/World.cs646
-rw-r--r--OpenSim.RegionServer/world/WorldBase.cs176
-rw-r--r--OpenSim.RegionServer/world/scripting/IScriptContext.cs13
-rw-r--r--OpenSim.RegionServer/world/scripting/IScriptEntity.cs19
-rw-r--r--OpenSim.RegionServer/world/scripting/IScriptHandler.cs98
-rw-r--r--OpenSim.RegionServer/world/scripting/Script.cs26
-rw-r--r--OpenSim.RegionServer/world/scripting/ScriptFactory.cs8
-rw-r--r--OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs37
43 files changed, 0 insertions, 8504 deletions
diff --git a/OpenSim.RegionServer/AgentAssetUpload.cs b/OpenSim.RegionServer/AgentAssetUpload.cs
deleted file mode 100644
index dd2b2a9..0000000
--- a/OpenSim.RegionServer/AgentAssetUpload.cs
+++ /dev/null
@@ -1,232 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Assets;
5using OpenSim.Framework.Types;
6using OpenSim.Framework.Utilities;
7using libsecondlife;
8using libsecondlife.Packets;
9
10namespace OpenSim
11{
12 public class AgentAssetUpload
13 {
14 private Dictionary<LLUUID, AssetTransaction> transactions = new Dictionary<LLUUID, AssetTransaction>();
15 private ClientView ourClient;
16 private AssetCache m_assetCache;
17 private InventoryCache m_inventoryCache;
18
19 public AgentAssetUpload(ClientView client, AssetCache assetCache, InventoryCache inventoryCache)
20 {
21 this.ourClient = client;
22 m_assetCache = assetCache;
23 m_inventoryCache = inventoryCache;
24 }
25
26 public void AddUpload(LLUUID transactionID, AssetBase asset)
27 {
28 AssetTransaction upload = new AssetTransaction();
29 lock (this.transactions)
30 {
31 upload.Asset = asset;
32 upload.TransactionID = transactionID;
33 this.transactions.Add(transactionID, upload);
34 }
35 if (upload.Asset.Data.Length > 2)
36 {
37 //is complete
38 upload.UploadComplete = true;
39 AssetUploadCompletePacket response = new AssetUploadCompletePacket();
40 response.AssetBlock.Type = asset.Type;
41 response.AssetBlock.Success = true;
42 response.AssetBlock.UUID = transactionID.Combine(this.ourClient.SecureSessionID);
43 this.ourClient.OutPacket(response);
44 m_assetCache.AddAsset(asset);
45 }
46 else
47 {
48 upload.UploadComplete = false;
49 upload.XferID = Util.GetNextXferID();
50 RequestXferPacket xfer = new RequestXferPacket();
51 xfer.XferID.ID = upload.XferID;
52 xfer.XferID.VFileType = upload.Asset.Type;
53 xfer.XferID.VFileID = transactionID.Combine(this.ourClient.SecureSessionID);
54 xfer.XferID.FilePath = 0;
55 xfer.XferID.Filename = new byte[0];
56 this.ourClient.OutPacket(xfer);
57 }
58
59 }
60
61 public AssetBase GetUpload(LLUUID transactionID)
62 {
63 if (this.transactions.ContainsKey(transactionID))
64 {
65 return this.transactions[transactionID].Asset;
66 }
67
68 return null;
69 }
70
71 public void HandleUploadPacket(AssetUploadRequestPacket pack, LLUUID assetID)
72 {
73 // Console.Write("asset upload request , type = " + pack.AssetBlock.Type.ToString());
74 AssetBase asset = null;
75 if (pack.AssetBlock.Type == 0)
76 {
77
78 //first packet for transaction
79 asset = new AssetBase();
80 asset.FullID = assetID;
81 asset.Type = pack.AssetBlock.Type;
82 asset.InvType = asset.Type;
83 asset.Name = "UploadedTexture" + Util.RandomClass.Next(1, 1000).ToString("000");
84 asset.Data = pack.AssetBlock.AssetData;
85
86
87 }
88 else if (pack.AssetBlock.Type == 13 | pack.AssetBlock.Type == 5 | pack.AssetBlock.Type == 7)
89 {
90
91 asset = new AssetBase();
92 asset.FullID = assetID;
93 // Console.WriteLine("skin asset id is " + assetID.ToStringHyphenated());
94 asset.Type = pack.AssetBlock.Type;
95 asset.InvType = asset.Type;
96 asset.Name = "NewClothing" + Util.RandomClass.Next(1, 1000).ToString("000");
97 asset.Data = pack.AssetBlock.AssetData;
98
99
100 }
101
102 if (asset != null)
103 {
104 this.AddUpload(pack.AssetBlock.TransactionID, asset);
105 }
106 else
107 {
108
109 //currently we don't support this asset type
110 //so lets just tell the client that the upload is complete
111 AssetUploadCompletePacket response = new AssetUploadCompletePacket();
112 response.AssetBlock.Type = pack.AssetBlock.Type;
113 response.AssetBlock.Success = true;
114 response.AssetBlock.UUID = pack.AssetBlock.TransactionID.Combine(this.ourClient.SecureSessionID);
115 this.ourClient.OutPacket(response);
116 }
117
118 }
119
120 #region Xfer packet system for larger uploads
121
122 public void HandleXferPacket(SendXferPacketPacket xferPacket)
123 {
124 lock (this.transactions)
125 {
126 foreach (AssetTransaction trans in this.transactions.Values)
127 {
128 if (trans.XferID == xferPacket.XferID.ID)
129 {
130 if (trans.Asset.Data.Length > 1)
131 {
132 byte[] newArray = new byte[trans.Asset.Data.Length + xferPacket.DataPacket.Data.Length];
133 Array.Copy(trans.Asset.Data, 0, newArray, 0, trans.Asset.Data.Length);
134 Array.Copy(xferPacket.DataPacket.Data, 0, newArray, trans.Asset.Data.Length, xferPacket.DataPacket.Data.Length);
135 trans.Asset.Data = newArray;
136 }
137 else
138 {
139 byte[] newArray = new byte[xferPacket.DataPacket.Data.Length - 4];
140 Array.Copy(xferPacket.DataPacket.Data, 4, newArray, 0, xferPacket.DataPacket.Data.Length - 4);
141 trans.Asset.Data = newArray;
142 }
143
144 if ((xferPacket.XferID.Packet & 2147483648) != 0)
145 {
146 //end of transfer
147 trans.UploadComplete = true;
148 AssetUploadCompletePacket response = new AssetUploadCompletePacket();
149 response.AssetBlock.Type = trans.Asset.Type;
150 response.AssetBlock.Success = true;
151 response.AssetBlock.UUID = trans.TransactionID.Combine(this.ourClient.SecureSessionID);
152 this.ourClient.OutPacket(response);
153
154 m_assetCache.AddAsset(trans.Asset);
155 //check if we should add it to inventory
156 if (trans.AddToInventory)
157 {
158 // m_assetCache.AddAsset(trans.Asset);
159 m_inventoryCache.AddNewInventoryItem(this.ourClient, trans.InventFolder, trans.Asset);
160 }
161
162
163 }
164 break;
165 }
166
167 }
168 }
169
170 ConfirmXferPacketPacket confirmXfer = new ConfirmXferPacketPacket();
171 confirmXfer.XferID.ID = xferPacket.XferID.ID;
172 confirmXfer.XferID.Packet = xferPacket.XferID.Packet;
173 this.ourClient.OutPacket(confirmXfer);
174 }
175
176 #endregion
177
178 public AssetBase AddUploadToAssetCache(LLUUID transactionID)
179 {
180 AssetBase asset = null;
181 if (this.transactions.ContainsKey(transactionID))
182 {
183 AssetTransaction trans = this.transactions[transactionID];
184 if (trans.UploadComplete)
185 {
186 m_assetCache.AddAsset(trans.Asset);
187 asset = trans.Asset;
188 }
189 }
190
191 return asset;
192 }
193
194 public void CreateInventoryItem(CreateInventoryItemPacket packet)
195 {
196 if (this.transactions.ContainsKey(packet.InventoryBlock.TransactionID))
197 {
198 AssetTransaction trans = this.transactions[packet.InventoryBlock.TransactionID];
199 trans.Asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
200 trans.Asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
201 trans.Asset.Type = packet.InventoryBlock.Type;
202 trans.Asset.InvType = packet.InventoryBlock.InvType;
203 if (trans.UploadComplete)
204 {
205 //already complete so we can add it to the inventory
206 //m_assetCache.AddAsset(trans.Asset);
207 m_inventoryCache.AddNewInventoryItem(this.ourClient, packet.InventoryBlock.FolderID, trans.Asset);
208 }
209 else
210 {
211 trans.AddToInventory = true;
212 trans.InventFolder = packet.InventoryBlock.FolderID;
213 }
214 }
215 }
216
217 private class AssetTransaction
218 {
219 public uint XferID;
220 public AssetBase Asset;
221 public bool AddToInventory;
222 public LLUUID InventFolder = LLUUID.Zero;
223 public bool UploadComplete = false;
224 public LLUUID TransactionID = LLUUID.Zero;
225
226 public AssetTransaction()
227 {
228
229 }
230 }
231 }
232}
diff --git a/OpenSim.RegionServer/Assets/AssetCache.cs b/OpenSim.RegionServer/Assets/AssetCache.cs
deleted file mode 100644
index ccebb24..0000000
--- a/OpenSim.RegionServer/Assets/AssetCache.cs
+++ /dev/null
@@ -1,574 +0,0 @@
1/*
2* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*
26*/
27
28using System;
29using System.Collections.Generic;
30using System.Threading;
31using libsecondlife;
32using libsecondlife.Packets;
33using OpenSim;
34using OpenSim.Framework.Interfaces;
35using OpenSim.Framework.Types;
36using OpenSim.Framework.Utilities;
37
38namespace OpenSim.Assets
39{
40 /// <summary>
41 /// Manages local cache of assets and their sending to viewers.
42 /// </summary>
43 public class AssetCache : IAssetReceiver
44 {
45 public Dictionary<libsecondlife.LLUUID, AssetInfo> Assets;
46 public Dictionary<libsecondlife.LLUUID, TextureImage> Textures;
47
48 public List<AssetRequest> AssetRequests = new List<AssetRequest>(); //assets ready to be sent to viewers
49 public List<AssetRequest> TextureRequests = new List<AssetRequest>(); //textures ready to be sent
50
51 public Dictionary<LLUUID, AssetRequest> RequestedAssets = new Dictionary<LLUUID, AssetRequest>(); //Assets requested from the asset server
52 public Dictionary<LLUUID, AssetRequest> RequestedTextures = new Dictionary<LLUUID, AssetRequest>(); //Textures requested from the asset server
53
54 private IAssetServer _assetServer;
55 private Thread _assetCacheThread;
56 private LLUUID[] textureList = new LLUUID[5];
57
58 /// <summary>
59 ///
60 /// </summary>
61 public AssetCache(IAssetServer assetServer)
62 {
63 Console.WriteLine("Creating Asset cache");
64 _assetServer = assetServer;
65 _assetServer.SetReceiver(this);
66 Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo>();
67 Textures = new Dictionary<libsecondlife.LLUUID, TextureImage>();
68 this._assetCacheThread = new Thread(new ThreadStart(RunAssetManager));
69 this._assetCacheThread.IsBackground = true;
70 this._assetCacheThread.Start();
71
72 }
73
74 /// <summary>
75 ///
76 /// </summary>
77 public void RunAssetManager()
78 {
79 while (true)
80 {
81 try
82 {
83 //Console.WriteLine("Asset cache loop");
84 this.ProcessAssetQueue();
85 this.ProcessTextureQueue();
86 Thread.Sleep(500);
87 }
88 catch (Exception e)
89 {
90 Console.WriteLine(e.Message);
91 }
92 }
93 }
94
95 public void LoadDefaultTextureSet()
96 {
97 //hack: so we can give each user a set of textures
98 textureList[0] = new LLUUID("00000000-0000-0000-9999-000000000001");
99 textureList[1] = new LLUUID("00000000-0000-0000-9999-000000000002");
100 textureList[2] = new LLUUID("00000000-0000-0000-9999-000000000003");
101 textureList[3] = new LLUUID("00000000-0000-0000-9999-000000000004");
102 textureList[4] = new LLUUID("00000000-0000-0000-9999-000000000005");
103
104 for (int i = 0; i < textureList.Length; i++)
105 {
106 this._assetServer.RequestAsset(textureList[i], true);
107 }
108
109 }
110
111 public AssetBase[] CreateNewInventorySet(LLUUID agentID)
112 {
113 AssetBase[] inventorySet = new AssetBase[this.textureList.Length];
114 for (int i = 0; i < textureList.Length; i++)
115 {
116 if (this.Textures.ContainsKey(textureList[i]))
117 {
118 inventorySet[i] = this.CloneImage(agentID, this.Textures[textureList[i]]);
119 TextureImage image = new TextureImage(inventorySet[i]);
120 this.Textures.Add(image.FullID, image);
121 this._assetServer.UploadNewAsset(image); //save the asset to the asset server
122 }
123 }
124 return inventorySet;
125 }
126
127 public AssetBase GetAsset(LLUUID assetID)
128 {
129 AssetBase asset = null;
130 if(this.Textures.ContainsKey(assetID))
131 {
132 asset = this.Textures[assetID];
133 }
134 else if (this.Assets.ContainsKey(assetID))
135 {
136 asset = this.Assets[assetID];
137 }
138 return asset;
139 }
140
141 public void AddAsset(AssetBase asset)
142 {
143 if (asset.Type == 0)
144 {
145 if (!this.Textures.ContainsKey(asset.FullID))
146 { //texture
147 TextureImage textur = new TextureImage(asset);
148 this.Textures.Add(textur.FullID, textur);
149 this._assetServer.UploadNewAsset(asset);
150 }
151 }
152 else
153 {
154 if (!this.Assets.ContainsKey(asset.FullID))
155 {
156 AssetInfo assetInf = new AssetInfo(asset);
157 this.Assets.Add(assetInf.FullID, assetInf);
158 this._assetServer.UploadNewAsset(asset);
159 }
160 }
161 }
162
163 /// <summary>
164 ///
165 /// </summary>
166 private void ProcessTextureQueue()
167 {
168 if (this.TextureRequests.Count == 0)
169 {
170 //no requests waiting
171 return;
172 }
173 int num;
174
175 if (this.TextureRequests.Count < 5)
176 {
177 //lower than 5 so do all of them
178 num = this.TextureRequests.Count;
179 }
180 else
181 {
182 num = 5;
183 }
184 AssetRequest req;
185 for (int i = 0; i < num; i++)
186 {
187 req = (AssetRequest)this.TextureRequests[i];
188 if (req.PacketCounter != req.NumPackets)
189 {
190 // if (req.ImageInfo.FullID == new LLUUID("00000000-0000-0000-5005-000000000005"))
191 if (req.PacketCounter == 0)
192 {
193 //first time for this request so send imagedata packet
194 if (req.NumPackets == 1)
195 {
196 //only one packet so send whole file
197 ImageDataPacket im = new ImageDataPacket();
198 im.ImageID.Packets = 1;
199 im.ImageID.ID = req.ImageInfo.FullID;
200 im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
201 im.ImageData.Data = req.ImageInfo.Data;
202 im.ImageID.Codec = 2;
203 req.RequestUser.OutPacket(im);
204 req.PacketCounter++;
205 //req.ImageInfo.l= time;
206 //System.Console.WriteLine("sent texture: "+req.image_info.FullID);
207 }
208 else
209 {
210 //more than one packet so split file up
211 ImageDataPacket im = new ImageDataPacket();
212 im.ImageID.Packets = (ushort)req.NumPackets;
213 im.ImageID.ID = req.ImageInfo.FullID;
214 im.ImageID.Size = (uint)req.ImageInfo.Data.Length;
215 im.ImageData.Data = new byte[600];
216 Array.Copy(req.ImageInfo.Data, 0, im.ImageData.Data, 0, 600);
217 im.ImageID.Codec = 2;
218 req.RequestUser.OutPacket(im);
219 req.PacketCounter++;
220 //req.ImageInfo.last_used = time;
221 //System.Console.WriteLine("sent first packet of texture:
222 }
223 }
224 else
225 {
226 //send imagepacket
227 //more than one packet so split file up
228 ImagePacketPacket im = new ImagePacketPacket();
229 im.ImageID.Packet = (ushort)req.PacketCounter;
230 im.ImageID.ID = req.ImageInfo.FullID;
231 int size = req.ImageInfo.Data.Length - 600 - 1000 * (req.PacketCounter - 1);
232 if (size > 1000) size = 1000;
233 im.ImageData.Data = new byte[size];
234 Array.Copy(req.ImageInfo.Data, 600 + 1000 * (req.PacketCounter - 1), im.ImageData.Data, 0, size);
235 req.RequestUser.OutPacket(im);
236 req.PacketCounter++;
237 //req.ImageInfo.last_used = time;
238 //System.Console.WriteLine("sent a packet of texture: "+req.image_info.FullID);
239 }
240 }
241 }
242
243 //remove requests that have been completed
244 int count = 0;
245 for (int i = 0; i < num; i++)
246 {
247 if (this.TextureRequests.Count > count)
248 {
249 req = (AssetRequest)this.TextureRequests[count];
250 if (req.PacketCounter == req.NumPackets)
251 {
252 this.TextureRequests.Remove(req);
253 }
254 else
255 {
256 count++;
257 }
258 }
259 }
260
261 }
262 public void AssetReceived(AssetBase asset, bool IsTexture)
263 {
264 if (asset.FullID != LLUUID.Zero) // if it is set to zero then the asset wasn't found by the server
265 {
266 //check if it is a texture or not
267 //then add to the correct cache list
268 //then check for waiting requests for this asset/texture (in the Requested lists)
269 //and move those requests into the Requests list.
270 if (IsTexture)
271 {
272 TextureImage image = new TextureImage(asset);
273 this.Textures.Add(image.FullID, image);
274 if (this.RequestedTextures.ContainsKey(image.FullID))
275 {
276 AssetRequest req = this.RequestedTextures[image.FullID];
277 req.ImageInfo = image;
278 if (image.Data.LongLength > 600)
279 {
280 //over 600 bytes so split up file
281 req.NumPackets = 1 + (int)(image.Data.Length - 600 + 999) / 1000;
282 }
283 else
284 {
285 req.NumPackets = 1;
286 }
287 this.RequestedTextures.Remove(image.FullID);
288 this.TextureRequests.Add(req);
289 }
290 }
291 else
292 {
293 AssetInfo assetInf = new AssetInfo(asset);
294 this.Assets.Add(assetInf.FullID, assetInf);
295 if (this.RequestedAssets.ContainsKey(assetInf.FullID))
296 {
297 AssetRequest req = this.RequestedAssets[assetInf.FullID];
298 req.AssetInf = assetInf;
299 if (assetInf.Data.LongLength > 600)
300 {
301 //over 600 bytes so split up file
302 req.NumPackets = 1 + (int)(assetInf.Data.Length - 600 + 999) / 1000;
303 }
304 else
305 {
306 req.NumPackets = 1;
307 }
308 this.RequestedAssets.Remove(assetInf.FullID);
309 this.AssetRequests.Add(req);
310 }
311 }
312 }
313 }
314
315 public void AssetNotFound(AssetBase asset)
316 {
317 //the asset server had no knowledge of requested asset
318
319 }
320
321 #region Assets
322 /// <summary>
323 ///
324 /// </summary>
325 /// <param name="userInfo"></param>
326 /// <param name="transferRequest"></param>
327 public void AddAssetRequest(ClientView userInfo, TransferRequestPacket transferRequest)
328 {
329 LLUUID requestID = new LLUUID(transferRequest.TransferInfo.Params, 0);
330 //check to see if asset is in local cache, if not we need to request it from asset server.
331 if (!this.Assets.ContainsKey(requestID))
332 {
333 //not found asset
334 // so request from asset server
335 if (!this.RequestedAssets.ContainsKey(requestID))
336 {
337 AssetRequest request = new AssetRequest();
338 request.RequestUser = userInfo;
339 request.RequestAssetID = requestID;
340 request.TransferRequestID = transferRequest.TransferInfo.TransferID;
341 this.RequestedAssets.Add(requestID, request);
342 this._assetServer.RequestAsset(requestID, false);
343 }
344 return;
345 }
346 //it is in our cache
347 AssetInfo asset = this.Assets[requestID];
348
349 //work out how many packets it should be sent in
350 // and add to the AssetRequests list
351 AssetRequest req = new AssetRequest();
352 req.RequestUser = userInfo;
353 req.RequestAssetID = requestID;
354 req.TransferRequestID = transferRequest.TransferInfo.TransferID;
355 req.AssetInf = asset;
356
357 if (asset.Data.LongLength > 600)
358 {
359 //over 600 bytes so split up file
360 req.NumPackets = 1 + (int)(asset.Data.Length - 600 + 999) / 1000;
361 }
362 else
363 {
364 req.NumPackets = 1;
365 }
366
367 this.AssetRequests.Add(req);
368 }
369
370 /// <summary>
371 ///
372 /// </summary>
373 private void ProcessAssetQueue()
374 {
375 if (this.AssetRequests.Count == 0)
376 {
377 //no requests waiting
378 return;
379 }
380 int num;
381
382 if (this.AssetRequests.Count < 5)
383 {
384 //lower than 5 so do all of them
385 num = this.AssetRequests.Count;
386 }
387 else
388 {
389 num = 5;
390 }
391 AssetRequest req;
392 for (int i = 0; i < num; i++)
393 {
394 req = (AssetRequest)this.AssetRequests[i];
395
396 TransferInfoPacket Transfer = new TransferInfoPacket();
397 Transfer.TransferInfo.ChannelType = 2;
398 Transfer.TransferInfo.Status = 0;
399 Transfer.TransferInfo.TargetType = 0;
400 Transfer.TransferInfo.Params = req.RequestAssetID.GetBytes();
401 Transfer.TransferInfo.Size = (int)req.AssetInf.Data.Length;
402 Transfer.TransferInfo.TransferID = req.TransferRequestID;
403 req.RequestUser.OutPacket(Transfer);
404
405 if (req.NumPackets == 1)
406 {
407 TransferPacketPacket TransferPacket = new TransferPacketPacket();
408 TransferPacket.TransferData.Packet = 0;
409 TransferPacket.TransferData.ChannelType = 2;
410 TransferPacket.TransferData.TransferID = req.TransferRequestID;
411 TransferPacket.TransferData.Data = req.AssetInf.Data;
412 TransferPacket.TransferData.Status = 1;
413 req.RequestUser.OutPacket(TransferPacket);
414 }
415 else
416 {
417 //more than one packet so split file up , for now it can't be bigger than 2000 bytes
418 TransferPacketPacket TransferPacket = new TransferPacketPacket();
419 TransferPacket.TransferData.Packet = 0;
420 TransferPacket.TransferData.ChannelType = 2;
421 TransferPacket.TransferData.TransferID = req.TransferRequestID;
422 byte[] chunk = new byte[1000];
423 Array.Copy(req.AssetInf.Data, chunk, 1000);
424 TransferPacket.TransferData.Data = chunk;
425 TransferPacket.TransferData.Status = 0;
426 req.RequestUser.OutPacket(TransferPacket);
427
428 TransferPacket = new TransferPacketPacket();
429 TransferPacket.TransferData.Packet = 1;
430 TransferPacket.TransferData.ChannelType = 2;
431 TransferPacket.TransferData.TransferID = req.TransferRequestID;
432 byte[] chunk1 = new byte[(req.AssetInf.Data.Length - 1000)];
433 Array.Copy(req.AssetInf.Data, 1000, chunk1, 0, chunk1.Length);
434 TransferPacket.TransferData.Data = chunk1;
435 TransferPacket.TransferData.Status = 1;
436 req.RequestUser.OutPacket(TransferPacket);
437 }
438
439 }
440
441 //remove requests that have been completed
442 for (int i = 0; i < num; i++)
443 {
444 this.AssetRequests.RemoveAt(0);
445 }
446
447 }
448
449 public AssetInfo CloneAsset(LLUUID newOwner, AssetInfo sourceAsset)
450 {
451 AssetInfo newAsset = new AssetInfo();
452 newAsset.Data = new byte[sourceAsset.Data.Length];
453 Array.Copy(sourceAsset.Data, newAsset.Data, sourceAsset.Data.Length);
454 newAsset.FullID = LLUUID.Random();
455 newAsset.Type = sourceAsset.Type;
456 newAsset.InvType = sourceAsset.InvType;
457 return (newAsset);
458 }
459 #endregion
460
461 #region Textures
462 /// <summary>
463 ///
464 /// </summary>
465 /// <param name="userInfo"></param>
466 /// <param name="imageID"></param>
467 public void AddTextureRequest(ClientView userInfo, LLUUID imageID)
468 {
469 //check to see if texture is in local cache, if not request from asset server
470 if (!this.Textures.ContainsKey(imageID))
471 {
472 if (!this.RequestedTextures.ContainsKey(imageID))
473 {
474 //not is cache so request from asset server
475 AssetRequest request = new AssetRequest();
476 request.RequestUser = userInfo;
477 request.RequestAssetID = imageID;
478 request.IsTextureRequest = true;
479 this.RequestedTextures.Add(imageID, request);
480 this._assetServer.RequestAsset(imageID, true);
481 }
482 return;
483 }
484
485 TextureImage imag = this.Textures[imageID];
486 AssetRequest req = new AssetRequest();
487 req.RequestUser = userInfo;
488 req.RequestAssetID = imageID;
489 req.IsTextureRequest = true;
490 req.ImageInfo = imag;
491
492 if (imag.Data.LongLength > 600)
493 {
494 //over 600 bytes so split up file
495 req.NumPackets = 1 + (int)(imag.Data.Length - 600 + 999) / 1000;
496 }
497 else
498 {
499 req.NumPackets = 1;
500 }
501 this.TextureRequests.Add(req);
502 }
503
504 public TextureImage CloneImage(LLUUID newOwner, TextureImage source)
505 {
506 TextureImage newImage = new TextureImage();
507 newImage.Data = new byte[source.Data.Length];
508 Array.Copy(source.Data, newImage.Data, source.Data.Length);
509 //newImage.filename = source.filename;
510 newImage.FullID = LLUUID.Random();
511 newImage.Name = source.Name;
512 return (newImage);
513 }
514 #endregion
515
516 }
517
518 public class AssetRequest
519 {
520 public ClientView RequestUser;
521 public LLUUID RequestAssetID;
522 public AssetInfo AssetInf;
523 public TextureImage ImageInfo;
524 public LLUUID TransferRequestID;
525 public long DataPointer = 0;
526 public int NumPackets = 0;
527 public int PacketCounter = 0;
528 public bool IsTextureRequest;
529 //public bool AssetInCache;
530 //public int TimeRequested;
531
532 public AssetRequest()
533 {
534
535 }
536 }
537
538 public class AssetInfo : AssetBase
539 {
540 public AssetInfo()
541 {
542
543 }
544
545 public AssetInfo(AssetBase aBase)
546 {
547 Data = aBase.Data;
548 FullID = aBase.FullID;
549 Type = aBase.Type;
550 InvType = aBase.InvType;
551 Name = aBase.Name;
552 Description = aBase.Description;
553 }
554 }
555
556 public class TextureImage : AssetBase
557 {
558 public TextureImage()
559 {
560
561 }
562
563 public TextureImage(AssetBase aBase)
564 {
565 Data = aBase.Data;
566 FullID = aBase.FullID;
567 Type = aBase.Type;
568 InvType = aBase.InvType;
569 Name = aBase.Name;
570 Description = aBase.Description;
571 }
572 }
573
574}
diff --git a/OpenSim.RegionServer/Assets/InventoryCache.cs b/OpenSim.RegionServer/Assets/InventoryCache.cs
deleted file mode 100644
index 64a7a32..0000000
--- a/OpenSim.RegionServer/Assets/InventoryCache.cs
+++ /dev/null
@@ -1,336 +0,0 @@
1/*
2* Copyright (c) OpenSim project, http://sim.opensecondlife.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*
26*/
27
28using System;
29using System.Collections.Generic;
30using libsecondlife;
31using OpenSim;
32using libsecondlife.Packets;
33//using OpenSim.GridServers;
34using OpenSim.Framework.Inventory;
35using OpenSim.Framework.Types;
36using OpenSim.Framework.Interfaces;
37
38namespace OpenSim.Assets
39{
40 /// <summary>
41 /// Description of InventoryManager.
42 /// </summary>
43 public class InventoryCache
44 {
45 private Dictionary<LLUUID, AgentInventory> _agentsInventory;
46 private List<UserServerRequest> _serverRequests; //list of requests made to user server.
47 private System.Text.Encoding _enc = System.Text.Encoding.ASCII;
48 private const uint FULL_MASK_PERMISSIONS = 2147483647;
49
50 public InventoryCache()
51 {
52 _agentsInventory = new Dictionary<LLUUID, AgentInventory>();
53 _serverRequests = new List<UserServerRequest>();
54 }
55
56 public void AddNewAgentsInventory(AgentInventory agentInventory)
57 {
58 if (!this._agentsInventory.ContainsKey(agentInventory.AgentID))
59 {
60 this._agentsInventory.Add(agentInventory.AgentID, agentInventory);
61 }
62 }
63
64 public AgentInventory FetchAgentsInventory(LLUUID agentID, IUserServer userserver)
65 {
66 AgentInventory res = null;
67 if (!this._agentsInventory.ContainsKey(agentID))
68 {
69 res = userserver.RequestAgentsInventory(agentID);
70 this._agentsInventory.Add(agentID,res);
71 }
72 return res;
73 }
74
75 public AgentInventory GetAgentsInventory(LLUUID agentID)
76 {
77 if (this._agentsInventory.ContainsKey(agentID))
78 {
79 return this._agentsInventory[agentID];
80 }
81
82 return null;
83 }
84
85 public void ClientLeaving(LLUUID clientID, IUserServer userserver)
86 {
87 if (this._agentsInventory.ContainsKey(clientID))
88 {
89 if (userserver != null)
90 {
91 userserver.UpdateAgentsInventory(clientID, this._agentsInventory[clientID]);
92 }
93 this._agentsInventory.Remove(clientID);
94 }
95 }
96
97 public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID)
98 {
99 return this.CreateNewInventoryFolder(remoteClient, folderID, 0);
100 }
101
102 public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type)
103 {
104 bool res = false;
105 if (folderID != LLUUID.Zero) //don't create a folder with a zero id
106 {
107 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
108 {
109 res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type);
110 }
111 }
112 return res;
113 }
114
115 public bool CreateNewInventoryFolder(ClientView remoteClient, LLUUID folderID, ushort type, string folderName, LLUUID parent)
116 {
117 bool res = false;
118 if (folderID != LLUUID.Zero) //don't create a folder with a zero id
119 {
120 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
121 {
122 res = this._agentsInventory[remoteClient.AgentID].CreateNewFolder(folderID, type, folderName, parent);
123 }
124 }
125 return res;
126 }
127
128 public LLUUID AddNewInventoryItem(ClientView remoteClient, LLUUID folderID, OpenSim.Framework.Types.AssetBase asset)
129 {
130 LLUUID newItem = null;
131 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
132 {
133 newItem = this._agentsInventory[remoteClient.AgentID].AddToInventory(folderID, asset);
134 if (newItem != null)
135 {
136 InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[newItem];
137 this.SendItemUpdateCreate(remoteClient, Item);
138 }
139 }
140
141 return newItem;
142 }
143 public bool DeleteInventoryItem(ClientView remoteClient, LLUUID itemID)
144 {
145 bool res = false;
146 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
147 {
148 res = this._agentsInventory[remoteClient.AgentID].DeleteFromInventory(itemID);
149 if (res)
150 {
151 RemoveInventoryItemPacket remove = new RemoveInventoryItemPacket();
152 remove.AgentData.AgentID = remoteClient.AgentID;
153 remove.AgentData.SessionID = remoteClient.SessionID;
154 remove.InventoryData = new RemoveInventoryItemPacket.InventoryDataBlock[1];
155 remove.InventoryData[0] = new RemoveInventoryItemPacket.InventoryDataBlock();
156 remove.InventoryData[0].ItemID = itemID;
157 remoteClient.OutPacket(remove);
158 }
159 }
160
161 return res;
162 }
163
164 public bool UpdateInventoryItemAsset(ClientView remoteClient, LLUUID itemID, OpenSim.Framework.Types.AssetBase asset)
165 {
166 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
167 {
168 bool res = _agentsInventory[remoteClient.AgentID].UpdateItemAsset(itemID, asset);
169 if (res)
170 {
171 InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
172 this.SendItemUpdateCreate(remoteClient, Item);
173 }
174 return res;
175 }
176
177 return false;
178 }
179
180 public bool UpdateInventoryItemDetails(ClientView remoteClient, LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
181 {
182 if (this._agentsInventory.ContainsKey(remoteClient.AgentID))
183 {
184 bool res = _agentsInventory[remoteClient.AgentID].UpdateItemDetails(itemID, packet);
185 if (res)
186 {
187 InventoryItem Item = this._agentsInventory[remoteClient.AgentID].InventoryItems[itemID];
188 this.SendItemUpdateCreate(remoteClient, Item);
189 }
190 return res;
191 }
192
193 return false;
194 }
195
196 public void FetchInventoryDescendents(ClientView userInfo, FetchInventoryDescendentsPacket FetchDescend)
197 {
198 if (this._agentsInventory.ContainsKey(userInfo.AgentID))
199 {
200 AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
201 if (FetchDescend.InventoryData.FetchItems)
202 {
203 if (agentInventory.InventoryFolders.ContainsKey(FetchDescend.InventoryData.FolderID))
204 {
205 InventoryFolder Folder = agentInventory.InventoryFolders[FetchDescend.InventoryData.FolderID];
206 InventoryDescendentsPacket Descend = new InventoryDescendentsPacket();
207 Descend.AgentData.AgentID = userInfo.AgentID;
208 Descend.AgentData.OwnerID = Folder.OwnerID;
209 Descend.AgentData.FolderID = FetchDescend.InventoryData.FolderID;
210 Descend.AgentData.Descendents = Folder.Items.Count;
211 Descend.AgentData.Version = Folder.Items.Count;
212
213
214 Descend.ItemData = new InventoryDescendentsPacket.ItemDataBlock[Folder.Items.Count];
215 for (int i = 0; i < Folder.Items.Count; i++)
216 {
217
218 InventoryItem Item = Folder.Items[i];
219 Descend.ItemData[i] = new InventoryDescendentsPacket.ItemDataBlock();
220 Descend.ItemData[i].ItemID = Item.ItemID;
221 Descend.ItemData[i].AssetID = Item.AssetID;
222 Descend.ItemData[i].CreatorID = Item.CreatorID;
223 Descend.ItemData[i].BaseMask = FULL_MASK_PERMISSIONS;
224 Descend.ItemData[i].CreationDate = 1000;
225 Descend.ItemData[i].Description = _enc.GetBytes(Item.Description + "\0");
226 Descend.ItemData[i].EveryoneMask = FULL_MASK_PERMISSIONS;
227 Descend.ItemData[i].Flags = 1;
228 Descend.ItemData[i].FolderID = Item.FolderID;
229 Descend.ItemData[i].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
230 Descend.ItemData[i].GroupMask = FULL_MASK_PERMISSIONS;
231 Descend.ItemData[i].InvType = Item.InvType;
232 Descend.ItemData[i].Name = _enc.GetBytes(Item.Name + "\0");
233 Descend.ItemData[i].NextOwnerMask = FULL_MASK_PERMISSIONS;
234 Descend.ItemData[i].OwnerID = Item.OwnerID;
235 Descend.ItemData[i].OwnerMask = FULL_MASK_PERMISSIONS;
236 Descend.ItemData[i].SalePrice = 100;
237 Descend.ItemData[i].SaleType = 0;
238 Descend.ItemData[i].Type = Item.Type;
239 Descend.ItemData[i].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, Descend.ItemData[i].InvType, Descend.ItemData[i].Type, Descend.ItemData[i].AssetID, Descend.ItemData[i].GroupID, 100, Descend.ItemData[i].OwnerID, Descend.ItemData[i].CreatorID, Descend.ItemData[i].ItemID, Descend.ItemData[i].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
240 }
241
242 userInfo.OutPacket(Descend);
243
244 }
245 }
246 else
247 {
248 Console.WriteLine("fetch subfolders");
249 }
250 }
251 }
252
253 public void FetchInventory(ClientView userInfo, FetchInventoryPacket FetchItems)
254 {
255 if (this._agentsInventory.ContainsKey(userInfo.AgentID))
256 {
257 AgentInventory agentInventory = this._agentsInventory[userInfo.AgentID];
258
259 for (int i = 0; i < FetchItems.InventoryData.Length; i++)
260 {
261 if (agentInventory.InventoryItems.ContainsKey(FetchItems.InventoryData[i].ItemID))
262 {
263 InventoryItem Item = agentInventory.InventoryItems[FetchItems.InventoryData[i].ItemID];
264 FetchInventoryReplyPacket InventoryReply = new FetchInventoryReplyPacket();
265 InventoryReply.AgentData.AgentID = userInfo.AgentID;
266 InventoryReply.InventoryData = new FetchInventoryReplyPacket.InventoryDataBlock[1];
267 InventoryReply.InventoryData[0] = new FetchInventoryReplyPacket.InventoryDataBlock();
268 InventoryReply.InventoryData[0].ItemID = Item.ItemID;
269 InventoryReply.InventoryData[0].AssetID = Item.AssetID;
270 InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
271 InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
272 InventoryReply.InventoryData[0].CreationDate = (int)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
273 InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
274 InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
275 InventoryReply.InventoryData[0].Flags = 0;
276 InventoryReply.InventoryData[0].FolderID = Item.FolderID;
277 InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
278 InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
279 InventoryReply.InventoryData[0].InvType = Item.InvType;
280 InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
281 InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
282 InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
283 InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
284 InventoryReply.InventoryData[0].SalePrice = 100;
285 InventoryReply.InventoryData[0].SaleType = 0;
286 InventoryReply.InventoryData[0].Type = Item.Type;
287 InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
288 userInfo.OutPacket(InventoryReply);
289 }
290 }
291 }
292 }
293
294 private void SendItemUpdateCreate(ClientView remoteClient, InventoryItem Item)
295 {
296
297 UpdateCreateInventoryItemPacket InventoryReply = new UpdateCreateInventoryItemPacket();
298 InventoryReply.AgentData.AgentID = remoteClient.AgentID;
299 InventoryReply.AgentData.SimApproved = true;
300 InventoryReply.InventoryData = new UpdateCreateInventoryItemPacket.InventoryDataBlock[1];
301 InventoryReply.InventoryData[0] = new UpdateCreateInventoryItemPacket.InventoryDataBlock();
302 InventoryReply.InventoryData[0].ItemID = Item.ItemID;
303 InventoryReply.InventoryData[0].AssetID = Item.AssetID;
304 InventoryReply.InventoryData[0].CreatorID = Item.CreatorID;
305 InventoryReply.InventoryData[0].BaseMask = FULL_MASK_PERMISSIONS;
306 InventoryReply.InventoryData[0].CreationDate = 1000;
307 InventoryReply.InventoryData[0].Description = _enc.GetBytes(Item.Description + "\0");
308 InventoryReply.InventoryData[0].EveryoneMask = FULL_MASK_PERMISSIONS;
309 InventoryReply.InventoryData[0].Flags = 0;
310 InventoryReply.InventoryData[0].FolderID = Item.FolderID;
311 InventoryReply.InventoryData[0].GroupID = new LLUUID("00000000-0000-0000-0000-000000000000");
312 InventoryReply.InventoryData[0].GroupMask = FULL_MASK_PERMISSIONS;
313 InventoryReply.InventoryData[0].InvType = Item.InvType;
314 InventoryReply.InventoryData[0].Name = _enc.GetBytes(Item.Name + "\0");
315 InventoryReply.InventoryData[0].NextOwnerMask = FULL_MASK_PERMISSIONS;
316 InventoryReply.InventoryData[0].OwnerID = Item.OwnerID;
317 InventoryReply.InventoryData[0].OwnerMask = FULL_MASK_PERMISSIONS;
318 InventoryReply.InventoryData[0].SalePrice = 100;
319 InventoryReply.InventoryData[0].SaleType = 0;
320 InventoryReply.InventoryData[0].Type = Item.Type;
321 InventoryReply.InventoryData[0].CRC = libsecondlife.Helpers.InventoryCRC(1000, 0, InventoryReply.InventoryData[0].InvType, InventoryReply.InventoryData[0].Type, InventoryReply.InventoryData[0].AssetID, InventoryReply.InventoryData[0].GroupID, 100, InventoryReply.InventoryData[0].OwnerID, InventoryReply.InventoryData[0].CreatorID, InventoryReply.InventoryData[0].ItemID, InventoryReply.InventoryData[0].FolderID, FULL_MASK_PERMISSIONS, 1, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS, FULL_MASK_PERMISSIONS);
322
323 remoteClient.OutPacket(InventoryReply);
324 }
325 }
326
327
328
329 public class UserServerRequest
330 {
331 public UserServerRequest()
332 {
333
334 }
335 }
336}
diff --git a/OpenSim.RegionServer/AuthenticateSessionsBase.cs b/OpenSim.RegionServer/AuthenticateSessionsBase.cs
deleted file mode 100644
index 99b86d4..0000000
--- a/OpenSim.RegionServer/AuthenticateSessionsBase.cs
+++ /dev/null
@@ -1,105 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5using OpenSim.Framework.Interfaces;
6using OpenSim.Framework.Types;
7
8namespace OpenSim
9{
10 public class AuthenticateSessionsBase
11 {
12 public Dictionary<uint, AgentCircuitData> AgentCircuits = new Dictionary<uint, AgentCircuitData>();
13
14 public AuthenticateSessionsBase()
15 {
16
17 }
18
19 public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)
20 {
21 AgentCircuitData validcircuit = null;
22 if (this.AgentCircuits.ContainsKey(circuitcode))
23 {
24 validcircuit = this.AgentCircuits[circuitcode];
25 }
26 AuthenticateResponse user = new AuthenticateResponse();
27 if (validcircuit == null)
28 {
29 //don't have this circuit code in our list
30 user.Authorised = false;
31 return (user);
32 }
33
34 if ((sessionID == validcircuit.SessionID) && (agentID == validcircuit.AgentID))
35 {
36 user.Authorised = true;
37 user.LoginInfo = new Login();
38 user.LoginInfo.Agent = agentID;
39 user.LoginInfo.Session = sessionID;
40 user.LoginInfo.SecureSession = validcircuit.SecureSessionID;
41 user.LoginInfo.First = validcircuit.firstname;
42 user.LoginInfo.Last = validcircuit.lastname;
43 user.LoginInfo.InventoryFolder = validcircuit.InventoryFolder;
44 user.LoginInfo.BaseFolder = validcircuit.BaseFolder;
45 }
46 else
47 {
48 // Invalid
49 user.Authorised = false;
50 }
51
52 return (user);
53 }
54
55 public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
56 {
57 if (this.AgentCircuits.ContainsKey(circuitCode))
58 {
59 this.AgentCircuits[circuitCode] = agentData;
60 }
61 else
62 {
63 this.AgentCircuits.Add(circuitCode, agentData);
64 }
65 }
66
67 public LLVector3 GetPosition(uint circuitCode)
68 {
69 LLVector3 vec = new LLVector3();
70 if (this.AgentCircuits.ContainsKey(circuitCode))
71 {
72 vec = this.AgentCircuits[circuitCode].startpos;
73 }
74 return vec;
75 }
76
77 public void UpdateAgentData(AgentCircuitData agentData)
78 {
79 if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode))
80 {
81 this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname;
82 this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname;
83 this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos;
84 // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
85 }
86 }
87
88 public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)
89 {
90 if (this.AgentCircuits.ContainsKey(circuitcode))
91 {
92 this.AgentCircuits[circuitcode].child = childstatus;
93 }
94 }
95
96 public bool GetAgentChildStatus(uint circuitcode)
97 {
98 if (this.AgentCircuits.ContainsKey(circuitcode))
99 {
100 return this.AgentCircuits[circuitcode].child;
101 }
102 return false;
103 }
104 }
105}
diff --git a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs b/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
deleted file mode 100644
index 6c1c7d2..0000000
--- a/OpenSim.RegionServer/AuthenticateSessionsLocal.cs
+++ /dev/null
@@ -1,31 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5using OpenSim.Framework.Types;
6
7namespace OpenSim
8{
9 public class AuthenticateSessionsLocal : AuthenticateSessionsBase
10 {
11 public AuthenticateSessionsLocal()
12 {
13
14 }
15
16 public void AddNewSession(Login loginData)
17 {
18 AgentCircuitData agent = new AgentCircuitData();
19 agent.AgentID = loginData.Agent;
20 agent.firstname = loginData.First;
21 agent.lastname = loginData.Last;
22 agent.SessionID = loginData.Session;
23 agent.SecureSessionID = loginData.SecureSession;
24 agent.circuitcode = loginData.CircuitCode;
25 agent.BaseFolder = loginData.BaseFolder;
26 agent.InventoryFolder = loginData.InventoryFolder;
27 agent.startpos = new LLVector3(128,128,70);
28 this.AddNewCircuit(agent.circuitcode, agent);
29 }
30 }
31}
diff --git a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs b/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
deleted file mode 100644
index 0802d75..0000000
--- a/OpenSim.RegionServer/AuthenticateSessionsRemote.cs
+++ /dev/null
@@ -1,46 +0,0 @@
1using System;
2using System.Collections;
3using System.Collections.Generic;
4using System.Text;
5using System.Xml;
6using libsecondlife;
7using OpenSim.Framework.Types;
8using Nwc.XmlRpc;
9
10namespace OpenSim
11{
12 public class AuthenticateSessionsRemote : AuthenticateSessionsBase
13 {
14 public AuthenticateSessionsRemote()
15 {
16
17 }
18
19 public XmlRpcResponse ExpectUser(XmlRpcRequest request)
20 {
21 Hashtable requestData = (Hashtable)request.Params[0];
22 AgentCircuitData agentData = new AgentCircuitData();
23 agentData.SessionID = new LLUUID((string)requestData["session_id"]);
24 agentData.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
25 agentData.firstname = (string)requestData["firstname"];
26 agentData.lastname = (string)requestData["lastname"];
27 agentData.AgentID = new LLUUID((string)requestData["agent_id"]);
28 agentData.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
29 if (requestData.ContainsKey("child_agent") && requestData["child_agent"].Equals("1"))
30 {
31 agentData.child = true;
32 }
33 else
34 {
35 agentData.startpos = new LLVector3(Convert.ToUInt32(requestData["startpos_x"]), Convert.ToUInt32(requestData["startpos_y"]), Convert.ToUInt32(requestData["startpos_z"]));
36 agentData.child = false;
37 // Console.WriteLine("expect user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
38
39 }
40
41 this.AddNewCircuit(agentData.circuitcode, agentData);
42
43 return new XmlRpcResponse();
44 }
45 }
46}
diff --git a/OpenSim.RegionServer/CAPS/AdminWebFront.cs b/OpenSim.RegionServer/CAPS/AdminWebFront.cs
deleted file mode 100644
index 2299fa4..0000000
--- a/OpenSim.RegionServer/CAPS/AdminWebFront.cs
+++ /dev/null
@@ -1,256 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.IO;
5using OpenSim.world;
6using OpenSim.UserServer;
7using OpenSim.Servers;
8using OpenSim.Assets;
9using OpenSim.Framework.Inventory;
10using libsecondlife;
11using OpenSim.RegionServer.world.scripting;
12using Avatar=libsecondlife.Avatar;
13
14namespace OpenSim.CAPS
15{
16 public class AdminWebFront
17 {
18 private string AdminPage;
19 private string NewAccountForm;
20 private string LoginForm;
21 private string passWord = "Admin";
22 private World m_world;
23 private LoginServer _userServer;
24 private InventoryCache _inventoryCache;
25
26 public AdminWebFront(string password, World world, InventoryCache inventoryCache, LoginServer userserver)
27 {
28 _inventoryCache = inventoryCache;
29 _userServer = userserver;
30 m_world = world;
31 passWord = password;
32 LoadAdminPage();
33 }
34
35 public void LoadMethods( BaseHttpServer server )
36 {
37 server.AddRestHandler("GET", "/Admin", GetAdminPage);
38 server.AddRestHandler("GET", "/Admin/Welcome", GetWelcomePage);
39 server.AddRestHandler("GET", "/Admin/Accounts", GetAccountsPage );
40 server.AddRestHandler("GET", "/Admin/Clients", GetConnectedClientsPage);
41 server.AddRestHandler("GET", "/Admin/Entities", GetEntitiesPage);
42 server.AddRestHandler("GET", "/Admin/Scripts", GetScriptsPage);
43 server.AddRestHandler("GET", "/Admin/AddTestScript", AddTestScript );
44 server.AddRestHandler("GET", "/ClientInventory", GetClientsInventory);
45
46 server.AddRestHandler("POST", "/Admin/NewAccount", PostNewAccount );
47 server.AddRestHandler("POST", "/Admin/Login", PostLogin );
48 }
49
50 private string GetWelcomePage(string request, string path, string param)
51 {
52 string responseString;
53 responseString = "Welcome to the OpenSim Admin Page";
54 responseString += "<br><br><br> " + LoginForm;
55 return responseString;
56 }
57
58 private string PostLogin(string requestBody, string path, string param)
59 {
60 string responseString;
61// Console.WriteLine(requestBody);
62 if (requestBody == passWord)
63 {
64 responseString = "<p> Login Successful </p>";
65 }
66 else
67 {
68 responseString = "<p> Password Error </p>";
69 responseString += "<p> Please Login with the correct password </p>";
70 responseString += "<br><br> " + LoginForm;
71 }
72 return responseString;
73 }
74
75 private string PostNewAccount(string requestBody, string path, string param)
76 {
77 string responseString;
78 string firstName = "";
79 string secondName = "";
80 string userPasswd = "";
81 string[] comp;
82 string[] passw;
83 string[] line;
84 string delimStr = "&";
85 char[] delimiter = delimStr.ToCharArray();
86 string delimStr2 = "=";
87 char[] delimiter2 = delimStr2.ToCharArray();
88
89 //Console.WriteLine(requestBody);
90 comp = requestBody.Split(delimiter);
91 passw = comp[3].Split(delimiter2);
92 if (passw[1] == passWord) // check admin password is correct
93 {
94
95 line = comp[0].Split(delimiter2); //split firstname
96 if (line.Length > 1)
97 {
98 firstName = line[1];
99 }
100 line = comp[1].Split(delimiter2); //split secondname
101 if (line.Length > 1)
102 {
103 secondName = line[1];
104 }
105 line = comp[2].Split(delimiter2); //split user password
106 if (line.Length > 1)
107 {
108 userPasswd = line[1];
109 }
110 if (this._userServer != null)
111 {
112 this._userServer.CreateUserAccount(firstName, secondName, userPasswd);
113 }
114 responseString = "<p> New Account created </p>";
115 }
116 else
117 {
118 responseString = "<p> Admin password is incorrect, please login with the correct password</p>";
119 responseString += "<br><br>" + LoginForm;
120 }
121 return responseString;
122 }
123
124 private string GetConnectedClientsPage(string request, string path, string param)
125 {
126 string responseString;
127 responseString = " <p> Listing connected Clients </p>";
128 OpenSim.world.Avatar TempAv;
129 foreach (libsecondlife.LLUUID UUID in m_world.Entities.Keys)
130 {
131 if (m_world.Entities[UUID].ToString() == "OpenSim.world.Avatar")
132 {
133 TempAv = (OpenSim.world.Avatar)m_world.Entities[UUID];
134 responseString += "<p> Client: ";
135 responseString += TempAv.firstname + " , " + TempAv.lastname + " , <A HREF=\"javascript:loadXMLDoc('ClientInventory/" + UUID.ToString() + "')\">" + UUID + "</A> , " + TempAv.ControllingClient.SessionID + " , " + TempAv.ControllingClient.CircuitCode + " , " + TempAv.ControllingClient.userEP.ToString();
136 responseString += "</p>";
137 }
138 }
139 return responseString;
140 }
141
142 private string AddTestScript(string request, string path, string param)
143 {
144 int index = path.LastIndexOf('/');
145
146 string lluidStr = path.Substring(index+1);
147
148 LLUUID id;
149
150 if( LLUUID.TryParse( lluidStr, out id ) )
151 {
152 // This is just here for concept purposes... Remove!
153 m_world.AddScript( m_world.Entities[id], new FollowRandomAvatar());
154 return String.Format("Added new script to object [{0}]", id);
155 }
156 else
157 {
158 return String.Format("Couldn't parse [{0}]", lluidStr );
159 }
160 }
161
162 private string GetScriptsPage(string request, string path, string param)
163 {
164 return String.Empty;
165 }
166
167 private string GetEntitiesPage(string request, string path, string param)
168 {
169 string responseString;
170 responseString = " <p> Listing current entities</p><ul>";
171
172 foreach (Entity entity in m_world.Entities.Values)
173 {
174 string testScriptLink = "javascript:loadXMLDoc('Admin/AddTestScript/" + entity.uuid.ToString() + "');";
175 responseString += String.Format( "<li>[{0}] \"{1}\" @ {2} <a href=\"{3}\">add test script</a></li>", entity.uuid, entity.Name, entity.Pos, testScriptLink );
176 }
177 responseString += "</ul>";
178 return responseString;
179 }
180
181 private string GetClientsInventory(string request, string path, string param)
182 {
183 string[] line;
184 string delimStr = "/";
185 char[] delimiter = delimStr.ToCharArray();
186 string responseString;
187 responseString = " <p> Listing Inventory </p>";
188
189 line = path.Split(delimiter);
190 if (line.Length > 2)
191 {
192 if (line[1] == "ClientInventory")
193 {
194 AgentInventory inven = this._inventoryCache.GetAgentsInventory(new libsecondlife.LLUUID(line[2]));
195 responseString += " <p> Client: " + inven.AgentID.ToStringHyphenated() +" </p>";
196 if (inven != null)
197 {
198 foreach (InventoryItem item in inven.InventoryItems.Values)
199 {
200 responseString += "<p> InventoryItem: ";
201 responseString += item.Name +" , "+ item.ItemID +" , "+ item.Type +" , "+ item.FolderID +" , "+ item.AssetID +" , "+ item.Description ;
202 responseString += "</p>";
203 }
204 }
205 }
206 }
207 return responseString;
208 }
209
210 private string GetCachedAssets(string request, string path, string param)
211 {
212 return "";
213 }
214
215 private string GetAccountsPage(string request, string path, string param)
216 {
217 string responseString;
218 responseString = "<p> Account management </p>";
219 responseString += "<br> ";
220 responseString += "<p> Create New Account </p>";
221 responseString += NewAccountForm;
222 return responseString;
223 }
224
225 private string GetAdminPage(string request, string path, string param)
226 {
227 return AdminPage;
228 }
229
230 private void LoadAdminPage()
231 {
232 try
233 {
234 StreamReader SR;
235
236 SR = File.OpenText("testadmin.htm");
237 AdminPage = SR.ReadToEnd();
238 SR.Close();
239
240 SR = File.OpenText("newaccountform.htm");
241 NewAccountForm = SR.ReadToEnd();
242 SR.Close();
243
244 SR = File.OpenText("login.htm");
245 LoginForm = SR.ReadToEnd();
246 SR.Close();
247 }
248 catch (Exception e)
249 {
250 Console.WriteLine(e.ToString());
251 }
252
253 }
254
255 }
256}
diff --git a/OpenSim.RegionServer/ClientView.Grid.cs b/OpenSim.RegionServer/ClientView.Grid.cs
deleted file mode 100644
index 5229dbd..0000000
--- a/OpenSim.RegionServer/ClientView.Grid.cs
+++ /dev/null
@@ -1,164 +0,0 @@
1using System;
2using System.Collections;
3using System.Collections.Generic;
4using libsecondlife;
5using libsecondlife.Packets;
6using Nwc.XmlRpc;
7using System.Net;
8using System.Net.Sockets;
9using System.IO;
10using System.Threading;
11using System.Timers;
12using OpenSim.Framework.Interfaces;
13using OpenSim.Framework.Types;
14using OpenSim.Framework.Inventory;
15using OpenSim.Framework.Utilities;
16using OpenSim.world;
17using OpenSim.Assets;
18
19namespace OpenSim
20{
21 public partial class ClientView
22 {
23
24 public void EnableNeighbours()
25 {
26 if ((this.m_gridServer.GetName() == "Remote") && (!this.m_child))
27 {
28 Hashtable SimParams;
29 ArrayList SendParams;
30 XmlRpcRequest GridReq;
31 XmlRpcResponse GridResp;
32 List<Packet> enablePackets = new List<Packet>();
33
34 RemoteGridBase gridServer = (RemoteGridBase)this.m_gridServer;
35
36 foreach (Hashtable neighbour in gridServer.neighbours)
37 {
38 try
39 {
40 string neighbourIPStr = (string)neighbour["sim_ip"];
41 System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse(neighbourIPStr);
42 ushort neighbourPort = (ushort)Convert.ToInt32(neighbour["sim_port"]);
43 string reqUrl = "http://" + neighbourIPStr + ":" + neighbourPort.ToString();
44
45 Console.WriteLine(reqUrl);
46
47 SimParams = new Hashtable();
48 SimParams["session_id"] = this.SessionID.ToString();
49 SimParams["secure_session_id"] = this.SecureSessionID.ToString();
50 SimParams["firstname"] = this.ClientAvatar.firstname;
51 SimParams["lastname"] = this.ClientAvatar.lastname;
52 SimParams["agent_id"] = this.AgentID.ToString();
53 SimParams["circuit_code"] = (Int32)this.CircuitCode;
54 SimParams["child_agent"] = "1";
55 SendParams = new ArrayList();
56 SendParams.Add(SimParams);
57
58 GridReq = new XmlRpcRequest("expect_user", SendParams);
59 GridResp = GridReq.Send(reqUrl, 3000);
60 EnableSimulatorPacket enablesimpacket = new EnableSimulatorPacket();
61 enablesimpacket.SimulatorInfo = new EnableSimulatorPacket.SimulatorInfoBlock();
62 enablesimpacket.SimulatorInfo.Handle = Helpers.UIntsToLong((uint)(Convert.ToInt32(neighbour["region_locx"]) * 256), (uint)(Convert.ToInt32(neighbour["region_locy"]) * 256));
63
64
65 byte[] byteIP = neighbourIP.GetAddressBytes();
66 enablesimpacket.SimulatorInfo.IP = (uint)byteIP[3] << 24;
67 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[2] << 16;
68 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[1] << 8;
69 enablesimpacket.SimulatorInfo.IP += (uint)byteIP[0];
70 enablesimpacket.SimulatorInfo.Port = neighbourPort;
71 enablePackets.Add(enablesimpacket);
72 }
73 catch (Exception e)
74 {
75 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Could not connect to neighbour " + neighbour["sim_ip"] + ":" + neighbour["sim_port"] + ", continuing.");
76 }
77 }
78 Thread.Sleep(3000);
79 foreach (Packet enable in enablePackets)
80 {
81 this.OutPacket(enable);
82 }
83 enablePackets.Clear();
84
85 }
86 }
87
88 public void CrossSimBorder(LLVector3 avatarpos)
89 { // VERY VERY BASIC
90
91 LLVector3 newpos = avatarpos;
92 uint neighbourx = this.m_regionData.RegionLocX;
93 uint neighboury = this.m_regionData.RegionLocY;
94
95 if (avatarpos.X < 0)
96 {
97 neighbourx -= 1;
98 newpos.X = 254;
99 }
100 if (avatarpos.X > 255)
101 {
102 neighbourx += 1;
103 newpos.X = 1;
104 }
105 if (avatarpos.Y < 0)
106 {
107 neighboury -= 1;
108 newpos.Y = 254;
109 }
110 if (avatarpos.Y > 255)
111 {
112 neighboury += 1;
113 newpos.Y = 1;
114 }
115 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:CrossSimBorder() - Crossing border to neighbouring sim at [" + neighbourx.ToString() + "," + neighboury.ToString() + "]");
116
117 Hashtable SimParams;
118 ArrayList SendParams;
119 XmlRpcRequest GridReq;
120 XmlRpcResponse GridResp;
121 foreach (Hashtable borderingSim in ((RemoteGridBase)m_gridServer).neighbours)
122 {
123 if (((string)borderingSim["region_locx"]).Equals(neighbourx.ToString()) && ((string)borderingSim["region_locy"]).Equals(neighboury.ToString()))
124 {
125 SimParams = new Hashtable();
126 SimParams["firstname"] = this.ClientAvatar.firstname;
127 SimParams["lastname"] = this.ClientAvatar.lastname;
128 SimParams["circuit_code"] = this.CircuitCode.ToString();
129 SimParams["pos_x"] = newpos.X.ToString();
130 SimParams["pos_y"] = newpos.Y.ToString();
131 SimParams["pos_z"] = newpos.Z.ToString();
132 SendParams = new ArrayList();
133 SendParams.Add(SimParams);
134
135 GridReq = new XmlRpcRequest("agent_crossing", SendParams);
136 GridResp = GridReq.Send("http://" + borderingSim["sim_ip"] + ":" + borderingSim["sim_port"], 3000);
137
138 CrossedRegionPacket NewSimPack = new CrossedRegionPacket();
139 NewSimPack.AgentData = new CrossedRegionPacket.AgentDataBlock();
140 NewSimPack.AgentData.AgentID = this.AgentID;
141 NewSimPack.AgentData.SessionID = this.SessionID;
142 NewSimPack.Info = new CrossedRegionPacket.InfoBlock();
143 NewSimPack.Info.Position = newpos;
144 NewSimPack.Info.LookAt = new LLVector3(0.99f, 0.042f, 0); // copied from Avatar.cs - SHOULD BE DYNAMIC!!!!!!!!!!
145 NewSimPack.RegionData = new libsecondlife.Packets.CrossedRegionPacket.RegionDataBlock();
146 NewSimPack.RegionData.RegionHandle = Helpers.UIntsToLong((uint)(Convert.ToInt32(borderingSim["region_locx"]) * 256), (uint)(Convert.ToInt32(borderingSim["region_locy"]) * 256));
147 System.Net.IPAddress neighbourIP = System.Net.IPAddress.Parse((string)borderingSim["sim_ip"]);
148 byte[] byteIP = neighbourIP.GetAddressBytes();
149 NewSimPack.RegionData.SimIP = (uint)byteIP[3] << 24;
150 NewSimPack.RegionData.SimIP += (uint)byteIP[2] << 16;
151 NewSimPack.RegionData.SimIP += (uint)byteIP[1] << 8;
152 NewSimPack.RegionData.SimIP += (uint)byteIP[0];
153 NewSimPack.RegionData.SimPort = (ushort)Convert.ToInt32(borderingSim["sim_port"]);
154 NewSimPack.RegionData.SeedCapability = new byte[0];
155 lock (PacketQueue)
156 {
157 ProcessOutPacket(NewSimPack);
158 DowngradeClient();
159 }
160 }
161 }
162 }
163 }
164}
diff --git a/OpenSim.RegionServer/ClientView.PacketHandlers.cs b/OpenSim.RegionServer/ClientView.PacketHandlers.cs
deleted file mode 100644
index 070c200..0000000
--- a/OpenSim.RegionServer/ClientView.PacketHandlers.cs
+++ /dev/null
@@ -1,184 +0,0 @@
1using System;
2using System.Collections;
3using System.Collections.Generic;
4using libsecondlife;
5using libsecondlife.Packets;
6using Nwc.XmlRpc;
7using System.Net;
8using System.Net.Sockets;
9using System.IO;
10using System.Threading;
11using System.Timers;
12using OpenSim.Framework.Interfaces;
13using OpenSim.Framework.Types;
14using OpenSim.Framework.Inventory;
15using OpenSim.Framework.Utilities;
16using OpenSim.world;
17using OpenSim.Assets;
18
19namespace OpenSim
20{
21 public partial class ClientView
22 {
23 protected virtual void RegisterLocalPacketHandlers()
24 {
25 this.AddLocalPacketHandler(PacketType.LogoutRequest, this.Logout);
26 this.AddLocalPacketHandler(PacketType.AgentCachedTexture, this.AgentTextureCached);
27 this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate);
28 }
29
30 protected virtual bool Logout(ClientView simClient, Packet packet)
31 {
32 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ProcessInPacket() - Got a logout request");
33 //send reply to let the client logout
34 LogoutReplyPacket logReply = new LogoutReplyPacket();
35 logReply.AgentData.AgentID = this.AgentID;
36 logReply.AgentData.SessionID = this.SessionID;
37 logReply.InventoryData = new LogoutReplyPacket.InventoryDataBlock[1];
38 logReply.InventoryData[0] = new LogoutReplyPacket.InventoryDataBlock();
39 logReply.InventoryData[0].ItemID = LLUUID.Zero;
40 OutPacket(logReply);
41 //tell all clients to kill our object
42 KillObjectPacket kill = new KillObjectPacket();
43 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
44 kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
45 kill.ObjectData[0].ID = this.ClientAvatar.localid;
46 foreach (ClientView client in m_clientThreads.Values)
47 {
48 client.OutPacket(kill);
49 }
50 if (this.m_userServer != null)
51 {
52 this.m_inventoryCache.ClientLeaving(this.AgentID, this.m_userServer);
53 }
54 else
55 {
56 this.m_inventoryCache.ClientLeaving(this.AgentID, null);
57 }
58
59 m_gridServer.LogoutSession(this.SessionID, this.AgentID, this.CircuitCode);
60 /*lock (m_world.Entities)
61 {
62 m_world.Entities.Remove(this.AgentID);
63 }*/
64 m_world.RemoveViewerAgent(this);
65 //need to do other cleaning up here too
66 m_clientThreads.Remove(this.CircuitCode);
67 m_networkServer.RemoveClientCircuit(this.CircuitCode);
68 this.ClientThread.Abort();
69 return true;
70 }
71
72 protected bool AgentTextureCached(ClientView simclient, Packet packet)
73 {
74 // Console.WriteLine(packet.ToString());
75 AgentCachedTexturePacket chechedtex = (AgentCachedTexturePacket)packet;
76 AgentCachedTextureResponsePacket cachedresp = new AgentCachedTextureResponsePacket();
77 cachedresp.AgentData.AgentID = this.AgentID;
78 cachedresp.AgentData.SessionID = this.SessionID;
79 cachedresp.AgentData.SerialNum = this.cachedtextureserial;
80 this.cachedtextureserial++;
81 cachedresp.WearableData = new AgentCachedTextureResponsePacket.WearableDataBlock[chechedtex.WearableData.Length];
82 for (int i = 0; i < chechedtex.WearableData.Length; i++)
83 {
84 cachedresp.WearableData[i] = new AgentCachedTextureResponsePacket.WearableDataBlock();
85 cachedresp.WearableData[i].TextureIndex = chechedtex.WearableData[i].TextureIndex;
86 cachedresp.WearableData[i].TextureID = LLUUID.Zero;
87 cachedresp.WearableData[i].HostName = new byte[0];
88 }
89 this.OutPacket(cachedresp);
90 return true;
91 }
92
93 protected bool MultipleObjUpdate(ClientView simClient, Packet packet)
94 {
95 MultipleObjectUpdatePacket multipleupdate = (MultipleObjectUpdatePacket)packet;
96 for (int i = 0; i < multipleupdate.ObjectData.Length; i++)
97 {
98 if (multipleupdate.ObjectData[i].Type == 9) //change position
99 {
100 libsecondlife.LLVector3 pos = new LLVector3(multipleupdate.ObjectData[i].Data, 0);
101 foreach (Entity ent in m_world.Entities.Values)
102 {
103 if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
104 {
105 ((OpenSim.world.Primitive)ent).UpdatePosition(pos);
106
107 }
108 }
109 //should update stored position of the prim
110 }
111 else if (multipleupdate.ObjectData[i].Type == 10)//rotation
112 {
113 libsecondlife.LLQuaternion rot = new LLQuaternion(multipleupdate.ObjectData[i].Data, 0, true);
114 foreach (Entity ent in m_world.Entities.Values)
115 {
116 if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
117 {
118 ent.rotation = new Axiom.MathLib.Quaternion(rot.W, rot.X, rot.Y, rot.Z);
119 ((OpenSim.world.Primitive)ent).UpdateFlag = true;
120 }
121 }
122 }
123 else if (multipleupdate.ObjectData[i].Type == 13)//scale
124 {
125
126 libsecondlife.LLVector3 scale = new LLVector3(multipleupdate.ObjectData[i].Data, 12);
127 foreach (Entity ent in m_world.Entities.Values)
128 {
129 if (ent.localid == multipleupdate.ObjectData[i].ObjectLocalID)
130 {
131 ((OpenSim.world.Primitive)ent).Scale = scale;
132 }
133 }
134 }
135 }
136 return true;
137 }
138
139 public void RequestMapLayer() //should be getting the map layer from the grid server
140 {
141 //send a layer covering the 800,800 - 1200,1200 area (should be covering the requested area)
142 MapLayerReplyPacket mapReply = new MapLayerReplyPacket();
143 mapReply.AgentData.AgentID = this.AgentID;
144 mapReply.AgentData.Flags = 0;
145 mapReply.LayerData = new MapLayerReplyPacket.LayerDataBlock[1];
146 mapReply.LayerData[0] = new MapLayerReplyPacket.LayerDataBlock();
147 mapReply.LayerData[0].Bottom = 800;
148 mapReply.LayerData[0].Left = 800;
149 mapReply.LayerData[0].Top = 1200;
150 mapReply.LayerData[0].Right = 1200;
151 mapReply.LayerData[0].ImageID = new LLUUID("00000000-0000-0000-9999-000000000006");
152 this.OutPacket(mapReply);
153 }
154
155 public void RequestMapBlocks(int minX, int minY, int maxX, int maxY)
156 {
157 IList simMapProfiles = m_gridServer.RequestMapBlocks(minX, minY, maxX, maxY);
158 MapBlockReplyPacket mbReply = new MapBlockReplyPacket();
159 mbReply.AgentData.AgentID = this.AgentID;
160 int len;
161 if (simMapProfiles == null)
162 len = 0;
163 else
164 len = simMapProfiles.Count;
165
166 mbReply.Data = new MapBlockReplyPacket.DataBlock[len];
167 int iii;
168 for (iii = 0; iii < len; iii++)
169 {
170 Hashtable mp = (Hashtable)simMapProfiles[iii];
171 mbReply.Data[iii] = new MapBlockReplyPacket.DataBlock();
172 mbReply.Data[iii].Name = System.Text.Encoding.UTF8.GetBytes((string)mp["name"]);
173 mbReply.Data[iii].Access = System.Convert.ToByte(mp["access"]);
174 mbReply.Data[iii].Agents = System.Convert.ToByte(mp["agents"]);
175 mbReply.Data[iii].MapImageID = new LLUUID((string)mp["map-image-id"]);
176 mbReply.Data[iii].RegionFlags = System.Convert.ToUInt32(mp["region-flags"]);
177 mbReply.Data[iii].WaterHeight = System.Convert.ToByte(mp["water-height"]);
178 mbReply.Data[iii].X = System.Convert.ToUInt16(mp["x"]);
179 mbReply.Data[iii].Y = System.Convert.ToUInt16(mp["y"]);
180 }
181 this.OutPacket(mbReply);
182 }
183 }
184}
diff --git a/OpenSim.RegionServer/ClientView.ProcessPackets.cs b/OpenSim.RegionServer/ClientView.ProcessPackets.cs
deleted file mode 100644
index a78f27a..0000000
--- a/OpenSim.RegionServer/ClientView.ProcessPackets.cs
+++ /dev/null
@@ -1,471 +0,0 @@
1using System;
2using System.Collections;
3using System.Collections.Generic;
4using libsecondlife;
5using libsecondlife.Packets;
6using Nwc.XmlRpc;
7using System.Net;
8using System.Net.Sockets;
9using System.IO;
10using System.Threading;
11using System.Timers;
12using OpenSim.Framework.Interfaces;
13using OpenSim.Framework.Types;
14using OpenSim.Framework.Inventory;
15using OpenSim.Framework.Utilities;
16using OpenSim.world;
17using OpenSim.Assets;
18
19namespace OpenSim
20{
21 public partial class ClientView
22 {
23 public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
24 public delegate void RezObject(AssetBase primasset, LLVector3 pos);
25 public delegate void ModifyTerrain(byte Action, float North, float West);
26 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
27 public delegate void StartAnim(LLUUID animID, int seq);
28 public delegate void GenericCall(ClientView RemoteClient);
29 public delegate void GenericCall2();
30 public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary.
31
32 public event ChatFromViewer OnChatFromViewer;
33 public event RezObject OnRezObject;
34 public event ModifyTerrain OnModifyTerrain;
35 public event GenericCall OnRegionHandShakeReply;
36 public event GenericCall OnRequestWearables;
37 public event SetAppearance OnSetAppearance;
38 public event GenericCall2 OnCompleteMovementToRegion;
39 public event GenericCall3 OnAgentUpdate;
40 public event StartAnim OnStartAnim;
41 public event GenericCall OnRequestAvatarsData;
42
43 protected override void ProcessInPacket(Packet Pack)
44 {
45 ack_pack(Pack);
46 if (debug)
47 {
48 if (Pack.Type != PacketType.AgentUpdate)
49 {
50 Console.WriteLine(Pack.Type.ToString());
51 }
52 }
53
54 if (this.ProcessPacketMethod(Pack))
55 {
56 //there is a handler registered that handled this packet type
57 return;
58 }
59 else
60 {
61 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
62
63 switch (Pack.Type)
64 {
65 #region New Event system
66 case PacketType.ChatFromViewer:
67 ChatFromViewerPacket inchatpack = (ChatFromViewerPacket)Pack;
68 if (Util.FieldToString(inchatpack.ChatData.Message) == "")
69 {
70 //empty message so don't bother with it
71 break;
72 }
73 string fromName = ClientAvatar.firstname + " " + ClientAvatar.lastname;
74 byte[] message = inchatpack.ChatData.Message;
75 byte type = inchatpack.ChatData.Type;
76 LLVector3 fromPos = ClientAvatar.Pos;
77 LLUUID fromAgentID = AgentID;
78 this.OnChatFromViewer(message, type, fromPos, fromName, fromAgentID);
79 break;
80 case PacketType.RezObject:
81 RezObjectPacket rezPacket = (RezObjectPacket)Pack;
82 AgentInventory inven = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
83 if (inven != null)
84 {
85 if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))
86 {
87 AssetBase asset = this.m_assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);
88 if (asset != null)
89 {
90 this.OnRezObject(asset, rezPacket.RezData.RayEnd);
91 this.m_inventoryCache.DeleteInventoryItem(this, rezPacket.InventoryData.ItemID);
92 }
93 }
94 }
95 break;
96 case PacketType.ModifyLand:
97 ModifyLandPacket modify = (ModifyLandPacket)Pack;
98 if (modify.ParcelData.Length > 0)
99 {
100 OnModifyTerrain(modify.ModifyBlock.Action, modify.ParcelData[0].North, modify.ParcelData[0].West);
101 }
102 break;
103
104 case PacketType.RegionHandshakeReply:
105 OnRegionHandShakeReply(this);
106 break;
107 case PacketType.AgentWearablesRequest:
108 OnRequestWearables(this);
109 OnRequestAvatarsData(this);
110 break;
111 case PacketType.AgentSetAppearance:
112 AgentSetAppearancePacket appear = (AgentSetAppearancePacket)Pack;
113 OnSetAppearance(appear.ObjectData.TextureEntry, appear.VisualParam);
114 break;
115 case PacketType.CompleteAgentMovement:
116 if (this.m_child) this.UpgradeClient();
117 OnCompleteMovementToRegion();
118 this.EnableNeighbours();
119 break;
120 case PacketType.AgentUpdate:
121 OnAgentUpdate(Pack);
122 break;
123 case PacketType.AgentAnimation:
124 if (!m_child)
125 {
126 AgentAnimationPacket AgentAni = (AgentAnimationPacket)Pack;
127 for (int i = 0; i < AgentAni.AnimationList.Length; i++)
128 {
129 if (AgentAni.AnimationList[i].StartAnim)
130 {
131 OnStartAnim(AgentAni.AnimationList[i].AnimID, 1);
132 }
133 }
134 }
135 break;
136 case PacketType.AgentIsNowWearing:
137 // AgentIsNowWearingPacket wear = (AgentIsNowWearingPacket)Pack;
138 //Console.WriteLine(Pack.ToString());
139 break;
140 #endregion
141
142 //old handling, should move most to a event based system.
143 #region World/Avatar/Primitive related packets
144 case PacketType.ObjectAdd:
145 m_world.AddNewPrim((ObjectAddPacket)Pack, this);
146 break;
147 case PacketType.ObjectLink:
148 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
149 ObjectLinkPacket link = (ObjectLinkPacket)Pack;
150 uint parentprimid = 0;
151 OpenSim.world.Primitive parentprim = null;
152 if (link.ObjectData.Length > 1)
153 {
154 parentprimid = link.ObjectData[0].ObjectLocalID;
155 foreach (Entity ent in m_world.Entities.Values)
156 {
157 if (ent.localid == parentprimid)
158 {
159 parentprim = (OpenSim.world.Primitive)ent;
160
161 }
162 }
163 for (int i = 1; i < link.ObjectData.Length; i++)
164 {
165 foreach (Entity ent in m_world.Entities.Values)
166 {
167 if (ent.localid == link.ObjectData[i].ObjectLocalID)
168 {
169 ((OpenSim.world.Primitive)ent).MakeParent(parentprim);
170 }
171 }
172 }
173 }
174 break;
175 case PacketType.ObjectScale:
176 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, Pack.ToString());
177 break;
178 case PacketType.ObjectShape:
179 ObjectShapePacket shape = (ObjectShapePacket)Pack;
180 for (int i = 0; i < shape.ObjectData.Length; i++)
181 {
182 foreach (Entity ent in m_world.Entities.Values)
183 {
184 if (ent.localid == shape.ObjectData[i].ObjectLocalID)
185 {
186 ((OpenSim.world.Primitive)ent).UpdateShape(shape.ObjectData[i]);
187 }
188 }
189 }
190 break;
191 case PacketType.ObjectSelect:
192 ObjectSelectPacket incomingselect = (ObjectSelectPacket)Pack;
193 for (int i = 0; i < incomingselect.ObjectData.Length; i++)
194 {
195 foreach (Entity ent in m_world.Entities.Values)
196 {
197 if (ent.localid == incomingselect.ObjectData[i].ObjectLocalID)
198 {
199 ((OpenSim.world.Primitive)ent).GetProperites(this);
200 break;
201 }
202 }
203 }
204 break;
205 case PacketType.ObjectImage:
206 ObjectImagePacket imagePack = (ObjectImagePacket)Pack;
207 for (int i = 0; i < imagePack.ObjectData.Length; i++)
208 {
209 foreach (Entity ent in m_world.Entities.Values)
210 {
211 if (ent.localid == imagePack.ObjectData[i].ObjectLocalID)
212 {
213 ((OpenSim.world.Primitive)ent).UpdateTexture(imagePack.ObjectData[i].TextureEntry);
214 }
215 }
216 }
217 break;
218 case PacketType.ObjectFlagUpdate:
219 ObjectFlagUpdatePacket flags = (ObjectFlagUpdatePacket)Pack;
220 foreach (Entity ent in m_world.Entities.Values)
221 {
222 if (ent.localid == flags.AgentData.ObjectLocalID)
223 {
224 ((OpenSim.world.Primitive)ent).UpdateObjectFlags(flags);
225 }
226 }
227 break;
228
229 case PacketType.ViewerEffect:
230 ViewerEffectPacket viewer = (ViewerEffectPacket)Pack;
231 foreach (ClientView client in m_clientThreads.Values)
232 {
233 if (client.AgentID != this.AgentID)
234 {
235 viewer.AgentData.AgentID = client.AgentID;
236 viewer.AgentData.SessionID = client.SessionID;
237 client.OutPacket(viewer);
238 }
239 }
240 break;
241 #endregion
242
243 #region Inventory/Asset/Other related packets
244 case PacketType.RequestImage:
245 RequestImagePacket imageRequest = (RequestImagePacket)Pack;
246 for (int i = 0; i < imageRequest.RequestImage.Length; i++)
247 {
248 m_assetCache.AddTextureRequest(this, imageRequest.RequestImage[i].Image);
249 }
250 break;
251 case PacketType.TransferRequest:
252 //Console.WriteLine("OpenSimClient.cs:ProcessInPacket() - Got transfer request");
253 TransferRequestPacket transfer = (TransferRequestPacket)Pack;
254 m_assetCache.AddAssetRequest(this, transfer);
255 break;
256 case PacketType.AssetUploadRequest:
257 AssetUploadRequestPacket request = (AssetUploadRequestPacket)Pack;
258 this.UploadAssets.HandleUploadPacket(request, request.AssetBlock.TransactionID.Combine(this.SecureSessionID));
259 break;
260 case PacketType.RequestXfer:
261 //Console.WriteLine(Pack.ToString());
262 break;
263 case PacketType.SendXferPacket:
264 this.UploadAssets.HandleXferPacket((SendXferPacketPacket)Pack);
265 break;
266 case PacketType.CreateInventoryFolder:
267 CreateInventoryFolderPacket invFolder = (CreateInventoryFolderPacket)Pack;
268 m_inventoryCache.CreateNewInventoryFolder(this, invFolder.FolderData.FolderID, (ushort)invFolder.FolderData.Type, Util.FieldToString(invFolder.FolderData.Name), invFolder.FolderData.ParentID);
269 //Console.WriteLine(Pack.ToString());
270 break;
271 case PacketType.CreateInventoryItem:
272 //Console.WriteLine(Pack.ToString());
273 CreateInventoryItemPacket createItem = (CreateInventoryItemPacket)Pack;
274 if (createItem.InventoryBlock.TransactionID != LLUUID.Zero)
275 {
276 this.UploadAssets.CreateInventoryItem(createItem);
277 }
278 else
279 {
280 // Console.Write(Pack.ToString());
281 this.CreateInventoryItem(createItem);
282 }
283 break;
284 case PacketType.FetchInventory:
285 //Console.WriteLine("fetch item packet");
286 FetchInventoryPacket FetchInventory = (FetchInventoryPacket)Pack;
287 m_inventoryCache.FetchInventory(this, FetchInventory);
288 break;
289 case PacketType.FetchInventoryDescendents:
290 FetchInventoryDescendentsPacket Fetch = (FetchInventoryDescendentsPacket)Pack;
291 m_inventoryCache.FetchInventoryDescendents(this, Fetch);
292 break;
293 case PacketType.UpdateInventoryItem:
294 UpdateInventoryItemPacket update = (UpdateInventoryItemPacket)Pack;
295 //Console.WriteLine(Pack.ToString());
296 for (int i = 0; i < update.InventoryData.Length; i++)
297 {
298 if (update.InventoryData[i].TransactionID != LLUUID.Zero)
299 {
300 AssetBase asset = m_assetCache.GetAsset(update.InventoryData[i].TransactionID.Combine(this.SecureSessionID));
301 if (asset != null)
302 {
303 // Console.WriteLine("updating inventory item, found asset" + asset.FullID.ToStringHyphenated() + " already in cache");
304 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
305 }
306 else
307 {
308 asset = this.UploadAssets.AddUploadToAssetCache(update.InventoryData[i].TransactionID);
309 if (asset != null)
310 {
311 //Console.WriteLine("updating inventory item, adding asset" + asset.FullID.ToStringHyphenated() + " to cache");
312 m_inventoryCache.UpdateInventoryItemAsset(this, update.InventoryData[i].ItemID, asset);
313 }
314 else
315 {
316 //Console.WriteLine("trying to update inventory item, but asset is null");
317 }
318 }
319 }
320 else
321 {
322 m_inventoryCache.UpdateInventoryItemDetails(this, update.InventoryData[i].ItemID, update.InventoryData[i]); ;
323 }
324 }
325 break;
326 case PacketType.RequestTaskInventory:
327 // Console.WriteLine(Pack.ToString());
328 RequestTaskInventoryPacket requesttask = (RequestTaskInventoryPacket)Pack;
329 ReplyTaskInventoryPacket replytask = new ReplyTaskInventoryPacket();
330 bool foundent = false;
331 foreach (Entity ent in m_world.Entities.Values)
332 {
333 if (ent.localid == requesttask.InventoryData.LocalID)
334 {
335 replytask.InventoryData.TaskID = ent.uuid;
336 replytask.InventoryData.Serial = 0;
337 replytask.InventoryData.Filename = new byte[0];
338 foundent = true;
339 }
340 }
341 if (foundent)
342 {
343 this.OutPacket(replytask);
344 }
345 break;
346 case PacketType.UpdateTaskInventory:
347 // Console.WriteLine(Pack.ToString());
348 UpdateTaskInventoryPacket updatetask = (UpdateTaskInventoryPacket)Pack;
349 AgentInventory myinventory = this.m_inventoryCache.GetAgentsInventory(this.AgentID);
350 if (myinventory != null)
351 {
352 if (updatetask.UpdateData.Key == 0)
353 {
354 if (myinventory.InventoryItems[updatetask.InventoryData.ItemID] != null)
355 {
356 if (myinventory.InventoryItems[updatetask.InventoryData.ItemID].Type == 7)
357 {
358 LLUUID noteaid = myinventory.InventoryItems[updatetask.InventoryData.ItemID].AssetID;
359 AssetBase assBase = this.m_assetCache.GetAsset(noteaid);
360 if (assBase != null)
361 {
362 foreach (Entity ent in m_world.Entities.Values)
363 {
364 if (ent.localid == updatetask.UpdateData.LocalID)
365 {
366 if (ent is OpenSim.world.Primitive)
367 {
368 this.m_world.AddScript(ent, Util.FieldToString(assBase.Data));
369 }
370 }
371 }
372 }
373 }
374 }
375 }
376 }
377 break;
378 case PacketType.MapLayerRequest:
379 this.RequestMapLayer();
380 break;
381 case PacketType.MapBlockRequest:
382 MapBlockRequestPacket MapRequest = (MapBlockRequestPacket)Pack;
383
384 this.RequestMapBlocks(MapRequest.PositionData.MinX, MapRequest.PositionData.MinY, MapRequest.PositionData.MaxX, MapRequest.PositionData.MaxY);
385 break;
386 case PacketType.TeleportLandmarkRequest:
387 TeleportLandmarkRequestPacket tpReq = (TeleportLandmarkRequestPacket)Pack;
388
389 TeleportStartPacket tpStart = new TeleportStartPacket();
390 tpStart.Info.TeleportFlags = 8; // tp via lm
391 this.OutPacket(tpStart);
392
393 TeleportProgressPacket tpProgress = new TeleportProgressPacket();
394 tpProgress.Info.Message = (new System.Text.ASCIIEncoding()).GetBytes("sending_landmark");
395 tpProgress.Info.TeleportFlags = 8;
396 tpProgress.AgentData.AgentID = tpReq.Info.AgentID;
397 this.OutPacket(tpProgress);
398
399 // Fetch landmark
400 LLUUID lmid = tpReq.Info.LandmarkID;
401 AssetBase lma = this.m_assetCache.GetAsset(lmid);
402 if (lma != null)
403 {
404 AssetLandmark lm = new AssetLandmark(lma);
405
406 if (lm.RegionID == m_regionData.SimUUID)
407 {
408 TeleportLocalPacket tpLocal = new TeleportLocalPacket();
409
410 tpLocal.Info.AgentID = tpReq.Info.AgentID;
411 tpLocal.Info.TeleportFlags = 8; // Teleport via landmark
412 tpLocal.Info.LocationID = 2;
413 tpLocal.Info.Position = lm.Position;
414 OutPacket(tpLocal);
415 }
416 else
417 {
418 TeleportCancelPacket tpCancel = new TeleportCancelPacket();
419 tpCancel.Info.AgentID = tpReq.Info.AgentID;
420 tpCancel.Info.SessionID = tpReq.Info.SessionID;
421 OutPacket(tpCancel);
422 }
423 }
424 else
425 {
426 Console.WriteLine("Cancelling Teleport - fetch asset not yet implemented");
427
428 TeleportCancelPacket tpCancel = new TeleportCancelPacket();
429 tpCancel.Info.AgentID = tpReq.Info.AgentID;
430 tpCancel.Info.SessionID = tpReq.Info.SessionID;
431 OutPacket(tpCancel);
432 }
433 break;
434 case PacketType.TeleportLocationRequest:
435 TeleportLocationRequestPacket tpLocReq = (TeleportLocationRequestPacket)Pack;
436 Console.WriteLine(tpLocReq.ToString());
437
438 tpStart = new TeleportStartPacket();
439 tpStart.Info.TeleportFlags = 16; // Teleport via location
440 Console.WriteLine(tpStart.ToString());
441 OutPacket(tpStart);
442
443 if (m_regionData.RegionHandle != tpLocReq.Info.RegionHandle)
444 {
445 /* m_gridServer.getRegion(tpLocReq.Info.RegionHandle); */
446 Console.WriteLine("Inter-sim teleport not yet implemented");
447 TeleportCancelPacket tpCancel = new TeleportCancelPacket();
448 tpCancel.Info.SessionID = tpLocReq.AgentData.SessionID;
449 tpCancel.Info.AgentID = tpLocReq.AgentData.AgentID;
450
451 OutPacket(tpCancel);
452 }
453 else
454 {
455 Console.WriteLine("Local teleport");
456 TeleportLocalPacket tpLocal = new TeleportLocalPacket();
457 tpLocal.Info.AgentID = tpLocReq.AgentData.AgentID;
458 tpLocal.Info.TeleportFlags = tpStart.Info.TeleportFlags;
459 tpLocal.Info.LocationID = 2;
460 tpLocal.Info.LookAt = tpLocReq.Info.LookAt;
461 tpLocal.Info.Position = tpLocReq.Info.Position;
462 OutPacket(tpLocal);
463
464 }
465 break;
466 #endregion
467 }
468 }
469 }
470 }
471}
diff --git a/OpenSim.RegionServer/ClientView.cs b/OpenSim.RegionServer/ClientView.cs
deleted file mode 100644
index ccea2f3..0000000
--- a/OpenSim.RegionServer/ClientView.cs
+++ /dev/null
@@ -1,440 +0,0 @@
1/*
2Copyright (c) OpenSim project, http://osgrid.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*/
26
27using System;
28using System.Collections;
29using System.Collections.Generic;
30using libsecondlife;
31using libsecondlife.Packets;
32using Nwc.XmlRpc;
33using System.Net;
34using System.Net.Sockets;
35using System.IO;
36using System.Threading;
37using System.Timers;
38using OpenSim.Framework.Interfaces;
39using OpenSim.Framework.Types;
40using OpenSim.Framework.Inventory;
41using OpenSim.Framework.Utilities;
42using OpenSim.world;
43using OpenSim.Assets;
44
45namespace OpenSim
46{
47 public delegate bool PacketMethod(ClientView simClient, Packet packet);
48
49 /// <summary>
50 /// Handles new client connections
51 /// Constructor takes a single Packet and authenticates everything
52 /// </summary>
53 public partial class ClientView : ClientViewBase
54 {
55 protected static Dictionary<PacketType, PacketMethod> PacketHandlers = new Dictionary<PacketType, PacketMethod>(); //Global/static handlers for all clients
56 protected Dictionary<PacketType, PacketMethod> m_packetHandlers = new Dictionary<PacketType, PacketMethod>(); //local handlers for this instance
57
58 public LLUUID AgentID;
59 public LLUUID SessionID;
60 public LLUUID SecureSessionID = LLUUID.Zero;
61 public bool m_child;
62 public world.Avatar ClientAvatar;
63 private UseCircuitCodePacket cirpack;
64 public Thread ClientThread;
65 public LLVector3 startpos;
66
67 private AgentAssetUpload UploadAssets;
68 private LLUUID newAssetFolder = LLUUID.Zero;
69 private bool debug = false;
70 private World m_world;
71 private Dictionary<uint, ClientView> m_clientThreads;
72 private AssetCache m_assetCache;
73 private IGridServer m_gridServer;
74 private IUserServer m_userServer = null;
75 private InventoryCache m_inventoryCache;
76 public bool m_sandboxMode;
77 private int cachedtextureserial = 0;
78 private RegionInfo m_regionData;
79 protected AuthenticateSessionsBase m_authenticateSessionsHandler;
80
81 public IUserServer UserServer
82 {
83 set
84 {
85 this.m_userServer = value;
86 }
87 }
88
89 public ClientView(EndPoint remoteEP, UseCircuitCodePacket initialcirpack, World world, Dictionary<uint, ClientView> clientThreads, AssetCache assetCache, IGridServer gridServer, OpenSimNetworkHandler application, InventoryCache inventoryCache, bool sandboxMode, bool child, RegionInfo regionDat, AuthenticateSessionsBase authenSessions)
90 {
91 m_world = world;
92 m_clientThreads = clientThreads;
93 m_assetCache = assetCache;
94 m_gridServer = gridServer;
95 m_networkServer = application;
96 m_inventoryCache = inventoryCache;
97 m_sandboxMode = sandboxMode;
98 m_child = child;
99 m_regionData = regionDat;
100 m_authenticateSessionsHandler = authenSessions;
101
102 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request");
103 cirpack = initialcirpack;
104 userEP = remoteEP;
105
106 if (m_gridServer.GetName() == "Remote")
107 {
108 this.m_child = m_authenticateSessionsHandler.GetAgentChildStatus(initialcirpack.CircuitCode.Code);
109 this.startpos = m_authenticateSessionsHandler.GetPosition(initialcirpack.CircuitCode.Code);
110 //Console.WriteLine("start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
111 }
112 else
113 {
114 this.startpos = new LLVector3(128, 128, m_world.Terrain[(int)128, (int)128] + 15.0f); // new LLVector3(128.0f, 128.0f, 60f);
115 }
116
117 PacketQueue = new BlockingQueue<QueItem>();
118
119 this.UploadAssets = new AgentAssetUpload(this, m_assetCache, m_inventoryCache);
120 AckTimer = new System.Timers.Timer(500);
121 AckTimer.Elapsed += new ElapsedEventHandler(AckTimer_Elapsed);
122 AckTimer.Start();
123
124 this.RegisterLocalPacketHandlers();
125
126 ClientThread = new Thread(new ThreadStart(AuthUser));
127 ClientThread.IsBackground = true;
128 ClientThread.Start();
129 }
130
131 # region Client Methods
132 public void UpgradeClient()
133 {
134 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent");
135 this.m_child = false;
136 this.m_world.RemoveViewerAgent(this);
137 if (!this.m_sandboxMode)
138 {
139 this.startpos = m_authenticateSessionsHandler.GetPosition(CircuitCode);
140 m_authenticateSessionsHandler.UpdateAgentChildStatus(CircuitCode, false);
141 //Console.WriteLine("upgrade start pos is " + this.startpos.X + " , " + this.startpos.Y + " , " + this.startpos.Z);
142 }
143 this.InitNewClient();
144 }
145
146 public void DowngradeClient()
147 {
148 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - changing full agent to child");
149 this.m_child = true;
150 this.m_world.RemoveViewerAgent(this);
151 this.m_world.AddViewerAgent(this);
152 }
153
154 public void KillClient()
155 {
156 KillObjectPacket kill = new KillObjectPacket();
157 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
158 kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
159 kill.ObjectData[0].ID = this.ClientAvatar.localid;
160 foreach (ClientView client in m_clientThreads.Values)
161 {
162 client.OutPacket(kill);
163 }
164 if (this.m_userServer != null)
165 {
166 this.m_inventoryCache.ClientLeaving(this.AgentID, this.m_userServer);
167 }
168 else
169 {
170 this.m_inventoryCache.ClientLeaving(this.AgentID, null);
171 }
172
173 m_world.RemoveViewerAgent(this);
174
175 m_clientThreads.Remove(this.CircuitCode);
176 m_networkServer.RemoveClientCircuit(this.CircuitCode);
177 this.ClientThread.Abort();
178 }
179 #endregion
180
181 # region Packet Handling
182 public static bool AddPacketHandler(PacketType packetType, PacketMethod handler)
183 {
184 bool result = false;
185 lock (PacketHandlers)
186 {
187 if (!PacketHandlers.ContainsKey(packetType))
188 {
189 PacketHandlers.Add(packetType, handler);
190 result = true;
191 }
192 }
193 return result;
194 }
195
196 public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler)
197 {
198 bool result = false;
199 lock (m_packetHandlers)
200 {
201 if (!m_packetHandlers.ContainsKey(packetType))
202 {
203 m_packetHandlers.Add(packetType, handler);
204 result = true;
205 }
206 }
207 return result;
208 }
209
210 protected virtual bool ProcessPacketMethod(Packet packet)
211 {
212 bool result = false;
213 bool found = false;
214 PacketMethod method;
215 if (m_packetHandlers.TryGetValue(packet.Type, out method))
216 {
217 //there is a local handler for this packet type
218 result = method(this, packet);
219 }
220 else
221 {
222 //there is not a local handler so see if there is a Global handler
223 lock (PacketHandlers)
224 {
225 found = PacketHandlers.TryGetValue(packet.Type, out method);
226 }
227 if (found)
228 {
229 result = method(this, packet);
230 }
231 }
232 return result;
233 }
234
235 protected virtual void ClientLoop()
236 {
237 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ClientLoop() - Entered loop");
238 while (true)
239 {
240 QueItem nextPacket = PacketQueue.Dequeue();
241 if (nextPacket.Incoming)
242 {
243 //is a incoming packet
244 ProcessInPacket(nextPacket.Packet);
245 }
246 else
247 {
248 //is a out going packet
249 ProcessOutPacket(nextPacket.Packet);
250 }
251 }
252 }
253 # endregion
254
255 # region Setup
256
257 protected virtual void InitNewClient()
258 {
259 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
260
261 m_world.AddViewerAgent(this);
262 world.Entity tempent = m_world.Entities[this.AgentID];
263
264 this.ClientAvatar = (world.Avatar)tempent;
265 }
266
267 protected virtual void AuthUser()
268 {
269 // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
270 AuthenticateResponse sessionInfo = this.m_networkServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code);
271 if (!sessionInfo.Authorised)
272 {
273 //session/circuit not authorised
274 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString());
275 ClientThread.Abort();
276 }
277 else
278 {
279 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString());
280 //session is authorised
281 this.AgentID = cirpack.CircuitCode.ID;
282 this.SessionID = cirpack.CircuitCode.SessionID;
283 this.CircuitCode = cirpack.CircuitCode.Code;
284 InitNewClient(); //shouldn't be called here as we might be a child agent and not want a full avatar
285 this.ClientAvatar.firstname = sessionInfo.LoginInfo.First;
286 this.ClientAvatar.lastname = sessionInfo.LoginInfo.Last;
287 if (sessionInfo.LoginInfo.SecureSession != LLUUID.Zero)
288 {
289 this.SecureSessionID = sessionInfo.LoginInfo.SecureSession;
290 }
291
292 // Create Inventory, currently only works for sandbox mode
293 if (m_sandboxMode)
294 {
295 this.SetupInventory(sessionInfo);
296 }
297
298 ClientLoop();
299 }
300 }
301 # endregion
302
303
304 protected override void KillThread()
305 {
306 this.ClientThread.Abort();
307 }
308
309 #region World/Avatar To Viewer Methods
310
311 public void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
312 {
313 System.Text.Encoding enc = System.Text.Encoding.ASCII;
314 libsecondlife.Packets.ChatFromSimulatorPacket reply = new ChatFromSimulatorPacket();
315 reply.ChatData.Audible = 1;
316 reply.ChatData.Message = message;
317 reply.ChatData.ChatType = type;
318 reply.ChatData.SourceType = 1;
319 reply.ChatData.Position = fromPos;
320 reply.ChatData.FromName = enc.GetBytes(fromName + "\0");
321 reply.ChatData.OwnerID = fromAgentID;
322 reply.ChatData.SourceID = fromAgentID;
323
324 this.OutPacket(reply);
325 }
326
327 public void SendAppearance(AvatarWearable[] wearables)
328 {
329 AgentWearablesUpdatePacket aw = new AgentWearablesUpdatePacket();
330 aw.AgentData.AgentID = this.AgentID;
331 aw.AgentData.SerialNum = 0;
332 aw.AgentData.SessionID = this.SessionID;
333
334 aw.WearableData = new AgentWearablesUpdatePacket.WearableDataBlock[13];
335 AgentWearablesUpdatePacket.WearableDataBlock awb;
336 for (int i = 0; i < wearables.Length; i++)
337 {
338 awb = new AgentWearablesUpdatePacket.WearableDataBlock();
339 awb.WearableType = (byte)i;
340 awb.AssetID = wearables[i].AssetID;
341 awb.ItemID = wearables[i].ItemID;
342 aw.WearableData[i] = awb;
343 }
344
345 this.OutPacket(aw);
346 }
347 #endregion
348
349 #region Inventory Creation
350 private void SetupInventory(AuthenticateResponse sessionInfo)
351 {
352 AgentInventory inventory = null;
353 if (sessionInfo.LoginInfo.InventoryFolder != null)
354 {
355 inventory = this.CreateInventory(sessionInfo.LoginInfo.InventoryFolder);
356 if (sessionInfo.LoginInfo.BaseFolder != null)
357 {
358 if (!inventory.HasFolder(sessionInfo.LoginInfo.BaseFolder))
359 {
360 m_inventoryCache.CreateNewInventoryFolder(this, sessionInfo.LoginInfo.BaseFolder);
361 }
362 this.newAssetFolder = sessionInfo.LoginInfo.BaseFolder;
363 AssetBase[] inventorySet = m_assetCache.CreateNewInventorySet(this.AgentID);
364 if (inventorySet != null)
365 {
366 for (int i = 0; i < inventorySet.Length; i++)
367 {
368 if (inventorySet[i] != null)
369 {
370 m_inventoryCache.AddNewInventoryItem(this, sessionInfo.LoginInfo.BaseFolder, inventorySet[i]);
371 }
372 }
373 }
374 }
375 }
376 }
377 private AgentInventory CreateInventory(LLUUID baseFolder)
378 {
379 AgentInventory inventory = null;
380 if (this.m_userServer != null)
381 {
382 // a user server is set so request the inventory from it
383 Console.WriteLine("getting inventory from user server");
384 inventory = m_inventoryCache.FetchAgentsInventory(this.AgentID, m_userServer);
385 }
386 else
387 {
388 inventory = new AgentInventory();
389 inventory.AgentID = this.AgentID;
390 inventory.CreateRootFolder(this.AgentID, false);
391 m_inventoryCache.AddNewAgentsInventory(inventory);
392 m_inventoryCache.CreateNewInventoryFolder(this, baseFolder);
393 }
394 return inventory;
395 }
396
397 private void CreateInventoryItem(CreateInventoryItemPacket packet)
398 {
399 if (!(packet.InventoryBlock.Type == 3 || packet.InventoryBlock.Type == 7))
400 {
401 System.Console.WriteLine("Attempted to create " + Util.FieldToString(packet.InventoryBlock.Name) + " in inventory. Unsupported type");
402 return;
403 }
404
405 //lets try this out with creating a notecard
406 AssetBase asset = new AssetBase();
407
408 asset.Name = Util.FieldToString(packet.InventoryBlock.Name);
409 asset.Description = Util.FieldToString(packet.InventoryBlock.Description);
410 asset.InvType = packet.InventoryBlock.InvType;
411 asset.Type = packet.InventoryBlock.Type;
412 asset.FullID = LLUUID.Random();
413
414 switch (packet.InventoryBlock.Type)
415 {
416 case 7: // Notecard
417 asset.Data = new byte[0];
418 break;
419
420 case 3: // Landmark
421 String content;
422 content = "Landmark version 2\n";
423 content += "region_id " + m_regionData.SimUUID + "\n";
424 String strPos = String.Format("%.2f %.2f %.2f>",
425 this.ClientAvatar.Pos.X,
426 this.ClientAvatar.Pos.Y,
427 this.ClientAvatar.Pos.Z);
428 content += "local_pos " + strPos + "\n";
429 asset.Data = (new System.Text.ASCIIEncoding()).GetBytes(content);
430 break;
431 default:
432 break;
433 }
434 m_assetCache.AddAsset(asset);
435 m_inventoryCache.AddNewInventoryItem(this, packet.InventoryBlock.FolderID, asset);
436 }
437 #endregion
438
439 }
440}
diff --git a/OpenSim.RegionServer/ClientViewBase.cs b/OpenSim.RegionServer/ClientViewBase.cs
deleted file mode 100644
index 814b025..0000000
--- a/OpenSim.RegionServer/ClientViewBase.cs
+++ /dev/null
@@ -1,299 +0,0 @@
1using System;
2using System.Collections;
3using System.Collections.Generic;
4using libsecondlife;
5using libsecondlife.Packets;
6using System.Net;
7using System.Net.Sockets;
8using System.IO;
9using System.Threading;
10using System.Timers;
11using OpenSim.Framework.Utilities;
12
13
14namespace OpenSim
15{
16 public class ClientViewBase
17 {
18 protected BlockingQueue<QueItem> PacketQueue;
19 protected Dictionary<uint, uint> PendingAcks = new Dictionary<uint, uint>();
20 protected Dictionary<uint, Packet> NeedAck = new Dictionary<uint, Packet>();
21
22 protected System.Timers.Timer AckTimer;
23 protected uint Sequence = 0;
24 protected object SequenceLock = new object();
25 protected const int MAX_APPENDED_ACKS = 10;
26 protected const int RESEND_TIMEOUT = 4000;
27 protected const int MAX_SEQUENCE = 0xFFFFFF;
28
29 public uint CircuitCode;
30 public EndPoint userEP;
31
32 protected OpenSimNetworkHandler m_networkServer;
33
34 public ClientViewBase()
35 {
36
37 }
38
39 protected virtual void ProcessInPacket(Packet Pack)
40 {
41
42 }
43
44 protected virtual void ProcessOutPacket(Packet Pack)
45 {
46 // Keep track of when this packet was sent out
47 Pack.TickCount = Environment.TickCount;
48
49 if (!Pack.Header.Resent)
50 {
51 // Set the sequence number
52 lock (SequenceLock)
53 {
54 if (Sequence >= MAX_SEQUENCE)
55 Sequence = 1;
56 else
57 Sequence++;
58 Pack.Header.Sequence = Sequence;
59 }
60
61 if (Pack.Header.Reliable) //DIRTY HACK
62 {
63 lock (NeedAck)
64 {
65 if (!NeedAck.ContainsKey(Pack.Header.Sequence))
66 {
67 try
68 {
69 NeedAck.Add(Pack.Header.Sequence, Pack);
70 }
71 catch (Exception e) // HACKY
72 {
73 e.ToString();
74 // Ignore
75 // Seems to throw a exception here occasionally
76 // of 'duplicate key' despite being locked.
77 // !?!?!?
78 }
79 }
80 else
81 {
82 // Client.Log("Attempted to add a duplicate sequence number (" +
83 // packet.Header.Sequence + ") to the NeedAck dictionary for packet type " +
84 // packet.Type.ToString(), Helpers.LogLevel.Warning);
85 }
86 }
87
88 // Don't append ACKs to resent packets, in case that's what was causing the
89 // delivery to fail
90 if (!Pack.Header.Resent)
91 {
92 // Append any ACKs that need to be sent out to this packet
93 lock (PendingAcks)
94 {
95 if (PendingAcks.Count > 0 && PendingAcks.Count < MAX_APPENDED_ACKS &&
96 Pack.Type != PacketType.PacketAck &&
97 Pack.Type != PacketType.LogoutRequest)
98 {
99 Pack.Header.AckList = new uint[PendingAcks.Count];
100 int i = 0;
101
102 foreach (uint ack in PendingAcks.Values)
103 {
104 Pack.Header.AckList[i] = ack;
105 i++;
106 }
107
108 PendingAcks.Clear();
109 Pack.Header.AppendedAcks = true;
110 }
111 }
112 }
113 }
114 }
115
116 byte[] ZeroOutBuffer = new byte[4096];
117 byte[] sendbuffer;
118 sendbuffer = Pack.ToBytes();
119
120 try
121 {
122 if (Pack.Header.Zerocoded)
123 {
124 int packetsize = Helpers.ZeroEncode(sendbuffer, sendbuffer.Length, ZeroOutBuffer);
125 m_networkServer.SendPacketTo(ZeroOutBuffer, packetsize, SocketFlags.None, CircuitCode);//userEP);
126 }
127 else
128 {
129 m_networkServer.SendPacketTo(sendbuffer, sendbuffer.Length, SocketFlags.None, CircuitCode); //userEP);
130 }
131 }
132 catch (Exception)
133 {
134 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread");
135 this.KillThread();
136 }
137
138 }
139
140 public virtual void InPacket(Packet NewPack)
141 {
142 // Handle appended ACKs
143 if (NewPack.Header.AppendedAcks)
144 {
145 lock (NeedAck)
146 {
147 foreach (uint ack in NewPack.Header.AckList)
148 {
149 NeedAck.Remove(ack);
150 }
151 }
152 }
153
154 // Handle PacketAck packets
155 if (NewPack.Type == PacketType.PacketAck)
156 {
157 PacketAckPacket ackPacket = (PacketAckPacket)NewPack;
158
159 lock (NeedAck)
160 {
161 foreach (PacketAckPacket.PacketsBlock block in ackPacket.Packets)
162 {
163 NeedAck.Remove(block.ID);
164 }
165 }
166 }
167 else if ((NewPack.Type == PacketType.StartPingCheck))
168 {
169 //reply to pingcheck
170 libsecondlife.Packets.StartPingCheckPacket startPing = (libsecondlife.Packets.StartPingCheckPacket)NewPack;
171 libsecondlife.Packets.CompletePingCheckPacket endPing = new CompletePingCheckPacket();
172 endPing.PingID.PingID = startPing.PingID.PingID;
173 OutPacket(endPing);
174 }
175 else
176 {
177 QueItem item = new QueItem();
178 item.Packet = NewPack;
179 item.Incoming = true;
180 this.PacketQueue.Enqueue(item);
181 }
182
183 }
184
185 public virtual void OutPacket(Packet NewPack)
186 {
187 QueItem item = new QueItem();
188 item.Packet = NewPack;
189 item.Incoming = false;
190 this.PacketQueue.Enqueue(item);
191 }
192
193 # region Low Level Packet Methods
194
195 protected void ack_pack(Packet Pack)
196 {
197 if (Pack.Header.Reliable)
198 {
199 libsecondlife.Packets.PacketAckPacket ack_it = new PacketAckPacket();
200 ack_it.Packets = new PacketAckPacket.PacketsBlock[1];
201 ack_it.Packets[0] = new PacketAckPacket.PacketsBlock();
202 ack_it.Packets[0].ID = Pack.Header.Sequence;
203 ack_it.Header.Reliable = false;
204
205 OutPacket(ack_it);
206
207 }
208 /*
209 if (Pack.Header.Reliable)
210 {
211 lock (PendingAcks)
212 {
213 uint sequence = (uint)Pack.Header.Sequence;
214 if (!PendingAcks.ContainsKey(sequence)) { PendingAcks[sequence] = sequence; }
215 }
216 }*/
217 }
218
219 protected void ResendUnacked()
220 {
221 int now = Environment.TickCount;
222
223 lock (NeedAck)
224 {
225 foreach (Packet packet in NeedAck.Values)
226 {
227 if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent))
228 {
229 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Resending " + packet.Type.ToString() + " packet, " +
230 (now - packet.TickCount) + "ms have passed");
231
232 packet.Header.Resent = true;
233 OutPacket(packet);
234 }
235 }
236 }
237 }
238
239 protected void SendAcks()
240 {
241 lock (PendingAcks)
242 {
243 if (PendingAcks.Count > 0)
244 {
245 if (PendingAcks.Count > 250)
246 {
247 // FIXME: Handle the odd case where we have too many pending ACKs queued up
248 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Too many ACKs queued up!");
249 return;
250 }
251
252 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("Sending PacketAck");
253
254
255 int i = 0;
256 PacketAckPacket acks = new PacketAckPacket();
257 acks.Packets = new PacketAckPacket.PacketsBlock[PendingAcks.Count];
258
259 foreach (uint ack in PendingAcks.Values)
260 {
261 acks.Packets[i] = new PacketAckPacket.PacketsBlock();
262 acks.Packets[i].ID = ack;
263 i++;
264 }
265
266 acks.Header.Reliable = false;
267 OutPacket(acks);
268
269 PendingAcks.Clear();
270 }
271 }
272 }
273
274 protected void AckTimer_Elapsed(object sender, ElapsedEventArgs ea)
275 {
276 SendAcks();
277 ResendUnacked();
278 }
279 #endregion
280
281 protected virtual void KillThread()
282 {
283
284 }
285
286 #region Nested Classes
287
288 public class QueItem
289 {
290 public QueItem()
291 {
292 }
293
294 public Packet Packet;
295 public bool Incoming;
296 }
297 #endregion
298 }
299}
diff --git a/OpenSim.RegionServer/Grid.cs b/OpenSim.RegionServer/Grid.cs
deleted file mode 100644
index db5b8fe..0000000
--- a/OpenSim.RegionServer/Grid.cs
+++ /dev/null
@@ -1,90 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.Reflection;
5using OpenSim.Framework.Interfaces;
6using OpenSim.UserServer;
7
8namespace OpenSim
9{
10 public class Grid
11 {
12 public IAssetServer AssetServer;
13 public IGridServer GridServer;
14 public IUserServer UserServer;
15 public string AssetDll = "";
16 public string GridDll = "";
17
18 public Grid()
19 {
20 }
21
22 public virtual void Initialise()
23 {
24 //load the dlls
25 this.AssetServer = this.LoadAssetDll(this.AssetDll);
26 this.GridServer = this.LoadGridDll(this.GridDll);
27 }
28 public virtual void Close()
29 {
30 this.AssetServer.Close();
31 this.GridServer.Close();
32 }
33
34 private IAssetServer LoadAssetDll(string dllName)
35 {
36 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
37 IAssetServer server = null;
38
39 foreach (Type pluginType in pluginAssembly.GetTypes())
40 {
41 if (pluginType.IsPublic)
42 {
43 if (!pluginType.IsAbstract)
44 {
45 Type typeInterface = pluginType.GetInterface("IAssetPlugin", true);
46
47 if (typeInterface != null)
48 {
49 IAssetPlugin plug = (IAssetPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
50 server = plug.GetAssetServer();
51 break;
52 }
53
54 typeInterface = null;
55 }
56 }
57 }
58 pluginAssembly = null;
59 return server;
60 }
61
62 private IGridServer LoadGridDll(string dllName)
63 {
64 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
65 IGridServer server = null;
66
67 foreach (Type pluginType in pluginAssembly.GetTypes())
68 {
69 if (pluginType.IsPublic)
70 {
71 if (!pluginType.IsAbstract)
72 {
73 Type typeInterface = pluginType.GetInterface("IGridPlugin", true);
74
75 if (typeInterface != null)
76 {
77 IGridPlugin plug = (IGridPlugin)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
78 server = plug.GetGridServer();
79 break;
80 }
81
82 typeInterface = null;
83 }
84 }
85 }
86 pluginAssembly = null;
87 return server;
88 }
89 }
90}
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.csproj b/OpenSim.RegionServer/OpenSim.RegionServer.csproj
deleted file mode 100644
index 512ee88..0000000
--- a/OpenSim.RegionServer/OpenSim.RegionServer.csproj
+++ /dev/null
@@ -1,258 +0,0 @@
1<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <ProjectType>Local</ProjectType>
4 <ProductVersion>8.0.50727</ProductVersion>
5 <SchemaVersion>2.0</SchemaVersion>
6 <ProjectGuid>{632E1BFD-0000-0000-0000-000000000000}</ProjectGuid>
7 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
8 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
9 <ApplicationIcon></ApplicationIcon>
10 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.RegionServer</AssemblyName>
13 <DefaultClientScript>JScript</DefaultClientScript>
14 <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
15 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder>
19 <RootNamespace>OpenSim.RegionServer</RootNamespace>
20 <StartupObject></StartupObject>
21 <FileUpgradeFlags>
22 </FileUpgradeFlags>
23 </PropertyGroup>
24 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
26 <BaseAddress>285212672</BaseAddress>
27 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
28 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile>
32 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize>
35 <OutputPath>..\bin\</OutputPath>
36 <RegisterForComInterop>False</RegisterForComInterop>
37 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn>
41 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
44 <BaseAddress>285212672</BaseAddress>
45 <CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
46 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile>
50 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize>
53 <OutputPath>..\bin\</OutputPath>
54 <RegisterForComInterop>False</RegisterForComInterop>
55 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn>
59 </PropertyGroup>
60 <ItemGroup>
61 <Reference Include="System" >
62 <HintPath>System.dll</HintPath>
63 <Private>False</Private>
64 </Reference>
65 <Reference Include="System.Xml" >
66 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private>
68 </Reference>
69 <Reference Include="libsecondlife.dll" >
70 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private>
72 </Reference>
73 <Reference Include="Axiom.MathLib.dll" >
74 <HintPath>..\bin\Axiom.MathLib.dll</HintPath>
75 <Private>False</Private>
76 </Reference>
77 <Reference Include="Db4objects.Db4o.dll" >
78 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
79 <Private>False</Private>
80 </Reference>
81 </ItemGroup>
82 <ItemGroup>
83 <ProjectReference Include="..\OpenSim.Terrain.BasicTerrain\OpenSim.Terrain.BasicTerrain.csproj">
84 <Name>OpenSim.Terrain.BasicTerrain</Name>
85 <Project>{2270B8FE-0000-0000-0000-000000000000}</Project>
86 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
87 <Private>False</Private>
88 </ProjectReference>
89 <ProjectReference Include="..\OpenSim.Framework\OpenSim.Framework.csproj">
90 <Name>OpenSim.Framework</Name>
91 <Project>{8ACA2445-0000-0000-0000-000000000000}</Project>
92 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
93 <Private>False</Private>
94 </ProjectReference>
95 <ProjectReference Include="..\OpenSim.Framework.Console\OpenSim.Framework.Console.csproj">
96 <Name>OpenSim.Framework.Console</Name>
97 <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
98 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
99 <Private>False</Private>
100 </ProjectReference>
101 <ProjectReference Include="..\OpenSim.GenericConfig\Xml\OpenSim.GenericConfig.Xml.csproj">
102 <Name>OpenSim.GenericConfig.Xml</Name>
103 <Project>{E88EF749-0000-0000-0000-000000000000}</Project>
104 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
105 <Private>False</Private>
106 </ProjectReference>
107 <ProjectReference Include="..\OpenSim.Physics\Manager\OpenSim.Physics.Manager.csproj">
108 <Name>OpenSim.Physics.Manager</Name>
109 <Project>{8BE16150-0000-0000-0000-000000000000}</Project>
110 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
111 <Private>False</Private>
112 </ProjectReference>
113 <ProjectReference Include="..\OpenSim.Servers\OpenSim.Servers.csproj">
114 <Name>OpenSim.Servers</Name>
115 <Project>{8BB20F0A-0000-0000-0000-000000000000}</Project>
116 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
117 <Private>False</Private>
118 </ProjectReference>
119 <ProjectReference Include="..\XmlRpcCS\XMLRPC.csproj">
120 <Name>XMLRPC</Name>
121 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
122 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
123 <Private>False</Private>
124 </ProjectReference>
125 </ItemGroup>
126 <ItemGroup>
127 <Compile Include="AgentAssetUpload.cs">
128 <SubType>Code</SubType>
129 </Compile>
130 <Compile Include="AuthenticateSessionsBase.cs">
131 <SubType>Code</SubType>
132 </Compile>
133 <Compile Include="AuthenticateSessionsLocal.cs">
134 <SubType>Code</SubType>
135 </Compile>
136 <Compile Include="AuthenticateSessionsRemote.cs">
137 <SubType>Code</SubType>
138 </Compile>
139 <Compile Include="ClientView.cs">
140 <SubType>Code</SubType>
141 </Compile>
142 <Compile Include="ClientView.Grid.cs">
143 <SubType>Code</SubType>
144 </Compile>
145 <Compile Include="ClientView.PacketHandlers.cs">
146 <SubType>Code</SubType>
147 </Compile>
148 <Compile Include="ClientView.ProcessPackets.cs">
149 <SubType>Code</SubType>
150 </Compile>
151 <Compile Include="ClientViewBase.cs">
152 <SubType>Code</SubType>
153 </Compile>
154 <Compile Include="Grid.cs">
155 <SubType>Code</SubType>
156 </Compile>
157 <Compile Include="OpenSimMain.cs">
158 <SubType>Code</SubType>
159 </Compile>
160 <Compile Include="OpenSimNetworkHandler.cs">
161 <SubType>Code</SubType>
162 </Compile>
163 <Compile Include="PacketServer.cs">
164 <SubType>Code</SubType>
165 </Compile>
166 <Compile Include="RegionInfo.cs">
167 <SubType>Code</SubType>
168 </Compile>
169 <Compile Include="RegionInfoBase.cs">
170 <SubType>Code</SubType>
171 </Compile>
172 <Compile Include="RegionServerBase.cs">
173 <SubType>Code</SubType>
174 </Compile>
175 <Compile Include="UDPServer.cs">
176 <SubType>Code</SubType>
177 </Compile>
178 <Compile Include="VersionInfo.cs">
179 <SubType>Code</SubType>
180 </Compile>
181 <Compile Include="Assets\AssetCache.cs">
182 <SubType>Code</SubType>
183 </Compile>
184 <Compile Include="Assets\InventoryCache.cs">
185 <SubType>Code</SubType>
186 </Compile>
187 <Compile Include="CAPS\AdminWebFront.cs">
188 <SubType>Code</SubType>
189 </Compile>
190 <Compile Include="types\Mesh.cs">
191 <SubType>Code</SubType>
192 </Compile>
193 <Compile Include="types\Triangle.cs">
194 <SubType>Code</SubType>
195 </Compile>
196 <Compile Include="world\Avatar.Client.cs">
197 <SubType>Code</SubType>
198 </Compile>
199 <Compile Include="world\Avatar.cs">
200 <SubType>Code</SubType>
201 </Compile>
202 <Compile Include="world\Avatar.Update.cs">
203 <SubType>Code</SubType>
204 </Compile>
205 <Compile Include="world\AvatarAnimations.cs">
206 <SubType>Code</SubType>
207 </Compile>
208 <Compile Include="world\Entity.cs">
209 <SubType>Code</SubType>
210 </Compile>
211 <Compile Include="world\Primitive.cs">
212 <SubType>Code</SubType>
213 </Compile>
214 <Compile Include="world\Primitive2.cs">
215 <SubType>Code</SubType>
216 </Compile>
217 <Compile Include="world\SceneObject.cs">
218 <SubType>Code</SubType>
219 </Compile>
220 <Compile Include="world\World.cs">
221 <SubType>Code</SubType>
222 </Compile>
223 <Compile Include="world\World.PacketHandlers.cs">
224 <SubType>Code</SubType>
225 </Compile>
226 <Compile Include="world\World.Scripting.cs">
227 <SubType>Code</SubType>
228 </Compile>
229 <Compile Include="world\WorldBase.cs">
230 <SubType>Code</SubType>
231 </Compile>
232 <Compile Include="world\scripting\IScriptContext.cs">
233 <SubType>Code</SubType>
234 </Compile>
235 <Compile Include="world\scripting\IScriptEntity.cs">
236 <SubType>Code</SubType>
237 </Compile>
238 <Compile Include="world\scripting\IScriptHandler.cs">
239 <SubType>Code</SubType>
240 </Compile>
241 <Compile Include="world\scripting\Script.cs">
242 <SubType>Code</SubType>
243 </Compile>
244 <Compile Include="world\scripting\ScriptFactory.cs">
245 <SubType>Code</SubType>
246 </Compile>
247 <Compile Include="world\scripting\Scripts\FollowRandomAvatar.cs">
248 <SubType>Code</SubType>
249 </Compile>
250 </ItemGroup>
251 <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
252 <PropertyGroup>
253 <PreBuildEvent>
254 </PreBuildEvent>
255 <PostBuildEvent>
256 </PostBuildEvent>
257 </PropertyGroup>
258</Project>
diff --git a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build b/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
deleted file mode 100644
index 4ec3537..0000000
--- a/OpenSim.RegionServer/OpenSim.RegionServer.dll.build
+++ /dev/null
@@ -1,90 +0,0 @@
1<?xml version="1.0" ?>
2<project name="OpenSim.RegionServer" default="build">
3 <target name="build">
4 <echo message="Build Directory is ${project::get-base-directory()}/${build.dir}" />
5 <mkdir dir="${project::get-base-directory()}/${build.dir}" />
6 <copy todir="${project::get-base-directory()}/${build.dir}">
7 <fileset basedir="${project::get-base-directory()}">
8 </fileset>
9 </copy>
10 <csc target="library" debug="${build.debug}" unsafe="False" define="TRACE;DEBUG" output="${project::get-base-directory()}/${build.dir}/${project::get-name()}.dll">
11 <resources prefix="OpenSim.RegionServer" dynamicprefix="true" >
12 </resources>
13 <sources failonempty="true">
14 <include name="AgentAssetUpload.cs" />
15 <include name="AuthenticateSessionsBase.cs" />
16 <include name="AuthenticateSessionsLocal.cs" />
17 <include name="AuthenticateSessionsRemote.cs" />
18 <include name="ClientView.cs" />
19 <include name="ClientView.Grid.cs" />
20 <include name="ClientView.PacketHandlers.cs" />
21 <include name="ClientView.ProcessPackets.cs" />
22 <include name="ClientViewBase.cs" />
23 <include name="Grid.cs" />
24 <include name="OpenSimMain.cs" />
25 <include name="OpenSimNetworkHandler.cs" />
26 <include name="PacketServer.cs" />
27 <include name="RegionInfo.cs" />
28 <include name="RegionInfoBase.cs" />
29 <include name="RegionServerBase.cs" />
30 <include name="UDPServer.cs" />
31 <include name="VersionInfo.cs" />
32 <include name="Assets/AssetCache.cs" />
33 <include name="Assets/InventoryCache.cs" />
34 <include name="CAPS/AdminWebFront.cs" />
35 <include name="types/Mesh.cs" />
36 <include name="types/Triangle.cs" />
37 <include name="world/Avatar.Client.cs" />
38 <include name="world/Avatar.cs" />
39 <include name="world/Avatar.Update.cs" />
40 <include name="world/AvatarAnimations.cs" />
41 <include name="world/Entity.cs" />
42 <include name="world/Primitive.cs" />
43 <include name="world/Primitive2.cs" />
44 <include name="world/SceneObject.cs" />
45 <include name="world/World.cs" />
46 <include name="world/World.PacketHandlers.cs" />
47 <include name="world/World.Scripting.cs" />
48 <include name="world/WorldBase.cs" />
49 <include name="world/scripting/IScriptContext.cs" />
50 <include name="world/scripting/IScriptEntity.cs" />
51 <include name="world/scripting/IScriptHandler.cs" />
52 <include name="world/scripting/Script.cs" />
53 <include name="world/scripting/ScriptFactory.cs" />
54 <include name="world/scripting/Scripts/FollowRandomAvatar.cs" />
55 </sources>
56 <references basedir="${project::get-base-directory()}">
57 <lib>
58 <include name="${project::get-base-directory()}" />
59 <include name="${project::get-base-directory()}/${build.dir}" />
60 </lib>
61 <include name="System.dll" />
62 <include name="System.Xml.dll" />
63 <include name="../bin/libsecondlife.dll" />
64 <include name="../bin/Axiom.MathLib.dll" />
65 <include name="../bin/Db4objects.Db4o.dll" />
66 <include name="../bin/OpenSim.Terrain.BasicTerrain.dll" />
67 <include name="../bin/OpenSim.Framework.dll" />
68 <include name="../bin/OpenSim.Framework.Console.dll" />
69 <include name="../bin/OpenSim.GenericConfig.Xml.dll" />
70 <include name="../bin/OpenSim.Physics.Manager.dll" />
71 <include name="../bin/OpenSim.Servers.dll" />
72 <include name="../bin/XMLRPC.dll" />
73 </references>
74 </csc>
75 <echo message="Copying from [${project::get-base-directory()}/${build.dir}/] to [${project::get-base-directory()}/../bin/" />
76 <mkdir dir="${project::get-base-directory()}/../bin/"/>
77 <copy todir="${project::get-base-directory()}/../bin/">
78 <fileset basedir="${project::get-base-directory()}/${build.dir}/" >
79 <include name="*.dll"/>
80 <include name="*.exe"/>
81 </fileset>
82 </copy>
83 </target>
84 <target name="clean">
85 <delete dir="${bin.dir}" failonerror="false" />
86 <delete dir="${obj.dir}" failonerror="false" />
87 </target>
88 <target name="doc" description="Creates documentation.">
89 </target>
90</project>
diff --git a/OpenSim.RegionServer/OpenSimMain.cs b/OpenSim.RegionServer/OpenSimMain.cs
deleted file mode 100644
index 003412d..0000000
--- a/OpenSim.RegionServer/OpenSimMain.cs
+++ /dev/null
@@ -1,531 +0,0 @@
1/*
2Copyright (c) OpenSim project, http://osgrid.org/
3
4* All rights reserved.
5*
6* Redistribution and use in source and binary forms, with or without
7* modification, are permitted provided that the following conditions are met:
8* * Redistributions of source code must retain the above copyright
9* notice, this list of conditions and the following disclaimer.
10* * Redistributions in binary form must reproduce the above copyright
11* notice, this list of conditions and the following disclaimer in the
12* documentation and/or other materials provided with the distribution.
13* * Neither the name of the <organization> nor the
14* names of its contributors may be used to endorse or promote products
15* derived from this software without specific prior written permission.
16*
17* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
18* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
19* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
20* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
21* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
22* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
23* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
26* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27*/
28
29using System;
30using System.Text;
31using System.IO;
32using System.Threading;
33using System.Net;
34using System.Net.Sockets;
35using System.Timers;
36using System.Reflection;
37using System.Collections;
38using System.Collections.Generic;
39using libsecondlife;
40using libsecondlife.Packets;
41using OpenSim.world;
42using OpenSim.Terrain;
43using OpenSim.Framework.Interfaces;
44using OpenSim.Framework.Types;
45using OpenSim.UserServer;
46using OpenSim.Assets;
47using OpenSim.CAPS;
48using OpenSim.Framework.Console;
49using OpenSim.Physics.Manager;
50using Nwc.XmlRpc;
51using OpenSim.Servers;
52using OpenSim.GenericConfig;
53
54namespace OpenSim
55{
56 //moved to the opensim main application project (do we want it there or here?)
57/*
58 public class OpenSimMain : OpenSimApplicationBase , conscmd_callback
59 {
60
61 public OpenSimMain(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
62 {
63 this.configFileSetup = useConfigFile;
64 m_sandbox = sandBoxMode;
65 m_loginserver = startLoginServer;
66 m_physicsEngine = physicsEngine;
67 m_config = configFile;
68
69 m_console = new ConsoleBase("region-console-" + Guid.NewGuid().ToString() + ".log", "Region", this, silent);
70 OpenSim.Framework.Console.MainConsole.Instance = m_console;
71 }
72
73 /// <summary>
74 /// Performs initialisation of the world, such as loading configuration from disk.
75 /// </summary>
76 public override void StartUp()
77 {
78 this.regionData = new RegionInfo();
79 try
80 {
81 this.localConfig = new XmlConfig(m_config);
82 this.localConfig.LoadData();
83 }
84 catch (Exception e)
85 {
86 Console.WriteLine(e.Message);
87 }
88 if (this.configFileSetup)
89 {
90 this.SetupFromConfigFile(this.localConfig);
91 }
92 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Loading configuration");
93 this.regionData.InitConfig(this.m_sandbox, this.localConfig);
94 this.localConfig.Close();//for now we can close it as no other classes read from it , but this should change
95
96 GridServers = new Grid();
97 if (m_sandbox)
98 {
99 this.SetupLocalGridServers();
100 //Authenticate Session Handler
101 AuthenticateSessionsLocal authen = new AuthenticateSessionsLocal();
102 this.AuthenticateSessionsHandler = authen;
103 }
104 else
105 {
106 this.SetupRemoteGridServers();
107 //Authenticate Session Handler
108 AuthenticateSessionsRemote authen = new AuthenticateSessionsRemote();
109 this.AuthenticateSessionsHandler = authen;
110 }
111
112 startuptime = DateTime.Now;
113
114 try
115 {
116 AssetCache = new AssetCache(GridServers.AssetServer);
117 InventoryCache = new InventoryCache();
118 }
119 catch (Exception e)
120 {
121 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup local cache");
122 Environment.Exit(1);
123 }
124
125 m_udpServer = new UDPServer(this.regionData.IPListenPort, this.GridServers, this.AssetCache, this.InventoryCache, this.regionData, this.m_sandbox, this.user_accounts, this.m_console, this.AuthenticateSessionsHandler);
126
127 //should be passing a IGenericConfig object to these so they can read the config data they want from it
128 GridServers.AssetServer.SetServerInfo(regionData.AssetURL, regionData.AssetSendKey);
129 IGridServer gridServer = GridServers.GridServer;
130 gridServer.SetServerInfo(regionData.GridURL, regionData.GridSendKey, regionData.GridRecvKey);
131
132 if (!m_sandbox)
133 {
134 this.ConnectToRemoteGridServer();
135 }
136
137 this.SetupLocalWorld();
138
139 if (m_sandbox)
140 {
141 AssetCache.LoadDefaultTextureSet();
142 }
143
144 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Initialising HTTP server");
145
146 this.SetupHttpListener();
147
148 LoginServer loginServer = null;
149 LoginServer adminLoginServer = null;
150
151 bool sandBoxWithLoginServer = m_loginserver && m_sandbox;
152 if (sandBoxWithLoginServer)
153 {
154 loginServer = new LoginServer( regionData.IPListenAddr, regionData.IPListenPort, regionData.RegionLocX, regionData.RegionLocY, this.user_accounts);
155 loginServer.Startup();
156 loginServer.SetSessionHandler(((AuthenticateSessionsLocal) this.AuthenticateSessionsHandler).AddNewSession);
157
158 if (user_accounts)
159 {
160 //sandbox mode with loginserver using accounts
161 this.GridServers.UserServer = loginServer;
162 adminLoginServer = loginServer;
163
164 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.LocalUserManager.XmlRpcLoginMethod);
165 }
166 else
167 {
168 //sandbox mode with loginserver not using accounts
169 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
170 }
171 }
172
173 AdminWebFront adminWebFront = new AdminWebFront("Admin", LocalWorld, InventoryCache, adminLoginServer);
174 adminWebFront.LoadMethods(httpServer);
175
176 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting HTTP server");
177 httpServer.Start();
178
179 //MainServerListener();
180 this.m_udpServer.ServerListener();
181
182 m_heartbeatTimer.Enabled = true;
183 m_heartbeatTimer.Interval = 100;
184 m_heartbeatTimer.Elapsed += new ElapsedEventHandler(this.Heartbeat);
185 }
186
187 # region Setup methods
188 protected virtual void SetupLocalGridServers()
189 {
190 GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
191 GridServers.GridDll = "OpenSim.GridInterfaces.Local.dll";
192
193 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Starting in Sandbox mode");
194
195 try
196 {
197 GridServers.Initialise();
198 }
199 catch (Exception e)
200 {
201 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup the grid interface");
202 Environment.Exit(1);
203 }
204 }
205
206 protected virtual void SetupRemoteGridServers()
207 {
208 if (this.gridLocalAsset)
209 {
210 GridServers.AssetDll = "OpenSim.GridInterfaces.Local.dll";
211 }
212 else
213 {
214 GridServers.AssetDll = "OpenSim.GridInterfaces.Remote.dll";
215 }
216 GridServers.GridDll = "OpenSim.GridInterfaces.Remote.dll";
217
218 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Starting in Grid mode");
219
220 try
221 {
222 GridServers.Initialise();
223 }
224 catch (Exception e)
225 {
226 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, e.Message + "\nSorry, could not setup the grid interface");
227 Environment.Exit(1);
228 }
229 }
230
231 protected virtual void SetupLocalWorld()
232 {
233 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "Main.cs:Startup() - We are " + regionData.RegionName + " at " + regionData.RegionLocX.ToString() + "," + regionData.RegionLocY.ToString());
234 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Initialising world");
235 m_console.componentname = "Region " + regionData.RegionName;
236
237 m_localWorld = new World(this.m_udpServer.PacketServer.ClientThreads, regionData, regionData.RegionHandle, regionData.RegionName);
238 LocalWorld.InventoryCache = InventoryCache;
239 LocalWorld.AssetCache = AssetCache;
240
241 this.m_udpServer.LocalWorld = LocalWorld;
242 this.m_udpServer.PacketServer.RegisterClientPacketHandlers();
243
244 this.physManager = new OpenSim.Physics.Manager.PhysicsManager();
245 this.physManager.LoadPlugins();
246
247 LocalWorld.m_datastore = this.regionData.DataStore;
248
249 LocalWorld.LoadStorageDLL("OpenSim.Storage.LocalStorageDb4o.dll"); //all these dll names shouldn't be hard coded.
250 LocalWorld.LoadWorldMap();
251
252 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Starting up messaging system");
253 LocalWorld.PhysScene = this.physManager.GetPhysicsScene(this.m_physicsEngine);
254 LocalWorld.PhysScene.SetTerrain(LocalWorld.Terrain.getHeights1D());
255 LocalWorld.LoadPrimsFromStorage();
256 }
257
258 protected virtual void SetupHttpListener()
259 {
260 httpServer = new BaseHttpServer(regionData.IPListenPort);
261
262 if (this.GridServers.GridServer.GetName() == "Remote")
263 {
264
265 // we are in Grid mode so set a XmlRpc handler to handle "expect_user" calls from the user server
266 httpServer.AddXmlRPCHandler("expect_user", ((AuthenticateSessionsRemote)this.AuthenticateSessionsHandler).ExpectUser );
267
268 httpServer.AddXmlRPCHandler("agent_crossing",
269 delegate(XmlRpcRequest request)
270 {
271 Hashtable requestData = (Hashtable)request.Params[0];
272 AgentCircuitData agent_data = new AgentCircuitData();
273 agent_data.firstname = (string)requestData["firstname"];
274 agent_data.lastname = (string)requestData["lastname"];
275 agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
276 agent_data.startpos = new LLVector3(Single.Parse((string)requestData["pos_x"]), Single.Parse((string)requestData["pos_y"]), Single.Parse((string)requestData["pos_z"]));
277
278 if (((RemoteGridBase)this.GridServers.GridServer).agentcircuits.ContainsKey((uint)agent_data.circuitcode))
279 {
280 ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[(uint)agent_data.circuitcode].firstname = agent_data.firstname;
281 ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[(uint)agent_data.circuitcode].lastname = agent_data.lastname;
282 ((RemoteGridBase)this.GridServers.GridServer).agentcircuits[(uint)agent_data.circuitcode].startpos = agent_data.startpos;
283 }
284
285 return new XmlRpcResponse();
286 });
287
288 httpServer.AddRestHandler("GET", "/simstatus/",
289 delegate(string request, string path, string param)
290 {
291 return "OK";
292 });
293 }
294 }
295
296 protected virtual void ConnectToRemoteGridServer()
297 {
298 if (GridServers.GridServer.RequestConnection(regionData.SimUUID, regionData.IPListenAddr, (uint)regionData.IPListenPort))
299 {
300 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Startup() - Success: Got a grid connection OK!");
301 }
302 else
303 {
304 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "Main.cs:Startup() - FAILED: Unable to get connection to grid. Shutting down.");
305 Shutdown();
306 }
307
308 GridServers.AssetServer.SetServerInfo((string)((RemoteGridBase)GridServers.GridServer).GridData["asset_url"], (string)((RemoteGridBase)GridServers.GridServer).GridData["asset_sendkey"]);
309
310 // If we are being told to load a file, load it.
311 string dataUri = (string)((RemoteGridBase)GridServers.GridServer).GridData["data_uri"];
312
313 if (!String.IsNullOrEmpty(dataUri))
314 {
315 this.LocalWorld.m_datastore = dataUri;
316 }
317
318 if (((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString() != "")
319 {
320 // The grid server has told us who we are
321 // We must obey the grid server.
322 try
323 {
324 regionData.RegionLocX = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locx"].ToString());
325 regionData.RegionLocY = Convert.ToUInt32(((RemoteGridBase)(GridServers.GridServer)).GridData["region_locy"].ToString());
326 regionData.RegionName = ((RemoteGridBase)(GridServers.GridServer)).GridData["regionname"].ToString();
327 }
328 catch (Exception e)
329 {
330 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, e.Message + "\nBAD ERROR! THIS SHOULD NOT HAPPEN! Bad GridData from the grid interface!!!! ZOMG!!!");
331 Environment.Exit(1);
332 }
333 }
334 }
335
336 #endregion
337
338 private void SetupFromConfigFile(IGenericConfig configData)
339 {
340 try
341 {
342 // SandBoxMode
343 string attri = "";
344 attri = configData.GetAttribute("SandBox");
345 if ((attri == "") || ((attri != "false") && (attri != "true")))
346 {
347 this.m_sandbox = false;
348 configData.SetAttribute("SandBox", "false");
349 }
350 else
351 {
352 this.m_sandbox = Convert.ToBoolean(attri);
353 }
354
355 // LoginServer
356 attri = "";
357 attri = configData.GetAttribute("LoginServer");
358 if ((attri == "") || ((attri != "false") && (attri != "true")))
359 {
360 this.m_loginserver = false;
361 configData.SetAttribute("LoginServer", "false");
362 }
363 else
364 {
365 this.m_loginserver = Convert.ToBoolean(attri);
366 }
367
368 // Sandbox User accounts
369 attri = "";
370 attri = configData.GetAttribute("UserAccount");
371 if ((attri == "") || ((attri != "false") && (attri != "true")))
372 {
373 this.user_accounts = false;
374 configData.SetAttribute("UserAccounts", "false");
375 }
376 else if (attri == "true")
377 {
378 this.user_accounts = Convert.ToBoolean(attri);
379 }
380
381 // Grid mode hack to use local asset server
382 attri = "";
383 attri = configData.GetAttribute("LocalAssets");
384 if ((attri == "") || ((attri != "false") && (attri != "true")))
385 {
386 this.gridLocalAsset = false;
387 configData.SetAttribute("LocalAssets", "false");
388 }
389 else if (attri == "true")
390 {
391 this.gridLocalAsset = Convert.ToBoolean(attri);
392 }
393
394
395 attri = "";
396 attri = configData.GetAttribute("PhysicsEngine");
397 switch (attri)
398 {
399 default:
400 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "Main.cs: SetupFromConfig() - Invalid value for PhysicsEngine attribute, terminating");
401 Environment.Exit(1);
402 break;
403
404 case "":
405 this.m_physicsEngine = "basicphysics";
406 configData.SetAttribute("PhysicsEngine", "basicphysics");
407 OpenSim.world.Avatar.PhysicsEngineFlying = false;
408 break;
409
410 case "basicphysics":
411 this.m_physicsEngine = "basicphysics";
412 configData.SetAttribute("PhysicsEngine", "basicphysics");
413 OpenSim.world.Avatar.PhysicsEngineFlying = false;
414 break;
415
416 case "RealPhysX":
417 this.m_physicsEngine = "RealPhysX";
418 OpenSim.world.Avatar.PhysicsEngineFlying = true;
419 break;
420
421 case "OpenDynamicsEngine":
422 this.m_physicsEngine = "OpenDynamicsEngine";
423 OpenSim.world.Avatar.PhysicsEngineFlying = true;
424 break;
425 }
426
427 configData.Commit();
428 }
429 catch (Exception e)
430 {
431 Console.WriteLine(e.Message);
432 Console.WriteLine("\nSorry, a fatal error occurred while trying to initialise the configuration data");
433 Console.WriteLine("Can not continue starting up");
434 Environment.Exit(1);
435 }
436 }
437
438 /// <summary>
439 /// Performs any last-minute sanity checking and shuts down the region server
440 /// </summary>
441 public virtual void Shutdown()
442 {
443 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing all threads");
444 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing listener thread");
445 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Killing clients");
446 // IMPLEMENT THIS
447 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Main.cs:Shutdown() - Closing console and terminating");
448 LocalWorld.Close();
449 GridServers.Close();
450 m_console.Close();
451 Environment.Exit(0);
452 }
453
454 /// <summary>
455 /// Performs per-frame updates regularly
456 /// </summary>
457 /// <param name="sender"></param>
458 /// <param name="e"></param>
459 void Heartbeat(object sender, System.EventArgs e)
460 {
461 LocalWorld.Update();
462 }
463
464 #region Console Commands
465 /// <summary>
466 /// Runs commands issued by the server console from the operator
467 /// </summary>
468 /// <param name="command">The first argument of the parameter (the command)</param>
469 /// <param name="cmdparams">Additional arguments passed to the command</param>
470 public void RunCmd(string command, string[] cmdparams)
471 {
472 switch (command)
473 {
474 case "help":
475 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "show users - show info about connected users");
476 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "shutdown - disconnect all clients and shutdown");
477 break;
478
479 case "show":
480 Show(cmdparams[0]);
481 break;
482
483 case "terrain":
484 string result = "";
485 if (!LocalWorld.Terrain.RunTerrainCmd(cmdparams, ref result))
486 {
487 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, result);
488 }
489 break;
490
491 case "shutdown":
492 Shutdown();
493 break;
494
495 default:
496 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "Unknown command");
497 break;
498 }
499 }
500
501 /// <summary>
502 /// Outputs to the console information about the region
503 /// </summary>
504 /// <param name="ShowWhat">What information to display (valid arguments are "uptime", "users")</param>
505 public void Show(string ShowWhat)
506 {
507 switch (ShowWhat)
508 {
509 case "uptime":
510 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "OpenSim has been running since " + startuptime.ToString());
511 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "That is " + (DateTime.Now - startuptime).ToString());
512 break;
513 case "users":
514 OpenSim.world.Avatar TempAv;
515 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}", "Firstname", "Lastname", "Agent ID", "Session ID", "Circuit", "IP"));
516 foreach (libsecondlife.LLUUID UUID in LocalWorld.Entities.Keys)
517 {
518 if (LocalWorld.Entities[UUID].ToString() == "OpenSim.world.Avatar")
519 {
520 TempAv = (OpenSim.world.Avatar)LocalWorld.Entities[UUID];
521 m_console.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}", TempAv.firstname, TempAv.lastname, UUID, TempAv.ControllingClient.SessionID, TempAv.ControllingClient.CircuitCode, TempAv.ControllingClient.userEP.ToString()));
522 }
523 }
524 break;
525 }
526 }
527 #endregion
528 }
529
530 */
531}
diff --git a/OpenSim.RegionServer/OpenSimNetworkHandler.cs b/OpenSim.RegionServer/OpenSimNetworkHandler.cs
deleted file mode 100644
index 15ee740..0000000
--- a/OpenSim.RegionServer/OpenSimNetworkHandler.cs
+++ /dev/null
@@ -1,18 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.Net;
5using System.Net.Sockets;
6using libsecondlife;
7using OpenSim.Framework.Interfaces;
8
9namespace OpenSim
10{
11 public interface OpenSimNetworkHandler
12 {
13 void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode);// EndPoint packetSender);
14 void RemoveClientCircuit(uint circuitcode);
15 void RegisterPacketServer(PacketServer server);
16 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
17 }
18}
diff --git a/OpenSim.RegionServer/PacketServer.cs b/OpenSim.RegionServer/PacketServer.cs
deleted file mode 100644
index 4ebe023..0000000
--- a/OpenSim.RegionServer/PacketServer.cs
+++ /dev/null
@@ -1,89 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.world;
5using libsecondlife.Packets;
6
7namespace OpenSim
8{
9 public class PacketServer
10 {
11 private OpenSimNetworkHandler _networkHandler;
12 private World _localWorld;
13 public Dictionary<uint, ClientView> ClientThreads = new Dictionary<uint, ClientView>();
14
15 public PacketServer(OpenSimNetworkHandler networkHandler)
16 {
17 _networkHandler = networkHandler;
18 _networkHandler.RegisterPacketServer(this);
19 }
20
21 public World LocalWorld
22 {
23 set
24 {
25 this._localWorld = value;
26 }
27 }
28
29 public virtual void ClientInPacket(uint circuitCode, Packet packet)
30 {
31 if (this.ClientThreads.ContainsKey(circuitCode))
32 {
33 ClientThreads[circuitCode].InPacket(packet);
34 }
35 }
36
37 public virtual bool AddNewCircuitCodeClient(uint circuitCode)
38 {
39 return false;
40 }
41
42 public virtual void SendPacketToAllClients(Packet packet)
43 {
44
45 }
46
47 public virtual void SendPacketToAllExcept(Packet packet, ClientView simClient)
48 {
49
50 }
51
52 public virtual void AddClientPacketHandler(PacketType packetType, PacketMethod handler)
53 {
54
55 }
56
57 public virtual void RegisterClientPacketHandlers()
58 {
59 if (this._localWorld != null)
60 {
61 ClientView.AddPacketHandler(PacketType.DeRezObject, _localWorld.DeRezObject);
62 ClientView.AddPacketHandler(PacketType.UUIDNameRequest, this.RequestUUIDName);
63 }
64 }
65
66 #region Client Packet Handlers
67
68 public bool RequestUUIDName(ClientView simClient, Packet packet)
69 {
70 System.Text.Encoding enc = System.Text.Encoding.ASCII;
71 Console.WriteLine(packet.ToString());
72 UUIDNameRequestPacket nameRequest = (UUIDNameRequestPacket)packet;
73 UUIDNameReplyPacket nameReply = new UUIDNameReplyPacket();
74 nameReply.UUIDNameBlock = new UUIDNameReplyPacket.UUIDNameBlockBlock[nameRequest.UUIDNameBlock.Length];
75
76 for (int i = 0; i < nameRequest.UUIDNameBlock.Length; i++)
77 {
78 nameReply.UUIDNameBlock[i] = new UUIDNameReplyPacket.UUIDNameBlockBlock();
79 nameReply.UUIDNameBlock[i].ID = nameRequest.UUIDNameBlock[i].ID;
80 nameReply.UUIDNameBlock[i].FirstName = enc.GetBytes("Who\0"); //for now send any name
81 nameReply.UUIDNameBlock[i].LastName = enc.GetBytes("Knows\0"); //in future need to look it up
82 }
83 simClient.OutPacket(nameReply);
84 return true;
85 }
86
87 #endregion
88 }
89}
diff --git a/OpenSim.RegionServer/RegionInfo.cs b/OpenSim.RegionServer/RegionInfo.cs
deleted file mode 100644
index f82495a..0000000
--- a/OpenSim.RegionServer/RegionInfo.cs
+++ /dev/null
@@ -1,261 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.Net;
5using System.Web;
6using System.IO;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Utilities;
9using libsecondlife;
10
11namespace OpenSim
12{
13 public class RegionInfo : RegionInfoBase
14 {
15 //following should be removed and the GenericConfig object passed around,
16 //so each class (AssetServer, GridServer etc) can access what config data they want
17 public string AssetURL = "http://127.0.0.1:8003/";
18 public string AssetSendKey = "";
19
20 public string GridURL = "";
21 public string GridSendKey = "";
22 public string GridRecvKey = "";
23 public string UserURL = "";
24 public string UserSendKey = "";
25 public string UserRecvKey = "";
26 private bool isSandbox;
27
28 public string DataStore;
29
30 public RegionInfo()
31 {
32
33 }
34
35 public void SaveToGrid()
36 {
37 //we really want to keep any server connection code out of here and out of the code code
38 // and put it in the server connection classes (those inheriting from IGridServer etc)
39 string reqtext;
40 reqtext = "<Root>";
41 reqtext += "<authkey>" + this.GridSendKey + "</authkey>";
42 reqtext += "<sim>";
43 reqtext += "<uuid>" + this.SimUUID.ToString() + "</uuid>";
44 reqtext += "<regionname>" + this.RegionName + "</regionname>";
45 reqtext += "<sim_ip>" + this.IPListenAddr + "</sim_ip>";
46 reqtext += "<sim_port>" + this.IPListenPort.ToString() + "</sim_port>";
47 reqtext += "<region_locx>" + this.RegionLocX.ToString() + "</region_locx>";
48 reqtext += "<region_locy>" + this.RegionLocY.ToString() + "</region_locy>";
49 reqtext += "<estate_id>1</estate_id>";
50 reqtext += "</sim>";
51 reqtext += "</Root>";
52
53 byte[] reqdata = (new System.Text.ASCIIEncoding()).GetBytes(reqtext);
54 string newpath = "";
55 if (this.GridURL.EndsWith("/"))
56 {
57 newpath = this.GridURL + "sims/";
58 }
59 else
60 {
61 newpath = this.GridURL + "/sims/";
62 }
63
64 WebRequest GridSaveReq = WebRequest.Create(newpath + this.SimUUID.ToString());
65 GridSaveReq.Method = "POST";
66 GridSaveReq.ContentType = "application/x-www-form-urlencoded";
67 GridSaveReq.ContentLength = reqdata.Length;
68
69 Stream stOut = GridSaveReq.GetRequestStream();
70 stOut.Write(reqdata, 0, reqdata.Length);
71 stOut.Close();
72
73 WebResponse gridresp = GridSaveReq.GetResponse();
74 StreamReader stIn = new StreamReader(gridresp.GetResponseStream(), Encoding.ASCII);
75 string GridResponse = stIn.ReadToEnd();
76 stIn.Close();
77 gridresp.Close();
78
79 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"RegionInfo.CS:SaveToGrid() - Grid said: " + GridResponse);
80 }
81
82 public void InitConfig(bool sandboxMode, IGenericConfig configData)
83 {
84 this.isSandbox = sandboxMode;
85 try
86 {
87 // Sim UUID
88 string attri = "";
89 attri = configData.GetAttribute("SimUUID");
90 if (attri == "")
91 {
92 this.SimUUID = LLUUID.Random();
93 configData.SetAttribute("SimUUID", this.SimUUID.ToString());
94 }
95 else
96 {
97 this.SimUUID = new LLUUID(attri);
98 }
99
100 // Sim name
101 attri = "";
102 attri = configData.GetAttribute("SimName");
103 if (attri == "")
104 {
105 this.RegionName = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Name", "OpenSim test");
106 configData.SetAttribute("SimName", this.RegionName);
107 }
108 else
109 {
110 this.RegionName = attri;
111 }
112 // Sim/Grid location X
113 attri = "";
114 attri = configData.GetAttribute("SimLocationX");
115 if (attri == "")
116 {
117 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location X", "997");
118 configData.SetAttribute("SimLocationX", location);
119 this.RegionLocX = (uint)Convert.ToUInt32(location);
120 }
121 else
122 {
123 this.RegionLocX = (uint)Convert.ToUInt32(attri);
124 }
125 // Sim/Grid location Y
126 attri = "";
127 attri = configData.GetAttribute("SimLocationY");
128 if (attri == "")
129 {
130 string location = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid Location Y", "996");
131 configData.SetAttribute("SimLocationY", location);
132 this.RegionLocY = (uint)Convert.ToUInt32(location);
133 }
134 else
135 {
136 this.RegionLocY = (uint)Convert.ToUInt32(attri);
137 }
138
139 // Local storage datastore
140 attri = "";
141 attri = configData.GetAttribute("Datastore");
142 if (attri == "")
143 {
144 string datastore = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Filename for local storage", "localworld.yap");
145 configData.SetAttribute("Datastore", datastore);
146 this.DataStore = datastore;
147 }
148 else
149 {
150 this.DataStore = attri;
151 }
152
153 //Sim Listen Port
154 attri = "";
155 attri = configData.GetAttribute("SimListenPort");
156 if (attri == "")
157 {
158 string port = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("UDP port for client connections", "9000");
159 configData.SetAttribute("SimListenPort", port);
160 this.IPListenPort = Convert.ToInt32(port);
161 }
162 else
163 {
164 this.IPListenPort = Convert.ToInt32(attri);
165 }
166 //Sim Listen Address
167 attri = "";
168 attri = configData.GetAttribute("SimListenAddress");
169 if (attri == "")
170 {
171 this.IPListenAddr = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("IP Address to listen on for client connections", "127.0.0.1");
172 configData.SetAttribute("SimListenAddress", this.IPListenAddr);
173 }
174 else
175 {
176 this.IPListenAddr = attri;
177 }
178
179 if (!isSandbox)
180 {
181 //shouldn't be reading this data in here, it should be up to the classes implementing the server interfaces to read what they need from the config object
182
183 //Grid Server URL
184 attri = "";
185 attri = configData.GetAttribute("GridServerURL");
186 if (attri == "")
187 {
188 this.GridURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Grid server URL","http://127.0.0.1:8001/");
189 configData.SetAttribute("GridServerURL", this.GridURL);
190 }
191 else
192 {
193 this.GridURL = attri;
194 }
195
196 //Grid Send Key
197 attri = "";
198 attri = configData.GetAttribute("GridSendKey");
199 if (attri == "")
200 {
201 this.GridSendKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to send to grid server","null");
202 configData.SetAttribute("GridSendKey", this.GridSendKey);
203 }
204 else
205 {
206 this.GridSendKey = attri;
207 }
208
209 //Grid Receive Key
210 attri = "";
211 attri = configData.GetAttribute("GridRecvKey");
212 if (attri == "")
213 {
214 this.GridRecvKey = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Key to expect from grid server","null");
215 configData.SetAttribute("GridRecvKey", this.GridRecvKey);
216 }
217 else
218 {
219 this.GridRecvKey = attri;
220 }
221
222 attri = "";
223 attri = configData.GetAttribute("AssetServerURL");
224 if (attri == "")
225 {
226 this.AssetURL = OpenSim.Framework.Console.MainConsole.Instance.CmdPrompt("Asset server URL", "http://127.0.0.1:8003/");
227 configData.SetAttribute("AssetServerURL", this.GridURL);
228 }
229 else
230 {
231 this.AssetURL = attri;
232 }
233
234 }
235 this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
236 if (!this.isSandbox)
237 {
238 this.SaveToGrid();
239 }
240 configData.Commit();
241 }
242 catch (Exception e)
243 {
244 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"Config.cs:InitConfig() - Exception occured");
245 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,e.ToString());
246 }
247
248 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Sim settings loaded:");
249 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "UUID: " + this.SimUUID.ToStringHyphenated());
250 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Name: " + this.RegionName);
251 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
252 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Region Handle: " + this.RegionHandle.ToString());
253 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Listening on IP: " + this.IPListenAddr + ":" + this.IPListenPort);
254 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Sandbox Mode? " + isSandbox.ToString());
255 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset URL: " + this.AssetURL);
256 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Asset key: " + this.AssetSendKey);
257 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid URL: " + this.GridURL);
258 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "Grid key: " + this.GridSendKey);
259 }
260 }
261}
diff --git a/OpenSim.RegionServer/RegionInfoBase.cs b/OpenSim.RegionServer/RegionInfoBase.cs
deleted file mode 100644
index 42d3030..0000000
--- a/OpenSim.RegionServer/RegionInfoBase.cs
+++ /dev/null
@@ -1,32 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.Net;
5using System.Web;
6using System.IO;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Utilities;
9using libsecondlife;
10
11namespace OpenSim
12{
13 public class RegionInfoBase
14 {
15 public LLUUID SimUUID;
16 public string RegionName;
17 public uint RegionLocX;
18 public uint RegionLocY;
19 public ulong RegionHandle;
20 public ushort RegionWaterHeight = 20;
21 public bool RegionTerraform = true;
22
23 public int IPListenPort;
24 public string IPListenAddr;
25
26 public RegionInfoBase()
27 {
28
29 }
30 }
31
32}
diff --git a/OpenSim.RegionServer/RegionServerBase.cs b/OpenSim.RegionServer/RegionServerBase.cs
deleted file mode 100644
index 69a8748..0000000
--- a/OpenSim.RegionServer/RegionServerBase.cs
+++ /dev/null
@@ -1,103 +0,0 @@
1using System;
2using System.Text;
3using System.IO;
4using System.Threading;
5using System.Net;
6using System.Net.Sockets;
7using System.Timers;
8using System.Reflection;
9using System.Collections;
10using System.Collections.Generic;
11using libsecondlife;
12using libsecondlife.Packets;
13using OpenSim.world;
14using OpenSim.Terrain;
15using OpenSim.Framework.Interfaces;
16using OpenSim.Framework.Types;
17using OpenSim.UserServer;
18using OpenSim.Assets;
19using OpenSim.CAPS;
20using OpenSim.Framework.Console;
21using OpenSim.Physics.Manager;
22using Nwc.XmlRpc;
23using OpenSim.Servers;
24using OpenSim.GenericConfig;
25
26namespace OpenSim
27{
28 public class RegionServerBase
29 {
30 protected IGenericConfig localConfig;
31 protected PhysicsManager physManager;
32 protected Grid GridServers;
33 protected AssetCache AssetCache;
34 protected InventoryCache InventoryCache;
35 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
36 protected DateTime startuptime;
37 protected RegionInfo regionData;
38
39 protected System.Timers.Timer m_heartbeatTimer = new System.Timers.Timer();
40 public string m_physicsEngine;
41 public bool m_sandbox = false;
42 public bool m_loginserver;
43 public bool user_accounts = false;
44 public bool gridLocalAsset = false;
45 protected bool configFileSetup = false;
46 public string m_config;
47
48 protected UDPServer m_udpServer;
49 protected BaseHttpServer httpServer;
50 protected AuthenticateSessionsBase AuthenticateSessionsHandler;
51
52 protected ConsoleBase m_console;
53
54 public RegionServerBase()
55 {
56
57 }
58
59 public RegionServerBase(bool sandBoxMode, bool startLoginServer, string physicsEngine, bool useConfigFile, bool silent, string configFile)
60 {
61 this.configFileSetup = useConfigFile;
62 m_sandbox = sandBoxMode;
63 m_loginserver = startLoginServer;
64 m_physicsEngine = physicsEngine;
65 m_config = configFile;
66 }
67
68 protected World m_localWorld;
69 public World LocalWorld
70 {
71 get { return m_localWorld; }
72 }
73
74 /// <summary>
75 /// Performs initialisation of the world, such as loading configuration from disk.
76 /// </summary>
77 public virtual void StartUp()
78 {
79 }
80
81 protected virtual void SetupLocalGridServers()
82 {
83 }
84
85 protected virtual void SetupRemoteGridServers()
86 {
87
88 }
89
90 protected virtual void SetupLocalWorld()
91 {
92 }
93
94 protected virtual void SetupHttpListener()
95 {
96 }
97
98 protected virtual void ConnectToRemoteGridServer()
99 {
100
101 }
102 }
103}
diff --git a/OpenSim.RegionServer/UDPServer.cs b/OpenSim.RegionServer/UDPServer.cs
deleted file mode 100644
index 3a93e66..0000000
--- a/OpenSim.RegionServer/UDPServer.cs
+++ /dev/null
@@ -1,205 +0,0 @@
1using System;
2using System.Text;
3using System.IO;
4using System.Threading;
5using System.Net;
6using System.Net.Sockets;
7using System.Timers;
8using System.Reflection;
9using System.Collections;
10using System.Collections.Generic;
11using libsecondlife;
12using libsecondlife.Packets;
13using OpenSim.world;
14using OpenSim.Terrain;
15using OpenSim.Framework.Interfaces;
16using OpenSim.Framework.Types;
17using OpenSim.UserServer;
18using OpenSim.Assets;
19using OpenSim.CAPS;
20using OpenSim.Framework.Console;
21using Nwc.XmlRpc;
22using OpenSim.Servers;
23using OpenSim.GenericConfig;
24
25namespace OpenSim
26{
27 public delegate AuthenticateResponse AuthenticateSessionHandler(LLUUID sessionID, LLUUID agentID, uint circuitCode);
28
29 public class UDPServer : OpenSimNetworkHandler
30 {
31 protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
32 public Socket Server;
33 protected IPEndPoint ServerIncoming;
34 protected byte[] RecvBuffer = new byte[4096];
35 protected byte[] ZeroBuffer = new byte[8192];
36 protected IPEndPoint ipeSender;
37 protected EndPoint epSender;
38 protected AsyncCallback ReceivedData;
39 protected PacketServer _packetServer;
40
41 protected int listenPort;
42 protected Grid m_gridServers;
43 protected World m_localWorld;
44 protected AssetCache m_assetCache;
45 protected InventoryCache m_inventoryCache;
46 protected RegionInfo m_regionData;
47 protected bool m_sandbox = false;
48 protected bool user_accounts = false;
49 protected ConsoleBase m_console;
50 protected AuthenticateSessionsBase m_authenticateSessionsClass;
51
52 public AuthenticateSessionHandler AuthenticateHandler;
53
54 public PacketServer PacketServer
55 {
56 get
57 {
58 return _packetServer;
59 }
60 set
61 {
62 _packetServer = value;
63 }
64 }
65
66 public World LocalWorld
67 {
68 set
69 {
70 this.m_localWorld = value;
71 this._packetServer.LocalWorld = this.m_localWorld;
72 }
73 }
74
75 public UDPServer()
76 {
77 }
78
79 public UDPServer(int port, Grid gridServers, AssetCache assetCache, InventoryCache inventoryCache, RegionInfo _regionData, bool sandbox, bool accounts, ConsoleBase console, AuthenticateSessionsBase authenticateClass)
80 {
81 listenPort = port;
82 this.m_gridServers = gridServers;
83 this.m_assetCache = assetCache;
84 this.m_inventoryCache = inventoryCache;
85 this.m_regionData = _regionData;
86 this.m_sandbox = sandbox;
87 this.user_accounts = accounts;
88 this.m_console = console;
89 this.m_authenticateSessionsClass = authenticateClass;
90 this.CreatePacketServer();
91
92 //set up delegate for authenticate sessions
93 this.AuthenticateHandler = new AuthenticateSessionHandler(this.m_authenticateSessionsClass.AuthenticateSession);
94 }
95
96 protected virtual void CreatePacketServer()
97 {
98 PacketServer packetServer = new PacketServer(this);
99 }
100
101 protected virtual void OnReceivedData(IAsyncResult result)
102 {
103 ipeSender = new IPEndPoint(IPAddress.Any, 0);
104 epSender = (EndPoint)ipeSender;
105 Packet packet = null;
106 int numBytes = Server.EndReceiveFrom(result, ref epSender);
107 int packetEnd = numBytes - 1;
108
109 packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
110
111 // do we already have a circuit for this endpoint
112 if (this.clientCircuits.ContainsKey(epSender))
113 {
114 //if so then send packet to the packetserver
115 this._packetServer.ClientInPacket(this.clientCircuits[epSender], packet);
116 }
117 else if (packet.Type == PacketType.UseCircuitCode)
118 {
119 // new client
120 this.AddNewClient(packet);
121 }
122 else
123 { // invalid client
124 Console.Error.WriteLine("UDPServer.cs:OnReceivedData() - WARNING: Got a packet from an invalid client - " + epSender.ToString());
125 }
126
127 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
128 }
129
130 protected virtual void AddNewClient(Packet packet)
131 {
132 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
133 this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
134 bool isChildAgent = false;
135
136 ClientView newuser = new ClientView(epSender, useCircuit, m_localWorld, _packetServer.ClientThreads, m_assetCache, m_gridServers.GridServer, this, m_inventoryCache, m_sandbox, isChildAgent, this.m_regionData, m_authenticateSessionsClass);
137 if ((this.m_gridServers.UserServer != null) && (user_accounts))
138 {
139 newuser.UserServer = this.m_gridServers.UserServer;
140 }
141 //OpenSimRoot.Instance.ClientThreads.Add(epSender, newuser);
142 this._packetServer.ClientThreads.Add(useCircuit.CircuitCode.Code, newuser);
143 }
144
145 public void ServerListener()
146 {
147 m_console.WriteLine("UDPServer.cs:ServerListener() - Opening UDP socket on " + listenPort);
148
149 ServerIncoming = new IPEndPoint(IPAddress.Any, listenPort);
150 Server = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
151 Server.Bind(ServerIncoming);
152
153 m_console.WriteLine("UDPServer.cs:ServerListener() - UDP socket bound, getting ready to listen");
154
155 ipeSender = new IPEndPoint(IPAddress.Any, 0);
156 epSender = (EndPoint)ipeSender;
157 ReceivedData = new AsyncCallback(this.OnReceivedData);
158 Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
159
160 m_console.WriteLine("UDPServer.cs:ServerListener() - Listening...");
161
162 }
163
164 public virtual void RegisterPacketServer(PacketServer server)
165 {
166 this._packetServer = server;
167 }
168
169 public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)//EndPoint packetSender)
170 {
171 // find the endpoint for this circuit
172 EndPoint sendto = null;
173 foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)
174 {
175 if (p.Value == circuitcode)
176 {
177 sendto = p.Key;
178 break;
179 }
180 }
181 if (sendto != null)
182 {
183 //we found the endpoint so send the packet to it
184 this.Server.SendTo(buffer, size, flags, sendto);
185 }
186 }
187
188 public virtual void RemoveClientCircuit(uint circuitcode)
189 {
190 foreach (KeyValuePair<EndPoint, uint> p in this.clientCircuits)
191 {
192 if (p.Value == circuitcode)
193 {
194 this.clientCircuits.Remove(p.Key);
195 break;
196 }
197 }
198 }
199
200 public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
201 {
202 return this.AuthenticateHandler(sessionID, agentID, circuitCode);
203 }
204 }
205} \ No newline at end of file
diff --git a/OpenSim.RegionServer/VersionInfo.cs b/OpenSim.RegionServer/VersionInfo.cs
deleted file mode 100644
index 49cc6a5..0000000
--- a/OpenSim.RegionServer/VersionInfo.cs
+++ /dev/null
@@ -1,37 +0,0 @@
1/*
2Copyright (c) OpenSim project, http://osgrid.org/
3*
4* Redistribution and use in source and binary forms, with or without
5* modification, are permitted provided that the following conditions are met:
6* * Redistributions of source code must retain the above copyright
7* notice, this list of conditions and the following disclaimer.
8* * Redistributions in binary form must reproduce the above copyright
9* notice, this list of conditions and the following disclaimer in the
10* documentation and/or other materials provided with the distribution.
11* * Neither the name of the <organization> nor the
12* names of its contributors may be used to endorse or promote products
13* derived from this software without specific prior written permission.
14*
15* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
16* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
17* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
18* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
19* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
20* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
21* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
22* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
24* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25*/
26
27using System;
28
29namespace OpenSim
30{
31 /// <summary>
32 /// </summary>
33 public class VersionInfo
34 {
35 public static string Version = "0.2, SVN build - please use releng if you desire any form of support";
36 }
37}
diff --git a/OpenSim.RegionServer/types/Mesh.cs b/OpenSim.RegionServer/types/Mesh.cs
deleted file mode 100644
index 3e00c91..0000000
--- a/OpenSim.RegionServer/types/Mesh.cs
+++ /dev/null
@@ -1,28 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.types
6{
7 // TODO: This will need some performance tuning no doubt.
8 public class Mesh
9 {
10 public List<Triangle> mesh;
11
12 public Mesh()
13 {
14 mesh = new List<Triangle>();
15 }
16
17 public void AddTri(Triangle tri)
18 {
19 mesh.Add(tri);
20 }
21
22 public static Mesh operator +(Mesh a, Mesh b)
23 {
24 a.mesh.AddRange(b.mesh);
25 return a;
26 }
27 }
28}
diff --git a/OpenSim.RegionServer/types/Triangle.cs b/OpenSim.RegionServer/types/Triangle.cs
deleted file mode 100644
index 8dfea6e..0000000
--- a/OpenSim.RegionServer/types/Triangle.cs
+++ /dev/null
@@ -1,28 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using Axiom.MathLib;
5
6namespace OpenSim.types
7{
8 public class Triangle
9 {
10 Vector3 a;
11 Vector3 b;
12 Vector3 c;
13
14 public Triangle()
15 {
16 a = new Vector3();
17 b = new Vector3();
18 c = new Vector3();
19 }
20
21 public Triangle(Vector3 A, Vector3 B, Vector3 C)
22 {
23 a = A;
24 b = B;
25 c = C;
26 }
27 }
28}
diff --git a/OpenSim.RegionServer/world/Avatar.Client.cs b/OpenSim.RegionServer/world/Avatar.Client.cs
deleted file mode 100644
index 7656a89..0000000
--- a/OpenSim.RegionServer/world/Avatar.Client.cs
+++ /dev/null
@@ -1,33 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife.Packets;
5
6namespace OpenSim.world
7{
8 partial class Avatar
9 {
10 private List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock> updateList = new List<ImprovedTerseObjectUpdatePacket.ObjectDataBlock>();
11 private List<Entity> interestList = new List<Entity>();
12
13 public void SendPacketToViewer(Packet packet)
14 {
15 this.ControllingClient.OutPacket(packet);
16 }
17
18 public void AddTerseUpdateToViewersList(ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock)
19 {
20
21 }
22
23 public void SendUpdateListToViewer()
24 {
25
26 }
27
28 private void UpdateInterestList()
29 {
30
31 }
32 }
33}
diff --git a/OpenSim.RegionServer/world/Avatar.Update.cs b/OpenSim.RegionServer/world/Avatar.Update.cs
deleted file mode 100644
index 266fc38..0000000
--- a/OpenSim.RegionServer/world/Avatar.Update.cs
+++ /dev/null
@@ -1,317 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5using libsecondlife.Packets;
6
7namespace OpenSim.world
8{
9 partial class Avatar
10 {
11 public override void update()
12 {
13 if (this._physActor == null)
14 {
15 //HACKHACK: Note to work out why this entity does not have a physics actor
16 // and prehaps create one.
17 return;
18 }
19 libsecondlife.LLVector3 pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);
20 if (this.updateflag)
21 {
22 //need to send movement info
23 //so create the improvedterseobjectupdate packet
24 //use CreateTerseBlock()
25 ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
26 ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
27 terse.RegionData.RegionHandle = m_regionHandle; // FIXME
28 terse.RegionData.TimeDilation = 64096;
29 terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
30 terse.ObjectData[0] = terseBlock;
31 List<Avatar> avList = this.m_world.RequestAvatarList();
32 foreach (Avatar client in avList)
33 {
34 client.SendPacketToViewer(terse);
35 }
36
37 updateflag = false;
38 //this._updateCount = 0;
39 }
40 else
41 {
42
43 if ((pos2 != this.positionLastFrame) || (this.movementflag == 16))
44 {
45 _updateCount++;
46 if (((!PhysicsEngineFlying) && (_updateCount > 3)) || (PhysicsEngineFlying) && (_updateCount > 0))
47 {
48 //It has been a while since last update was sent so lets send one.
49 ImprovedTerseObjectUpdatePacket.ObjectDataBlock terseBlock = CreateTerseBlock();
50 ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
51 terse.RegionData.RegionHandle = m_regionHandle; // FIXME
52 terse.RegionData.TimeDilation = 64096;
53 terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
54 terse.ObjectData[0] = terseBlock;
55 List<Avatar> avList = this.m_world.RequestAvatarList();
56 foreach (Avatar client in avList)
57 {
58 client.SendPacketToViewer(terse);
59 }
60 _updateCount = 0;
61 }
62
63 if (this.movementflag == 16)
64 {
65 movementflag = 0;
66 }
67 }
68
69 }
70 this.positionLastFrame = pos2;
71
72 if (!this.ControllingClient.m_sandboxMode)
73 {
74 if (pos2.X < 0)
75 {
76 ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
77 }
78
79 if (pos2.Y < 0)
80 {
81 ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
82 }
83
84 if (pos2.X > 255)
85 {
86 ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
87 }
88
89 if (pos2.Y > 255)
90 {
91 ControllingClient.CrossSimBorder(new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z));
92 }
93 }
94
95 }
96 public void SendUpdateToOtherClient(Avatar RemoteAvatar)
97 {
98 ObjectUpdatePacket objupdate = CreateUpdatePacket();
99 RemoteAvatar.SendPacketToViewer(objupdate);
100 }
101
102 public ObjectUpdatePacket CreateUpdatePacket()
103 {
104 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
105 //send a objectupdate packet with information about the clients avatar
106 ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
107 objupdate.RegionData.RegionHandle = m_regionHandle;
108 objupdate.RegionData.TimeDilation = 64096;
109 objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
110
111 objupdate.ObjectData[0] = AvatarTemplate;
112 //give this avatar object a local id and assign the user a name
113 objupdate.ObjectData[0].ID = this.localid;
114 objupdate.ObjectData[0].FullID = ControllingClient.AgentID;
115 objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");
116
117 libsecondlife.LLVector3 pos2 = new LLVector3((float)this._physActor.Position.X, (float)this._physActor.Position.Y, (float)this._physActor.Position.Z);
118
119 byte[] pb = pos2.GetBytes();
120
121 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
122 return objupdate;
123 }
124
125 public void SendInitialPosition()
126 {
127 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
128 //send a objectupdate packet with information about the clients avatar
129
130 ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
131 objupdate.RegionData.RegionHandle = m_regionHandle;
132 objupdate.RegionData.TimeDilation = 64096;
133 objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
134 objupdate.ObjectData[0] = AvatarTemplate;
135 //give this avatar object a local id and assign the user a name
136
137 objupdate.ObjectData[0].ID = this.localid;
138 this.uuid = objupdate.ObjectData[0].FullID = ControllingClient.AgentID;
139 objupdate.ObjectData[0].NameValue = _enc.GetBytes("FirstName STRING RW SV " + firstname + "\nLastName STRING RW SV " + lastname + " \0");
140 libsecondlife.LLVector3 pos2 = new LLVector3((float)this.Pos.X, (float)this.Pos.Y, (float)this.Pos.Z);
141 byte[] pb = pos2.GetBytes();
142 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 16, pb.Length);
143 m_world._localNumber++;
144
145 List<Avatar> avList = this.m_world.RequestAvatarList();
146 foreach (Avatar client in avList)
147 {
148 client.SendPacketToViewer(objupdate);
149 if (client.ControllingClient.AgentID != this.ControllingClient.AgentID)
150 {
151 SendAppearanceToOtherAgent(client);
152 }
153 }
154 }
155
156 public void SendOurAppearance()
157 {
158 ControllingClient.SendAppearance(this.Wearables);
159 }
160
161 public void SendOurAppearance(ClientView OurClient)
162 {
163 //event handler for wearables request
164 this.SendOurAppearance();
165 }
166
167 public void SendAppearanceToOtherAgent(Avatar avatarInfo)
168 {
169 AvatarAppearancePacket avp = new AvatarAppearancePacket();
170 avp.VisualParam = new AvatarAppearancePacket.VisualParamBlock[218];
171 avp.ObjectData.TextureEntry = this.avatarAppearanceTexture.ToBytes();
172
173 AvatarAppearancePacket.VisualParamBlock avblock = null;
174 for (int i = 0; i < 218; i++)
175 {
176 avblock = new AvatarAppearancePacket.VisualParamBlock();
177 avblock.ParamValue = visualParams[i];
178 avp.VisualParam[i] = avblock;
179 }
180
181 avp.Sender.IsTrial = false;
182 avp.Sender.ID = ControllingClient.AgentID;
183 avatarInfo.SendPacketToViewer(avp);
184 }
185
186 public void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam)
187 {
188 LLObject.TextureEntry tex = new LLObject.TextureEntry(texture, 0, texture.Length);
189 this.avatarAppearanceTexture = tex;
190
191 for (int i = 0; i < visualParam.Length; i++)
192 {
193 this.visualParams[i] = visualParam[i].ParamValue;
194 }
195
196 List<Avatar> avList = this.m_world.RequestAvatarList();
197 foreach (Avatar client in avList)
198 {
199 if (client.ControllingClient.AgentID != this.ControllingClient.AgentID)
200 {
201 SendAppearanceToOtherAgent(client);
202 }
203 }
204 }
205
206 public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateTerseBlock()
207 {
208 byte[] bytes = new byte[60];
209 int i = 0;
210 ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
211
212 dat.TextureEntry = new byte[0];// AvatarTemplate.TextureEntry;
213 libsecondlife.LLVector3 pos2 = new LLVector3(0, 0, 0);
214 lock (m_world.LockPhysicsEngine)
215 {
216 pos2 = new LLVector3(this._physActor.Position.X, this._physActor.Position.Y, this._physActor.Position.Z);
217 }
218
219 uint ID = this.localid;
220
221 bytes[i++] = (byte)(ID % 256);
222 bytes[i++] = (byte)((ID >> 8) % 256);
223 bytes[i++] = (byte)((ID >> 16) % 256);
224 bytes[i++] = (byte)((ID >> 24) % 256);
225 bytes[i++] = 0;
226 bytes[i++] = 1;
227 i += 14;
228 bytes[i++] = 128;
229 bytes[i++] = 63;
230
231 byte[] pb = pos2.GetBytes();
232 Array.Copy(pb, 0, bytes, i, pb.Length);
233 i += 12;
234 ushort InternVelocityX;
235 ushort InternVelocityY;
236 ushort InternVelocityZ;
237 Axiom.MathLib.Vector3 internDirec = new Axiom.MathLib.Vector3(0, 0, 0);
238 lock (m_world.LockPhysicsEngine)
239 {
240 internDirec = new Axiom.MathLib.Vector3(this._physActor.Velocity.X, this._physActor.Velocity.Y, this._physActor.Velocity.Z);
241 }
242 internDirec = internDirec / 128.0f;
243 internDirec.x += 1;
244 internDirec.y += 1;
245 internDirec.z += 1;
246
247 InternVelocityX = (ushort)(32768 * internDirec.x);
248 InternVelocityY = (ushort)(32768 * internDirec.y);
249 InternVelocityZ = (ushort)(32768 * internDirec.z);
250
251 ushort ac = 32767;
252 bytes[i++] = (byte)(InternVelocityX % 256);
253 bytes[i++] = (byte)((InternVelocityX >> 8) % 256);
254 bytes[i++] = (byte)(InternVelocityY % 256);
255 bytes[i++] = (byte)((InternVelocityY >> 8) % 256);
256 bytes[i++] = (byte)(InternVelocityZ % 256);
257 bytes[i++] = (byte)((InternVelocityZ >> 8) % 256);
258
259 //accel
260 bytes[i++] = (byte)(ac % 256);
261 bytes[i++] = (byte)((ac >> 8) % 256);
262 bytes[i++] = (byte)(ac % 256);
263 bytes[i++] = (byte)((ac >> 8) % 256);
264 bytes[i++] = (byte)(ac % 256);
265 bytes[i++] = (byte)((ac >> 8) % 256);
266
267 //rot
268 bytes[i++] = (byte)(ac % 256);
269 bytes[i++] = (byte)((ac >> 8) % 256);
270 bytes[i++] = (byte)(ac % 256);
271 bytes[i++] = (byte)((ac >> 8) % 256);
272 bytes[i++] = (byte)(ac % 256);
273 bytes[i++] = (byte)((ac >> 8) % 256);
274 bytes[i++] = (byte)(ac % 256);
275 bytes[i++] = (byte)((ac >> 8) % 256);
276
277 //rotation vel
278 bytes[i++] = (byte)(ac % 256);
279 bytes[i++] = (byte)((ac >> 8) % 256);
280 bytes[i++] = (byte)(ac % 256);
281 bytes[i++] = (byte)((ac >> 8) % 256);
282 bytes[i++] = (byte)(ac % 256);
283 bytes[i++] = (byte)((ac >> 8) % 256);
284
285 dat.Data = bytes;
286 return (dat);
287 }
288
289 // Sends animation update
290 public void SendAnimPack(LLUUID animID, int seq)
291 {
292 AvatarAnimationPacket ani = new AvatarAnimationPacket();
293 ani.AnimationSourceList = new AvatarAnimationPacket.AnimationSourceListBlock[1];
294 ani.AnimationSourceList[0] = new AvatarAnimationPacket.AnimationSourceListBlock();
295 ani.AnimationSourceList[0].ObjectID = ControllingClient.AgentID;
296 ani.Sender = new AvatarAnimationPacket.SenderBlock();
297 ani.Sender.ID = ControllingClient.AgentID;
298 ani.AnimationList = new AvatarAnimationPacket.AnimationListBlock[1];
299 ani.AnimationList[0] = new AvatarAnimationPacket.AnimationListBlock();
300 ani.AnimationList[0].AnimID = this.current_anim = animID;
301 ani.AnimationList[0].AnimSequenceID = this.anim_seq = seq;
302
303 List<Avatar> avList = this.m_world.RequestAvatarList();
304 foreach (Avatar client in avList)
305 {
306 client.SendPacketToViewer(ani);
307 }
308
309 }
310
311 public void SendAnimPack()
312 {
313 this.SendAnimPack(this.current_anim, this.anim_seq);
314 }
315
316 }
317}
diff --git a/OpenSim.RegionServer/world/Avatar.cs b/OpenSim.RegionServer/world/Avatar.cs
deleted file mode 100644
index 4e90364..0000000
--- a/OpenSim.RegionServer/world/Avatar.cs
+++ /dev/null
@@ -1,417 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.IO;
4using System.Text;
5using libsecondlife;
6using libsecondlife.Packets;
7using OpenSim.Physics.Manager;
8using OpenSim.Framework.Inventory;
9using Axiom.MathLib;
10
11namespace OpenSim.world
12{
13 public partial class Avatar : Entity
14 {
15 public static bool PhysicsEngineFlying = false;
16 public static AvatarAnimations Animations;
17 public string firstname;
18 public string lastname;
19 public ClientView ControllingClient;
20 public LLUUID current_anim;
21 public int anim_seq;
22 private static libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock AvatarTemplate;
23 private bool updateflag = false;
24 private byte movementflag = 0;
25 private List<NewForce> forcesList = new List<NewForce>();
26 private short _updateCount = 0;
27 private Axiom.MathLib.Quaternion bodyRot;
28 private LLObject.TextureEntry avatarAppearanceTexture = null;
29 private byte[] visualParams;
30 private AvatarWearable[] Wearables;
31 private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
32 private ulong m_regionHandle;
33 //private Dictionary<uint, ClientView> m_clientThreads;
34 private string m_regionName;
35 private ushort m_regionWaterHeight;
36 private bool m_regionTerraform;
37 //private bool childShadowAvatar = false;
38
39 public Avatar(ClientView TheClient, World world, string regionName, Dictionary<uint, ClientView> clientThreads, ulong regionHandle, bool regionTerraform, ushort regionWater)
40 {
41 m_world = world;
42 // m_clientThreads = clientThreads;
43 m_regionName = regionName;
44 m_regionHandle = regionHandle;
45 m_regionTerraform = regionTerraform;
46 m_regionWaterHeight = regionWater;
47
48 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs - Loading details from grid (DUMMY)");
49 ControllingClient = TheClient;
50 localid = 8880000 + (this.m_world._localNumber++);
51 Pos = ControllingClient.startpos;
52 visualParams = new byte[218];
53 for (int i = 0; i < 218; i++)
54 {
55 visualParams[i] = 100;
56 }
57 Wearables = new AvatarWearable[13]; //should be 13 of these
58 for (int i = 0; i < 13; i++)
59 {
60 Wearables[i] = new AvatarWearable();
61 }
62 this.Wearables[0].AssetID = new LLUUID("66c41e39-38f9-f75a-024e-585989bfab73");
63 this.Wearables[0].ItemID = LLUUID.Random();
64
65 this.avatarAppearanceTexture = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
66
67 //register for events
68 ControllingClient.OnRequestWearables += new ClientView.GenericCall(this.SendOurAppearance);
69 ControllingClient.OnSetAppearance += new ClientView.SetAppearance(this.SetAppearance);
70 ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.CompleteMovement);
71 ControllingClient.OnCompleteMovementToRegion += new ClientView.GenericCall2(this.SendInitialPosition);
72 ControllingClient.OnAgentUpdate += new ClientView.GenericCall3(this.HandleAgentUpdate);
73 ControllingClient.OnStartAnim += new ClientView.StartAnim(this.SendAnimPack);
74
75 }
76
77 public PhysicsActor PhysActor
78 {
79 set
80 {
81 this._physActor = value;
82 }
83 get
84 {
85 return _physActor;
86 }
87 }
88
89 public override void addForces()
90 {
91 lock (this.forcesList)
92 {
93 if (this.forcesList.Count > 0)
94 {
95 for (int i = 0; i < this.forcesList.Count; i++)
96 {
97 NewForce force = this.forcesList[i];
98 PhysicsVector phyVector = new PhysicsVector(force.X, force.Y, force.Z);
99 lock (m_world.LockPhysicsEngine)
100 {
101 this._physActor.Velocity = phyVector;
102 }
103 this.updateflag = true;
104 this.velocity = new LLVector3(force.X, force.Y, force.Z); //shouldn't really be doing this
105 // but as we are setting the velocity (rather than using real forces) at the moment it is okay.
106 }
107 for (int i = 0; i < this.forcesList.Count; i++)
108 {
109 this.forcesList.RemoveAt(0);
110 }
111 }
112 }
113 }
114
115 public static void SetupTemplate(string name)
116 {
117 FileInfo fInfo = new FileInfo(name);
118 long numBytes = fInfo.Length;
119 FileStream fStream = new FileStream(name, FileMode.Open, FileAccess.Read);
120 BinaryReader br = new BinaryReader(fStream);
121 byte[] data1 = br.ReadBytes((int)numBytes);
122 br.Close();
123 fStream.Close();
124
125 libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock objdata = new ObjectUpdatePacket.ObjectDataBlock(); // new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock(data1, ref i);
126
127 SetDefaultPacketValues(objdata);
128 objdata.TextureEntry = data1;
129 objdata.UpdateFlags = 61 + (9 << 8) + (130 << 16) + (16 << 24);
130 objdata.PathCurve = 16;
131 objdata.ProfileCurve = 1;
132 objdata.PathScaleX = 100;
133 objdata.PathScaleY = 100;
134 objdata.ParentID = 0;
135 objdata.OwnerID = LLUUID.Zero;
136 objdata.Scale = new LLVector3(1, 1, 1);
137 objdata.PCode = 47;
138 System.Text.Encoding enc = System.Text.Encoding.ASCII;
139 libsecondlife.LLVector3 pos = new LLVector3(objdata.ObjectData, 16);
140 pos.X = 100f;
141 objdata.ID = 8880000;
142 objdata.NameValue = enc.GetBytes("FirstName STRING RW SV Test \nLastName STRING RW SV User \0");
143 libsecondlife.LLVector3 pos2 = new LLVector3(100f, 100f, 23f);
144 //objdata.FullID=user.AgentID;
145 byte[] pb = pos.GetBytes();
146 Array.Copy(pb, 0, objdata.ObjectData, 16, pb.Length);
147
148 Avatar.AvatarTemplate = objdata;
149 }
150
151 protected static void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
152 {
153 objdata.PSBlock = new byte[0];
154 objdata.ExtraParams = new byte[1];
155 objdata.MediaURL = new byte[0];
156 objdata.NameValue = new byte[0];
157 objdata.Text = new byte[0];
158 objdata.TextColor = new byte[4];
159 objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
160 objdata.JointPivot = new LLVector3(0, 0, 0);
161 objdata.Material = 4;
162 objdata.TextureAnim = new byte[0];
163 objdata.Sound = LLUUID.Zero;
164 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
165 objdata.TextureEntry = ntex.ToBytes();
166 objdata.State = 0;
167 objdata.Data = new byte[0];
168
169 objdata.ObjectData = new byte[76];
170 objdata.ObjectData[15] = 128;
171 objdata.ObjectData[16] = 63;
172 objdata.ObjectData[56] = 128;
173 objdata.ObjectData[61] = 102;
174 objdata.ObjectData[62] = 40;
175 objdata.ObjectData[63] = 61;
176 objdata.ObjectData[64] = 189;
177
178
179 }
180
181 public void CompleteMovement()
182 {
183 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:CompleteMovement() - Constructing AgentMovementComplete packet");
184 AgentMovementCompletePacket mov = new AgentMovementCompletePacket();
185 mov.AgentData.SessionID = this.ControllingClient.SessionID;
186 mov.AgentData.AgentID = this.ControllingClient.AgentID;
187 mov.Data.RegionHandle = this.m_regionHandle;
188 // TODO - dynamicalise this stuff
189 mov.Data.Timestamp = 1172750370;
190 mov.Data.Position = this.ControllingClient.startpos;
191 mov.Data.LookAt = new LLVector3(0.99f, 0.042f, 0);
192
193 ControllingClient.OutPacket(mov);
194 }
195
196 public void HandleAgentUpdate(Packet pack)
197 {
198 this.HandleUpdate((AgentUpdatePacket)pack);
199 }
200
201 public void HandleUpdate(AgentUpdatePacket pack)
202 {
203 if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_FLY) != 0)
204 {
205 if (this._physActor.Flying == false)
206 {
207 this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_FLY"];
208 this.anim_seq = 1;
209 this.SendAnimPack();
210 }
211 this._physActor.Flying = true;
212
213 }
214 else
215 {
216 if (this._physActor.Flying == true)
217 {
218 this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_STAND"];
219 this.anim_seq = 1;
220 this.SendAnimPack();
221 }
222 this._physActor.Flying = false;
223 }
224 if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
225 {
226 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
227 if (((movementflag & 1) == 0) || (q != this.bodyRot))
228 {
229
230 if (((movementflag & 1) == 0) && (!this._physActor.Flying))
231 {
232 this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_WALK"];
233 this.anim_seq = 1;
234 this.SendAnimPack();
235 }
236
237
238 //we should add a new force to the list
239 // but for now we will deal with velocities
240 NewForce newVelocity = new NewForce();
241 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(1, 0, 0);
242 Axiom.MathLib.Vector3 direc = q * v3;
243 direc.Normalize();
244
245 //work out velocity for sim physics system
246 direc = direc * ((0.03f) * 128f);
247 if (this._physActor.Flying)
248 direc *= 4;
249
250 newVelocity.X = direc.x;
251 newVelocity.Y = direc.y;
252 newVelocity.Z = direc.z;
253 this.forcesList.Add(newVelocity);
254 movementflag = 1;
255 this.bodyRot = q;
256 }
257 }
258 else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_POS) != 0) && (PhysicsEngineFlying))
259 {
260 if (((movementflag & 2) == 0) && this._physActor.Flying)
261 {
262 //we should add a new force to the list
263 // but for now we will deal with velocities
264 NewForce newVelocity = new NewForce();
265 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(0, 0, 1);
266 Axiom.MathLib.Vector3 direc = v3;
267 direc.Normalize();
268
269 //work out velocity for sim physics system
270 direc = direc * ((0.03f) * 128f * 2);
271 newVelocity.X = direc.x;
272 newVelocity.Y = direc.y;
273 newVelocity.Z = direc.z;
274 this.forcesList.Add(newVelocity);
275 movementflag = 2;
276 }
277 }
278 else if ((((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_UP_NEG) != 0) && (PhysicsEngineFlying))
279 {
280 if (((movementflag & 4) == 0) && this._physActor.Flying)
281 {
282 //we should add a new force to the list
283 // but for now we will deal with velocities
284 NewForce newVelocity = new NewForce();
285 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(0, 0, -1);
286 //Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
287 Axiom.MathLib.Vector3 direc = v3;
288 direc.Normalize();
289
290 //work out velocity for sim physics system
291 direc = direc * ((0.03f) * 128f * 2);
292 newVelocity.X = direc.x;
293 newVelocity.Y = direc.y;
294 newVelocity.Z = direc.z;
295 this.forcesList.Add(newVelocity);
296 movementflag = 4;
297 }
298 }
299 else if (((uint)pack.AgentData.ControlFlags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_NEG) != 0)
300 {
301 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(pack.AgentData.BodyRotation.W, pack.AgentData.BodyRotation.X, pack.AgentData.BodyRotation.Y, pack.AgentData.BodyRotation.Z);
302 if (((movementflag & 8) == 0) || (q != this.bodyRot))
303 {
304 //we should add a new force to the list
305 // but for now we will deal with velocities
306 NewForce newVelocity = new NewForce();
307 Axiom.MathLib.Vector3 v3 = new Axiom.MathLib.Vector3(-1, 0, 0);
308 Axiom.MathLib.Vector3 direc = q * v3;
309 direc.Normalize();
310
311 //work out velocity for sim physics system
312 direc = direc * ((0.03f) * 128f);
313 if (this._physActor.Flying)
314 direc *= 2;
315
316 newVelocity.X = direc.x;
317 newVelocity.Y = direc.y;
318 newVelocity.Z = direc.z;
319 this.forcesList.Add(newVelocity);
320 movementflag = 8;
321 this.bodyRot = q;
322 }
323 }
324 else
325 {
326 if (movementflag == 16)
327 {
328 movementflag = 0;
329 }
330 if ((movementflag) != 0)
331 {
332 NewForce newVelocity = new NewForce();
333 newVelocity.X = 0;
334 newVelocity.Y = 0;
335 newVelocity.Z = 0;
336 this.forcesList.Add(newVelocity);
337 movementflag = 0;
338 // We're standing still, so make it show!
339 if (this._physActor.Flying == false)
340 {
341 this.current_anim = Animations.AnimsLLUUID["ANIM_AGENT_STAND"];
342 this.anim_seq = 1;
343 this.SendAnimPack();
344 }
345 this.movementflag = 16;
346
347 }
348 }
349 }
350
351 //really really should be moved somewhere else (RegionInfo.cs ?)
352 public void SendRegionHandshake(World RegionInfo)
353 {
354 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Creating empty RegionHandshake packet");
355 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
356 RegionHandshakePacket handshake = new RegionHandshakePacket();
357
358 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionhandshake() - Filling in RegionHandshake details");
359 handshake.RegionInfo.BillableFactor = 0;
360 handshake.RegionInfo.IsEstateManager = false;
361 handshake.RegionInfo.TerrainHeightRange00 = 60;
362 handshake.RegionInfo.TerrainHeightRange01 = 60;
363 handshake.RegionInfo.TerrainHeightRange10 = 60;
364 handshake.RegionInfo.TerrainHeightRange11 = 60;
365 handshake.RegionInfo.TerrainStartHeight00 = 10;
366 handshake.RegionInfo.TerrainStartHeight01 = 10;
367 handshake.RegionInfo.TerrainStartHeight10 = 10;
368 handshake.RegionInfo.TerrainStartHeight11 = 10;
369 handshake.RegionInfo.SimAccess = 13;
370 handshake.RegionInfo.WaterHeight = m_regionWaterHeight;
371 uint regionFlags = 72458694;
372 if (this.m_regionTerraform)
373 {
374 regionFlags -= 64;
375 }
376 handshake.RegionInfo.RegionFlags = regionFlags;
377 handshake.RegionInfo.SimName = _enc.GetBytes(m_regionName + "\0");
378 handshake.RegionInfo.SimOwner = new LLUUID("00000000-0000-0000-0000-000000000000");
379 handshake.RegionInfo.TerrainBase0 = new LLUUID("b8d3965a-ad78-bf43-699b-bff8eca6c975");
380 handshake.RegionInfo.TerrainBase1 = new LLUUID("abb783e6-3e93-26c0-248a-247666855da3");
381 handshake.RegionInfo.TerrainBase2 = new LLUUID("179cdabd-398a-9b6b-1391-4dc333ba321f");
382 handshake.RegionInfo.TerrainBase3 = new LLUUID("beb169c7-11ea-fff2-efe5-0f24dc881df2");
383 handshake.RegionInfo.TerrainDetail0 = new LLUUID("00000000-0000-0000-0000-000000000000");
384 handshake.RegionInfo.TerrainDetail1 = new LLUUID("00000000-0000-0000-0000-000000000000");
385 handshake.RegionInfo.TerrainDetail2 = new LLUUID("00000000-0000-0000-0000-000000000000");
386 handshake.RegionInfo.TerrainDetail3 = new LLUUID("00000000-0000-0000-0000-000000000000");
387 handshake.RegionInfo.CacheID = new LLUUID("545ec0a5-5751-1026-8a0b-216e38a7ab37");
388
389 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Avatar.cs:SendRegionHandshake() - Sending RegionHandshake packet");
390 this.ControllingClient.OutPacket(handshake);
391 }
392
393 public static void LoadAnims()
394 {
395 Avatar.Animations = new AvatarAnimations();
396 Avatar.Animations.LoadAnims();
397 }
398
399 public override void LandRenegerated()
400 {
401 Pos = new LLVector3(100.0f, 100.0f, m_world.Terrain[(int)Pos.X, (int)Pos.Y] + 50.0f);
402 }
403 }
404
405 public class NewForce
406 {
407 public float X;
408 public float Y;
409 public float Z;
410
411 public NewForce()
412 {
413
414 }
415 }
416
417}
diff --git a/OpenSim.RegionServer/world/AvatarAnimations.cs b/OpenSim.RegionServer/world/AvatarAnimations.cs
deleted file mode 100644
index b554af8..0000000
--- a/OpenSim.RegionServer/world/AvatarAnimations.cs
+++ /dev/null
@@ -1,163 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5
6namespace OpenSim.world
7{
8 public class AvatarAnimations
9 {
10
11 public Dictionary<string, LLUUID> AnimsLLUUID = new Dictionary<string, LLUUID>();
12 public Dictionary<LLUUID, string> AnimsNames = new Dictionary<LLUUID, string>();
13
14 public AvatarAnimations()
15 {
16 }
17
18 public void LoadAnims()
19 {
20 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Avatar.cs:LoadAnims() - Loading avatar animations");
21 AnimsLLUUID.Add("ANIM_AGENT_AFRAID", new LLUUID("6b61c8e8-4747-0d75-12d7-e49ff207a4ca"));
22 AnimsLLUUID.Add("ANIM_AGENT_AIM_BAZOOKA_R", new LLUUID("b5b4a67d-0aee-30d2-72cd-77b333e932ef"));
23 AnimsLLUUID.Add("ANIM_AGENT_AIM_BOW_L", new LLUUID("46bb4359-de38-4ed8-6a22-f1f52fe8f506"));
24 AnimsLLUUID.Add("ANIM_AGENT_AIM_HANDGUN_R", new LLUUID("3147d815-6338-b932-f011-16b56d9ac18b"));
25 AnimsLLUUID.Add("ANIM_AGENT_AIM_RIFLE_R", new LLUUID("ea633413-8006-180a-c3ba-96dd1d756720"));
26 AnimsLLUUID.Add("ANIM_AGENT_ANGRY", new LLUUID("5747a48e-073e-c331-f6f3-7c2149613d3e"));
27 AnimsLLUUID.Add("ANIM_AGENT_AWAY", new LLUUID("fd037134-85d4-f241-72c6-4f42164fedee"));
28 AnimsLLUUID.Add("ANIM_AGENT_BACKFLIP", new LLUUID("c4ca6188-9127-4f31-0158-23c4e2f93304"));
29 AnimsLLUUID.Add("ANIM_AGENT_BELLY_LAUGH", new LLUUID("18b3a4b5-b463-bd48-e4b6-71eaac76c515"));
30 AnimsLLUUID.Add("ANIM_AGENT_BLOW_KISS", new LLUUID("db84829b-462c-ee83-1e27-9bbee66bd624"));
31 AnimsLLUUID.Add("ANIM_AGENT_BORED", new LLUUID("b906c4ba-703b-1940-32a3-0c7f7d791510"));
32 AnimsLLUUID.Add("ANIM_AGENT_BOW", new LLUUID("82e99230-c906-1403-4d9c-3889dd98daba"));
33 AnimsLLUUID.Add("ANIM_AGENT_BRUSH", new LLUUID("349a3801-54f9-bf2c-3bd0-1ac89772af01"));
34 AnimsLLUUID.Add("ANIM_AGENT_BUSY", new LLUUID("efcf670c-2d18-8128-973a-034ebc806b67"));
35 AnimsLLUUID.Add("ANIM_AGENT_CLAP", new LLUUID("9b0c1c4e-8ac7-7969-1494-28c874c4f668"));
36 AnimsLLUUID.Add("ANIM_AGENT_COURTBOW", new LLUUID("9ba1c942-08be-e43a-fb29-16ad440efc50"));
37 AnimsLLUUID.Add("ANIM_AGENT_CROUCH", new LLUUID("201f3fdf-cb1f-dbec-201f-7333e328ae7c"));
38 AnimsLLUUID.Add("ANIM_AGENT_CROUCHWALK", new LLUUID("47f5f6fb-22e5-ae44-f871-73aaaf4a6022"));
39 AnimsLLUUID.Add("ANIM_AGENT_CRY", new LLUUID("92624d3e-1068-f1aa-a5ec-8244585193ed"));
40 AnimsLLUUID.Add("ANIM_AGENT_CUSTOMIZE", new LLUUID("038fcec9-5ebd-8a8e-0e2e-6e71a0a1ac53"));
41 AnimsLLUUID.Add("ANIM_AGENT_CUSTOMIZE_DONE", new LLUUID("6883a61a-b27b-5914-a61e-dda118a9ee2c"));
42 AnimsLLUUID.Add("ANIM_AGENT_DANCE1", new LLUUID("b68a3d7c-de9e-fc87-eec8-543d787e5b0d"));
43 AnimsLLUUID.Add("ANIM_AGENT_DANCE2", new LLUUID("928cae18-e31d-76fd-9cc9-2f55160ff818"));
44 AnimsLLUUID.Add("ANIM_AGENT_DANCE3", new LLUUID("30047778-10ea-1af7-6881-4db7a3a5a114"));
45 AnimsLLUUID.Add("ANIM_AGENT_DANCE4", new LLUUID("951469f4-c7b2-c818-9dee-ad7eea8c30b7"));
46 AnimsLLUUID.Add("ANIM_AGENT_DANCE5", new LLUUID("4bd69a1d-1114-a0b4-625f-84e0a5237155"));
47 AnimsLLUUID.Add("ANIM_AGENT_DANCE6", new LLUUID("cd28b69b-9c95-bb78-3f94-8d605ff1bb12"));
48 AnimsLLUUID.Add("ANIM_AGENT_DANCE7", new LLUUID("a54d8ee2-28bb-80a9-7f0c-7afbbe24a5d6"));
49 AnimsLLUUID.Add("ANIM_AGENT_DANCE8", new LLUUID("b0dc417c-1f11-af36-2e80-7e7489fa7cdc"));
50 AnimsLLUUID.Add("ANIM_AGENT_DEAD", new LLUUID("57abaae6-1d17-7b1b-5f98-6d11a6411276"));
51 AnimsLLUUID.Add("ANIM_AGENT_DRINK", new LLUUID("0f86e355-dd31-a61c-fdb0-3a96b9aad05f"));
52 AnimsLLUUID.Add("ANIM_AGENT_EMBARRASSED", new LLUUID("514af488-9051-044a-b3fc-d4dbf76377c6"));
53 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_AFRAID", new LLUUID("aa2df84d-cf8f-7218-527b-424a52de766e"));
54 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_ANGER", new LLUUID("1a03b575-9634-b62a-5767-3a679e81f4de"));
55 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_BORED", new LLUUID("214aa6c1-ba6a-4578-f27c-ce7688f61d0d"));
56 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_CRY", new LLUUID("d535471b-85bf-3b4d-a542-93bea4f59d33"));
57 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_DISDAIN", new LLUUID("d4416ff1-09d3-300f-4183-1b68a19b9fc1"));
58 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_EMBARRASSED", new LLUUID("0b8c8211-d78c-33e8-fa28-c51a9594e424"));
59 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_FROWN", new LLUUID("fee3df48-fa3d-1015-1e26-a205810e3001"));
60 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_KISS", new LLUUID("1e8d90cc-a84e-e135-884c-7c82c8b03a14"));
61 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_LAUGH", new LLUUID("62570842-0950-96f8-341c-809e65110823"));
62 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_OPEN_MOUTH", new LLUUID("d63bc1f9-fc81-9625-a0c6-007176d82eb7"));
63 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_REPULSED", new LLUUID("f76cda94-41d4-a229-2872-e0296e58afe1"));
64 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_SAD", new LLUUID("eb6ebfb2-a4b3-a19c-d388-4dd5c03823f7"));
65 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_SHRUG", new LLUUID("a351b1bc-cc94-aac2-7bea-a7e6ebad15ef"));
66 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_SMILE", new LLUUID("b7c7c833-e3d3-c4e3-9fc0-131237446312"));
67 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_SURPRISE", new LLUUID("728646d9-cc79-08b2-32d6-937f0a835c24"));
68 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_TONGUE_OUT", new LLUUID("835965c6-7f2f-bda2-5deb-2478737f91bf"));
69 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_TOOTHSMILE", new LLUUID("b92ec1a5-e7ce-a76b-2b05-bcdb9311417e"));
70 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_WINK", new LLUUID("da020525-4d94-59d6-23d7-81fdebf33148"));
71 AnimsLLUUID.Add("ANIM_AGENT_EXPRESS_WORRY", new LLUUID("9c05e5c7-6f07-6ca4-ed5a-b230390c3950"));
72 AnimsLLUUID.Add("ANIM_AGENT_FALLDOWN", new LLUUID("666307d9-a860-572d-6fd4-c3ab8865c094"));
73 AnimsLLUUID.Add("ANIM_AGENT_FEMALE_WALK", new LLUUID("f5fc7433-043d-e819-8298-f519a119b688"));
74 AnimsLLUUID.Add("ANIM_AGENT_FINGER_WAG", new LLUUID("c1bc7f36-3ba0-d844-f93c-93be945d644f"));
75 AnimsLLUUID.Add("ANIM_AGENT_FIST_PUMP", new LLUUID("7db00ccd-f380-f3ee-439d-61968ec69c8a"));
76 AnimsLLUUID.Add("ANIM_AGENT_FLY", new LLUUID("aec4610c-757f-bc4e-c092-c6e9caf18daf"));
77 AnimsLLUUID.Add("ANIM_AGENT_FLYSLOW", new LLUUID("2b5a38b2-5e00-3a97-a495-4c826bc443e6"));
78 AnimsLLUUID.Add("ANIM_AGENT_HELLO", new LLUUID("9b29cd61-c45b-5689-ded2-91756b8d76a9"));
79 AnimsLLUUID.Add("ANIM_AGENT_HOLD_BAZOOKA_R", new LLUUID("ef62d355-c815-4816-2474-b1acc21094a6"));
80 AnimsLLUUID.Add("ANIM_AGENT_HOLD_BOW_L", new LLUUID("8b102617-bcba-037b-86c1-b76219f90c88"));
81 AnimsLLUUID.Add("ANIM_AGENT_HOLD_HANDGUN_R", new LLUUID("efdc1727-8b8a-c800-4077-975fc27ee2f2"));
82 AnimsLLUUID.Add("ANIM_AGENT_HOLD_RIFLE_R", new LLUUID("3d94bad0-c55b-7dcc-8763-033c59405d33"));
83 AnimsLLUUID.Add("ANIM_AGENT_HOLD_THROW_R", new LLUUID("7570c7b5-1f22-56dd-56ef-a9168241bbb6"));
84 AnimsLLUUID.Add("ANIM_AGENT_HOVER", new LLUUID("4ae8016b-31b9-03bb-c401-b1ea941db41d"));
85 AnimsLLUUID.Add("ANIM_AGENT_HOVER_DOWN", new LLUUID("20f063ea-8306-2562-0b07-5c853b37b31e"));
86 AnimsLLUUID.Add("ANIM_AGENT_HOVER_UP", new LLUUID("62c5de58-cb33-5743-3d07-9e4cd4352864"));
87 AnimsLLUUID.Add("ANIM_AGENT_IMPATIENT", new LLUUID("5ea3991f-c293-392e-6860-91dfa01278a3"));
88 AnimsLLUUID.Add("ANIM_AGENT_JUMP", new LLUUID("2305bd75-1ca9-b03b-1faa-b176b8a8c49e"));
89 AnimsLLUUID.Add("ANIM_AGENT_JUMP_FOR_JOY", new LLUUID("709ea28e-1573-c023-8bf8-520c8bc637fa"));
90 AnimsLLUUID.Add("ANIM_AGENT_KISS_MY_BUTT", new LLUUID("19999406-3a3a-d58c-a2ac-d72e555dcf51"));
91 AnimsLLUUID.Add("ANIM_AGENT_LAND", new LLUUID("7a17b059-12b2-41b1-570a-186368b6aa6f"));
92 AnimsLLUUID.Add("ANIM_AGENT_LAUGH_SHORT", new LLUUID("ca5b3f14-3194-7a2b-c894-aa699b718d1f"));
93 AnimsLLUUID.Add("ANIM_AGENT_MEDIUM_LAND", new LLUUID("f4f00d6e-b9fe-9292-f4cb-0ae06ea58d57"));
94 AnimsLLUUID.Add("ANIM_AGENT_MOTORCYCLE_SIT", new LLUUID("08464f78-3a8e-2944-cba5-0c94aff3af29"));
95 AnimsLLUUID.Add("ANIM_AGENT_MUSCLE_BEACH", new LLUUID("315c3a41-a5f3-0ba4-27da-f893f769e69b"));
96 AnimsLLUUID.Add("ANIM_AGENT_NO", new LLUUID("5a977ed9-7f72-44e9-4c4c-6e913df8ae74"));
97 AnimsLLUUID.Add("ANIM_AGENT_NO_UNHAPPY", new LLUUID("d83fa0e5-97ed-7eb2-e798-7bd006215cb4"));
98 AnimsLLUUID.Add("ANIM_AGENT_NYAH_NYAH", new LLUUID("f061723d-0a18-754f-66ee-29a44795a32f"));
99 AnimsLLUUID.Add("ANIM_AGENT_ONETWO_PUNCH", new LLUUID("eefc79be-daae-a239-8c04-890f5d23654a"));
100 AnimsLLUUID.Add("ANIM_AGENT_PEACE", new LLUUID("b312b10e-65ab-a0a4-8b3c-1326ea8e3ed9"));
101 AnimsLLUUID.Add("ANIM_AGENT_POINT_ME", new LLUUID("17c024cc-eef2-f6a0-3527-9869876d7752"));
102 AnimsLLUUID.Add("ANIM_AGENT_POINT_YOU", new LLUUID("ec952cca-61ef-aa3b-2789-4d1344f016de"));
103 AnimsLLUUID.Add("ANIM_AGENT_PRE_JUMP", new LLUUID("7a4e87fe-de39-6fcb-6223-024b00893244"));
104 AnimsLLUUID.Add("ANIM_AGENT_PUNCH_LEFT", new LLUUID("f3300ad9-3462-1d07-2044-0fef80062da0"));
105 AnimsLLUUID.Add("ANIM_AGENT_PUNCH_RIGHT", new LLUUID("c8e42d32-7310-6906-c903-cab5d4a34656"));
106 AnimsLLUUID.Add("ANIM_AGENT_REPULSED", new LLUUID("36f81a92-f076-5893-dc4b-7c3795e487cf"));
107 AnimsLLUUID.Add("ANIM_AGENT_ROUNDHOUSE_KICK", new LLUUID("49aea43b-5ac3-8a44-b595-96100af0beda"));
108 AnimsLLUUID.Add("ANIM_AGENT_RPS_COUNTDOWN", new LLUUID("35db4f7e-28c2-6679-cea9-3ee108f7fc7f"));
109 AnimsLLUUID.Add("ANIM_AGENT_RPS_PAPER", new LLUUID("0836b67f-7f7b-f37b-c00a-460dc1521f5a"));
110 AnimsLLUUID.Add("ANIM_AGENT_RPS_ROCK", new LLUUID("42dd95d5-0bc6-6392-f650-777304946c0f"));
111 AnimsLLUUID.Add("ANIM_AGENT_RPS_SCISSORS", new LLUUID("16803a9f-5140-e042-4d7b-d28ba247c325"));
112 AnimsLLUUID.Add("ANIM_AGENT_RUN", new LLUUID("05ddbff8-aaa9-92a1-2b74-8fe77a29b445"));
113 AnimsLLUUID.Add("ANIM_AGENT_SAD", new LLUUID("0eb702e2-cc5a-9a88-56a5-661a55c0676a"));
114 AnimsLLUUID.Add("ANIM_AGENT_SALUTE", new LLUUID("cd7668a6-7011-d7e2-ead8-fc69eff1a104"));
115 AnimsLLUUID.Add("ANIM_AGENT_SHOOT_BOW_L", new LLUUID("e04d450d-fdb5-0432-fd68-818aaf5935f8"));
116 AnimsLLUUID.Add("ANIM_AGENT_SHOUT", new LLUUID("6bd01860-4ebd-127a-bb3d-d1427e8e0c42"));
117 AnimsLLUUID.Add("ANIM_AGENT_SHRUG", new LLUUID("70ea714f-3a97-d742-1b01-590a8fcd1db5"));
118 AnimsLLUUID.Add("ANIM_AGENT_SIT", new LLUUID("1a5fe8ac-a804-8a5d-7cbd-56bd83184568"));
119 AnimsLLUUID.Add("ANIM_AGENT_SIT_FEMALE", new LLUUID("b1709c8d-ecd3-54a1-4f28-d55ac0840782"));
120 AnimsLLUUID.Add("ANIM_AGENT_SIT_GENERIC", new LLUUID("245f3c54-f1c0-bf2e-811f-46d8eeb386e7"));
121 AnimsLLUUID.Add("ANIM_AGENT_SIT_GROUND", new LLUUID("1c7600d6-661f-b87b-efe2-d7421eb93c86"));
122 AnimsLLUUID.Add("ANIM_AGENT_SIT_GROUND_CONSTRAINED", new LLUUID("1a2bd58e-87ff-0df8-0b4c-53e047b0bb6e"));
123 AnimsLLUUID.Add("ANIM_AGENT_SIT_TO_STAND", new LLUUID("a8dee56f-2eae-9e7a-05a2-6fb92b97e21e"));
124 AnimsLLUUID.Add("ANIM_AGENT_SLEEP", new LLUUID("f2bed5f9-9d44-39af-b0cd-257b2a17fe40"));
125 AnimsLLUUID.Add("ANIM_AGENT_SMOKE_IDLE", new LLUUID("d2f2ee58-8ad1-06c9-d8d3-3827ba31567a"));
126 AnimsLLUUID.Add("ANIM_AGENT_SMOKE_INHALE", new LLUUID("6802d553-49da-0778-9f85-1599a2266526"));
127 AnimsLLUUID.Add("ANIM_AGENT_SMOKE_THROW_DOWN", new LLUUID("0a9fb970-8b44-9114-d3a9-bf69cfe804d6"));
128 AnimsLLUUID.Add("ANIM_AGENT_SNAPSHOT", new LLUUID("eae8905b-271a-99e2-4c0e-31106afd100c"));
129 AnimsLLUUID.Add("ANIM_AGENT_STAND", new LLUUID("2408fe9e-df1d-1d7d-f4ff-1384fa7b350f"));
130 AnimsLLUUID.Add("ANIM_AGENT_STANDUP", new LLUUID("3da1d753-028a-5446-24f3-9c9b856d9422"));
131 AnimsLLUUID.Add("ANIM_AGENT_STAND_1", new LLUUID("15468e00-3400-bb66-cecc-646d7c14458e"));
132 AnimsLLUUID.Add("ANIM_AGENT_STAND_2", new LLUUID("370f3a20-6ca6-9971-848c-9a01bc42ae3c"));
133 AnimsLLUUID.Add("ANIM_AGENT_STAND_3", new LLUUID("42b46214-4b44-79ae-deb8-0df61424ff4b"));
134 AnimsLLUUID.Add("ANIM_AGENT_STAND_4", new LLUUID("f22fed8b-a5ed-2c93-64d5-bdd8b93c889f"));
135 AnimsLLUUID.Add("ANIM_AGENT_STRETCH", new LLUUID("80700431-74ec-a008-14f8-77575e73693f"));
136 AnimsLLUUID.Add("ANIM_AGENT_STRIDE", new LLUUID("1cb562b0-ba21-2202-efb3-30f82cdf9595"));
137 AnimsLLUUID.Add("ANIM_AGENT_SURF", new LLUUID("41426836-7437-7e89-025d-0aa4d10f1d69"));
138 AnimsLLUUID.Add("ANIM_AGENT_SURPRISE", new LLUUID("313b9881-4302-73c0-c7d0-0e7a36b6c224"));
139 AnimsLLUUID.Add("ANIM_AGENT_SWORD_STRIKE", new LLUUID("85428680-6bf9-3e64-b489-6f81087c24bd"));
140 AnimsLLUUID.Add("ANIM_AGENT_TALK", new LLUUID("5c682a95-6da4-a463-0bf6-0f5b7be129d1"));
141 AnimsLLUUID.Add("ANIM_AGENT_TANTRUM", new LLUUID("11000694-3f41-adc2-606b-eee1d66f3724"));
142 AnimsLLUUID.Add("ANIM_AGENT_THROW_R", new LLUUID("aa134404-7dac-7aca-2cba-435f9db875ca"));
143 AnimsLLUUID.Add("ANIM_AGENT_TRYON_SHIRT", new LLUUID("83ff59fe-2346-f236-9009-4e3608af64c1"));
144 AnimsLLUUID.Add("ANIM_AGENT_TURNLEFT", new LLUUID("56e0ba0d-4a9f-7f27-6117-32f2ebbf6135"));
145 AnimsLLUUID.Add("ANIM_AGENT_TURNRIGHT", new LLUUID("2d6daa51-3192-6794-8e2e-a15f8338ec30"));
146 AnimsLLUUID.Add("ANIM_AGENT_TYPE", new LLUUID("c541c47f-e0c0-058b-ad1a-d6ae3a4584d9"));
147 AnimsLLUUID.Add("ANIM_AGENT_WALK", new LLUUID("6ed24bd8-91aa-4b12-ccc7-c97c857ab4e0"));
148 AnimsLLUUID.Add("ANIM_AGENT_WHISPER", new LLUUID("7693f268-06c7-ea71-fa21-2b30d6533f8f"));
149 AnimsLLUUID.Add("ANIM_AGENT_WHISTLE", new LLUUID("b1ed7982-c68e-a982-7561-52a88a5298c0"));
150 AnimsLLUUID.Add("ANIM_AGENT_WINK", new LLUUID("869ecdad-a44b-671e-3266-56aef2e3ac2e"));
151 AnimsLLUUID.Add("ANIM_AGENT_WINK_HOLLYWOOD", new LLUUID("c0c4030f-c02b-49de-24ba-2331f43fe41c"));
152 AnimsLLUUID.Add("ANIM_AGENT_WORRY", new LLUUID("9f496bd2-589a-709f-16cc-69bf7df1d36c"));
153 AnimsLLUUID.Add("ANIM_AGENT_YES", new LLUUID("15dd911d-be82-2856-26db-27659b142875"));
154 AnimsLLUUID.Add("ANIM_AGENT_YES_HAPPY", new LLUUID("b8c8b2a3-9008-1771-3bfc-90924955ab2d"));
155 AnimsLLUUID.Add("ANIM_AGENT_YOGA_FLOAT", new LLUUID("42ecd00b-9947-a97c-400a-bbc9174c7aeb"));
156
157 foreach (KeyValuePair<string, LLUUID> kp in OpenSim.world.Avatar.Animations.AnimsLLUUID)
158 {
159 AnimsNames.Add(kp.Value, kp.Key);
160 }
161 }
162 }
163}
diff --git a/OpenSim.RegionServer/world/Entity.cs b/OpenSim.RegionServer/world/Entity.cs
deleted file mode 100644
index 96e039a..0000000
--- a/OpenSim.RegionServer/world/Entity.cs
+++ /dev/null
@@ -1,124 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using Axiom.MathLib;
5using OpenSim.Physics.Manager;
6using OpenSim.types;
7using libsecondlife;
8using OpenSim.RegionServer.world.scripting;
9
10namespace OpenSim.world
11{
12 public abstract class Entity : IScriptReadonlyEntity
13 {
14 public libsecondlife.LLUUID uuid;
15 public uint localid;
16 public LLVector3 velocity;
17 public Quaternion rotation;
18 protected List<Entity> children;
19
20 protected string m_name;
21 public virtual string Name
22 {
23 get { return m_name; }
24 }
25
26 protected LLVector3 m_pos;
27 protected PhysicsActor _physActor;
28 protected World m_world;
29
30 public virtual LLVector3 Pos
31 {
32 get
33 {
34 if (this._physActor != null)
35 {
36 m_pos.X = _physActor.Position.X;
37 m_pos.Y = _physActor.Position.Y;
38 m_pos.Z = _physActor.Position.Z;
39 }
40
41 return m_pos;
42 }
43 set
44 {
45 if (this._physActor != null)
46 {
47 try
48 {
49 lock (this.m_world.LockPhysicsEngine)
50 {
51
52 this._physActor.Position = new PhysicsVector(value.X, value.Y, value.Z);
53 }
54 }
55 catch (Exception e)
56 {
57 Console.WriteLine(e.Message);
58 }
59 }
60
61 m_pos = value;
62 }
63 }
64
65 /// <summary>
66 /// Creates a new Entity (should not occur on it's own)
67 /// </summary>
68 public Entity()
69 {
70 uuid = new libsecondlife.LLUUID();
71 localid = 0;
72 m_pos = new LLVector3();
73 velocity = new LLVector3();
74 rotation = new Quaternion();
75 m_name = "(basic entity)";
76 children = new List<Entity>();
77 }
78
79 public virtual void addForces()
80 {
81 foreach (Entity child in children)
82 {
83 child.addForces();
84 }
85 }
86
87 /// <summary>
88 /// Performs any updates that need to be done at each frame. This function is overridable from it's children.
89 /// </summary>
90 public virtual void update() {
91 // Do any per-frame updates needed that are applicable to every type of entity
92 foreach (Entity child in children)
93 {
94 child.update();
95 }
96 }
97
98 /// <summary>
99 /// Returns a mesh for this object and any dependents
100 /// </summary>
101 /// <returns>The mesh of this entity tree</returns>
102 public virtual Mesh getMesh()
103 {
104 Mesh mesh = new Mesh();
105
106 foreach (Entity child in children)
107 {
108 mesh += child.getMesh();
109 }
110
111 return mesh;
112 }
113
114 public virtual void BackUp()
115 {
116
117 }
118
119 public virtual void LandRenegerated()
120 {
121
122 }
123 }
124}
diff --git a/OpenSim.RegionServer/world/Primitive.cs b/OpenSim.RegionServer/world/Primitive.cs
deleted file mode 100644
index e048a9e..0000000
--- a/OpenSim.RegionServer/world/Primitive.cs
+++ /dev/null
@@ -1,570 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.types;
5using libsecondlife;
6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Physics.Manager;
9using OpenSim.Framework.Types;
10
11namespace OpenSim.world
12{
13 public class Primitive : Entity
14 {
15 protected float mesh_cutbegin;
16 protected float mesh_cutend;
17 protected PrimData primData;
18 protected bool newPrimFlag = false;
19 protected bool updateFlag = false;
20 protected bool dirtyFlag = false;
21 private ObjectUpdatePacket OurPacket;
22 private bool physicsEnabled = false;
23 private bool physicstest = false;
24 private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
25 private Dictionary<uint, ClientView> m_clientThreads;
26 private ulong m_regionHandle;
27 private const uint FULL_MASK_PERMISSIONS = 2147483647;
28
29 public bool PhysicsEnabled
30 {
31 get
32 {
33 return physicsEnabled;
34 }
35 set
36 {
37 physicsEnabled = value;
38 }
39 }
40 public bool UpdateFlag
41 {
42 get
43 {
44 return updateFlag;
45 }
46 set
47 {
48 updateFlag = value;
49 }
50 }
51 public LLVector3 Scale
52 {
53 set
54 {
55 LLVector3 offset = (value - primData.Scale);
56 offset.X /= 2;
57 offset.Y /= 2;
58 offset.Z /= 2;
59
60 this.primData.Position += offset;
61 this.primData.Scale = value;
62
63 this.dirtyFlag = true;
64 }
65 get
66 {
67 return this.primData.Scale;
68 }
69 }
70 public PhysicsActor PhysActor
71 {
72 set
73 {
74 this._physActor = value;
75 }
76 }
77
78 public Primitive(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world)
79 {
80 mesh_cutbegin = 0.0f;
81 mesh_cutend = 1.0f;
82
83 m_clientThreads = clientThreads;
84 m_regionHandle = regionHandle;
85 m_world = world;
86 }
87
88 public override Mesh getMesh()
89 {
90 Mesh mesh = new Mesh();
91 Triangle tri = new Triangle(
92 new Axiom.MathLib.Vector3(0.0f, 1.0f, 1.0f),
93 new Axiom.MathLib.Vector3(1.0f, 0.0f, 1.0f),
94 new Axiom.MathLib.Vector3(1.0f, 1.0f, 0.0f));
95
96 mesh.AddTri(tri);
97 mesh += base.getMesh();
98
99 return mesh;
100 }
101
102 public byte[] GetByteArray()
103 {
104 return this.primData.ToBytes();
105 }
106
107 public void GetProperites(ClientView client)
108 {
109 ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
110 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
111 proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
112 proper.ObjectData[0].ItemID = LLUUID.Zero; // this.uuid;
113 proper.ObjectData[0].CreationDate = (ulong) this.primData.CreationDate;
114 proper.ObjectData[0].CreatorID = this.primData.OwnerID;
115 proper.ObjectData[0].FolderID = LLUUID.Zero;
116 proper.ObjectData[0].FromTaskID = LLUUID.Zero;
117 proper.ObjectData[0].GroupID = LLUUID.Zero;
118 proper.ObjectData[0].InventorySerial = 0;
119 proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
120 proper.ObjectData[0].ObjectID = this.uuid;
121 proper.ObjectData[0].OwnerID = primData.OwnerID;
122 proper.ObjectData[0].TouchName = new byte[0];
123 proper.ObjectData[0].TextureID = new byte[0];
124 proper.ObjectData[0].SitName = new byte[0];
125 proper.ObjectData[0].Name = new byte[0];
126 proper.ObjectData[0].Description = new byte[0];
127 proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
128 proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
129 proper.ObjectData[0].GroupMask = this.primData.GroupMask;
130 proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
131 proper.ObjectData[0].BaseMask = this.primData.BaseMask;
132
133 client.OutPacket(proper);
134 }
135
136 public void UpdatePosition(LLVector3 pos)
137 {
138 this.Pos = pos;
139 if (this._physActor != null) // && this.physicsEnabled)
140 {
141 try
142 {
143 lock (m_world.LockPhysicsEngine)
144 {
145 this._physActor.Position = new PhysicsVector(pos.X, pos.Y, pos.Z);
146 }
147 }
148 catch (Exception e)
149 {
150 Console.WriteLine(e.Message);
151 }
152 }
153 this.updateFlag = true;
154 }
155
156 public override void update()
157 {
158 LLVector3 pos2 = new LLVector3(0, 0, 0);
159 if (this._physActor != null && this.physicsEnabled)
160 {
161
162 PhysicsVector pPos = this._physActor.Position;
163 pos2 = new LLVector3(pPos.X, pPos.Y, pPos.Z);
164 }
165 if (this.newPrimFlag)
166 {
167 foreach (ClientView client in m_clientThreads.Values)
168 {
169 client.OutPacket(OurPacket);
170 }
171 this.newPrimFlag = false;
172 }
173 else if (this.updateFlag)
174 {
175 ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
176 terse.RegionData.RegionHandle = m_regionHandle; // FIXME
177 terse.RegionData.TimeDilation = 64096;
178 terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
179 terse.ObjectData[0] = this.CreateImprovedBlock();
180 foreach (ClientView client in m_clientThreads.Values)
181 {
182 client.OutPacket(terse);
183 }
184 this.updateFlag = false;
185 }
186 else if (this.dirtyFlag)
187 {
188 foreach (ClientView client in m_clientThreads.Values)
189 {
190 UpdateClient(client);
191 }
192 this.dirtyFlag = false;
193 }
194 else
195 {
196 if (this._physActor != null && this.physicsEnabled)
197 {
198 if (pos2 != this.positionLastFrame)
199 {
200 ImprovedTerseObjectUpdatePacket terse = new ImprovedTerseObjectUpdatePacket();
201 terse.RegionData.RegionHandle = m_regionHandle; // FIXME
202 terse.RegionData.TimeDilation = 64096;
203 terse.ObjectData = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock[1];
204 terse.ObjectData[0] = this.CreateImprovedBlock();
205 foreach (ClientView client in m_clientThreads.Values)
206 {
207 client.OutPacket(terse);
208 }
209 }
210 this.positionLastFrame = pos2;
211 }
212 }
213
214 if (this.physicstest)
215 {
216 LLVector3 pos = this.Pos;
217 pos.Z += 0.0001f;
218 this.UpdatePosition(pos);
219 this.physicstest = false;
220 }
221 }
222
223 public void UpdateClient(ClientView RemoteClient)
224 {
225
226 LLVector3 lPos;
227 if (this._physActor != null && this.physicsEnabled)
228 {
229 PhysicsVector pPos = this._physActor.Position;
230 lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
231 }
232 else
233 {
234 lPos = this.Pos;
235 }
236 byte[] pb = lPos.GetBytes();
237 Array.Copy(pb, 0, OurPacket.ObjectData[0].ObjectData, 0, pb.Length);
238
239 // OurPacket should be update with the follwing in updateShape() rather than having to do it here
240 OurPacket.ObjectData[0].OwnerID = this.primData.OwnerID;
241 OurPacket.ObjectData[0].PCode = this.primData.PCode;
242 OurPacket.ObjectData[0].PathBegin = this.primData.PathBegin;
243 OurPacket.ObjectData[0].PathEnd = this.primData.PathEnd;
244 OurPacket.ObjectData[0].PathScaleX = this.primData.PathScaleX;
245 OurPacket.ObjectData[0].PathScaleY = this.primData.PathScaleY;
246 OurPacket.ObjectData[0].PathShearX = this.primData.PathShearX;
247 OurPacket.ObjectData[0].PathShearY = this.primData.PathShearY;
248 OurPacket.ObjectData[0].PathSkew = this.primData.PathSkew;
249 OurPacket.ObjectData[0].ProfileBegin = this.primData.ProfileBegin;
250 OurPacket.ObjectData[0].ProfileEnd = this.primData.ProfileEnd;
251 OurPacket.ObjectData[0].Scale = this.primData.Scale;
252 OurPacket.ObjectData[0].PathCurve = this.primData.PathCurve;
253 OurPacket.ObjectData[0].ProfileCurve = this.primData.ProfileCurve;
254 OurPacket.ObjectData[0].ParentID = this.primData.ParentID ;
255 OurPacket.ObjectData[0].ProfileHollow = this.primData.ProfileHollow;
256 //finish off copying rest of shape data
257 OurPacket.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset;
258 OurPacket.ObjectData[0].PathRevolutions = this.primData.PathRevolutions;
259 OurPacket.ObjectData[0].PathTaperX = this.primData.PathTaperX;
260 OurPacket.ObjectData[0].PathTaperY = this.primData.PathTaperY;
261 OurPacket.ObjectData[0].PathTwist = this.primData.PathTwist;
262 OurPacket.ObjectData[0].PathTwistBegin = this.primData.PathTwistBegin;
263
264 RemoteClient.OutPacket(OurPacket);
265 }
266
267 public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
268 {
269 this.primData.PathBegin = addPacket.PathBegin;
270 this.primData.PathEnd = addPacket.PathEnd;
271 this.primData.PathScaleX = addPacket.PathScaleX;
272 this.primData.PathScaleY = addPacket.PathScaleY;
273 this.primData.PathShearX = addPacket.PathShearX;
274 this.primData.PathShearY = addPacket.PathShearY;
275 this.primData.PathSkew = addPacket.PathSkew;
276 this.primData.ProfileBegin = addPacket.ProfileBegin;
277 this.primData.ProfileEnd = addPacket.ProfileEnd;
278 this.primData.PathCurve = addPacket.PathCurve;
279 this.primData.ProfileCurve = addPacket.ProfileCurve;
280 this.primData.ProfileHollow = addPacket.ProfileHollow;
281 this.primData.PathRadiusOffset = addPacket.PathRadiusOffset;
282 this.primData.PathRevolutions = addPacket.PathRevolutions;
283 this.primData.PathTaperX = addPacket.PathTaperX;
284 this.primData.PathTaperY = addPacket.PathTaperY;
285 this.primData.PathTwist = addPacket.PathTwist;
286 this.primData.PathTwistBegin = addPacket.PathTwistBegin;
287 this.dirtyFlag = true;
288 }
289
290 public void UpdateTexture(byte[] tex)
291 {
292 this.OurPacket.ObjectData[0].TextureEntry = tex;
293 this.primData.Texture = tex;
294 this.dirtyFlag = true;
295 }
296
297 public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
298 {
299 if (this._physActor != null)
300 {
301 if (this._physActor.Kinematic == pack.AgentData.UsePhysics)
302 {
303 this._physActor.Kinematic = !pack.AgentData.UsePhysics; //if Usephysics = true, then Kinematic should = false
304 }
305 this.physicsEnabled = pack.AgentData.UsePhysics;
306 if (this._physActor.Kinematic == false)
307 {
308 LLVector3 pos = this.Pos;
309 this.UpdatePosition(pos);
310 pos.Z += 0.000001f;
311 this.UpdatePosition(pos);
312 this.physicstest = true;
313 }
314 else
315 {
316 PhysicsVector vec = this._physActor.Position;
317 LLVector3 pos = new LLVector3(vec.X, vec.Y, vec.Z);
318 this.Pos = pos;
319 this.updateFlag = true;
320 }
321 }
322 }
323
324 public void MakeParent(Primitive prim)
325 {
326 this.primData.ParentID = prim.localid;
327 this.Pos -= prim.Pos;
328 this.dirtyFlag = true;
329 }
330
331 public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
332 {
333 ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
334 objupdate.RegionData.RegionHandle = m_regionHandle;
335 objupdate.RegionData.TimeDilation = 64096;
336
337 objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
338 PrimData PData = new PrimData();
339 this.primData = PData;
340 this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
341
342 objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();
343 objupdate.ObjectData[0].PSBlock = new byte[0];
344 objupdate.ObjectData[0].ExtraParams = new byte[1];
345 objupdate.ObjectData[0].MediaURL = new byte[0];
346 objupdate.ObjectData[0].NameValue = new byte[0];
347 objupdate.ObjectData[0].Text = new byte[0];
348 objupdate.ObjectData[0].TextColor = new byte[4];
349 objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0);
350 objupdate.ObjectData[0].JointPivot = new LLVector3(0, 0, 0);
351 objupdate.ObjectData[0].Material = 3;
352 objupdate.ObjectData[0].UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
353 objupdate.ObjectData[0].TextureAnim = new byte[0];
354 objupdate.ObjectData[0].Sound = LLUUID.Zero;
355 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
356 this.primData.Texture = objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();
357 objupdate.ObjectData[0].State = 0;
358 objupdate.ObjectData[0].Data = new byte[0];
359 PData.OwnerID = objupdate.ObjectData[0].OwnerID = ownerID;
360 PData.PCode = objupdate.ObjectData[0].PCode = addPacket.ObjectData.PCode;
361 PData.PathBegin = objupdate.ObjectData[0].PathBegin = addPacket.ObjectData.PathBegin;
362 PData.PathEnd = objupdate.ObjectData[0].PathEnd = addPacket.ObjectData.PathEnd;
363 PData.PathScaleX = objupdate.ObjectData[0].PathScaleX = addPacket.ObjectData.PathScaleX;
364 PData.PathScaleY = objupdate.ObjectData[0].PathScaleY = addPacket.ObjectData.PathScaleY;
365 PData.PathShearX = objupdate.ObjectData[0].PathShearX = addPacket.ObjectData.PathShearX;
366 PData.PathShearY = objupdate.ObjectData[0].PathShearY = addPacket.ObjectData.PathShearY;
367 PData.PathSkew = objupdate.ObjectData[0].PathSkew = addPacket.ObjectData.PathSkew;
368 PData.ProfileBegin = objupdate.ObjectData[0].ProfileBegin = addPacket.ObjectData.ProfileBegin;
369 PData.ProfileEnd = objupdate.ObjectData[0].ProfileEnd = addPacket.ObjectData.ProfileEnd;
370 PData.Scale = objupdate.ObjectData[0].Scale = addPacket.ObjectData.Scale;
371 PData.PathCurve = objupdate.ObjectData[0].PathCurve = addPacket.ObjectData.PathCurve;
372 PData.ProfileCurve = objupdate.ObjectData[0].ProfileCurve = addPacket.ObjectData.ProfileCurve;
373 PData.ParentID = objupdate.ObjectData[0].ParentID = 0;
374 PData.ProfileHollow = objupdate.ObjectData[0].ProfileHollow = addPacket.ObjectData.ProfileHollow;
375 PData.PathRadiusOffset = objupdate.ObjectData[0].PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
376 PData.PathRevolutions = objupdate.ObjectData[0].PathRevolutions = addPacket.ObjectData.PathRevolutions;
377 PData.PathTaperX = objupdate.ObjectData[0].PathTaperX = addPacket.ObjectData.PathTaperX;
378 PData.PathTaperY = objupdate.ObjectData[0].PathTaperY = addPacket.ObjectData.PathTaperY;
379 PData.PathTwist = objupdate.ObjectData[0].PathTwist = addPacket.ObjectData.PathTwist;
380 PData.PathTwistBegin = objupdate.ObjectData[0].PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
381 objupdate.ObjectData[0].ID = (uint)(localID);
382 objupdate.ObjectData[0].FullID = new LLUUID("edba7151-5857-acc5-b30b-f01efef" + (localID - 702000).ToString("00000"));
383 objupdate.ObjectData[0].ObjectData = new byte[60];
384 objupdate.ObjectData[0].ObjectData[46] = 128;
385 objupdate.ObjectData[0].ObjectData[47] = 63;
386 LLVector3 pos1 = addPacket.ObjectData.RayEnd;
387 //update position
388 byte[] pb = pos1.GetBytes();
389 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
390 this.newPrimFlag = true;
391 this.primData.FullID = this.uuid = objupdate.ObjectData[0].FullID;
392 this.localid = objupdate.ObjectData[0].ID;
393 this.primData.Position = this.Pos = pos1;
394 this.OurPacket = objupdate;
395 }
396
397 public void CreateFromStorage(PrimData store)
398 {
399 this.CreateFromStorage(store, store.Position, store.LocalID, false);
400 }
401
402 public void CreateFromStorage(PrimData store, LLVector3 posi, uint localID, bool newprim)
403 {
404 //need to clean this up as it shares a lot of code with CreateFromPacket()
405 ObjectUpdatePacket objupdate = new ObjectUpdatePacket();
406 objupdate.RegionData.RegionHandle = m_regionHandle;
407 objupdate.RegionData.TimeDilation = 64096;
408 objupdate.ObjectData = new libsecondlife.Packets.ObjectUpdatePacket.ObjectDataBlock[1];
409
410 this.primData = store;
411 objupdate.ObjectData[0] = new ObjectUpdatePacket.ObjectDataBlock();
412 objupdate.ObjectData[0].PSBlock = new byte[0];
413 objupdate.ObjectData[0].ExtraParams = new byte[1];
414 objupdate.ObjectData[0].MediaURL = new byte[0];
415 objupdate.ObjectData[0].NameValue = new byte[0];
416 objupdate.ObjectData[0].Text = new byte[0];
417 objupdate.ObjectData[0].TextColor = new byte[4];
418 objupdate.ObjectData[0].JointAxisOrAnchor = new LLVector3(0, 0, 0);
419 objupdate.ObjectData[0].JointPivot = new LLVector3(0, 0, 0);
420 objupdate.ObjectData[0].Material = 3;
421 objupdate.ObjectData[0].UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
422 objupdate.ObjectData[0].TextureAnim = new byte[0];
423 objupdate.ObjectData[0].Sound = LLUUID.Zero;
424
425 if (store.Texture == null)
426 {
427 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
428 objupdate.ObjectData[0].TextureEntry = ntex.ToBytes();
429 }
430 else
431 {
432 objupdate.ObjectData[0].TextureEntry = store.Texture;
433 }
434
435 objupdate.ObjectData[0].State = 0;
436 objupdate.ObjectData[0].Data = new byte[0];
437 objupdate.ObjectData[0].OwnerID = this.primData.OwnerID;
438 objupdate.ObjectData[0].PCode = this.primData.PCode;
439 objupdate.ObjectData[0].PathBegin = this.primData.PathBegin;
440 objupdate.ObjectData[0].PathEnd = this.primData.PathEnd;
441 objupdate.ObjectData[0].PathScaleX = this.primData.PathScaleX;
442 objupdate.ObjectData[0].PathScaleY = this.primData.PathScaleY;
443 objupdate.ObjectData[0].PathShearX = this.primData.PathShearX;
444 objupdate.ObjectData[0].PathShearY = this.primData.PathShearY;
445 objupdate.ObjectData[0].PathSkew = this.primData.PathSkew;
446 objupdate.ObjectData[0].ProfileBegin = this.primData.ProfileBegin;
447 objupdate.ObjectData[0].ProfileEnd = this.primData.ProfileEnd;
448 objupdate.ObjectData[0].Scale = this.primData.Scale;
449 objupdate.ObjectData[0].PathCurve = this.primData.PathCurve;
450 objupdate.ObjectData[0].ProfileCurve = this.primData.ProfileCurve;
451 objupdate.ObjectData[0].ParentID = 0;
452 objupdate.ObjectData[0].ProfileHollow = this.primData.ProfileHollow;
453 //finish off copying rest of shape data
454 objupdate.ObjectData[0].PathRadiusOffset = this.primData.PathRadiusOffset;
455 objupdate.ObjectData[0].PathRevolutions = this.primData.PathRevolutions;
456 objupdate.ObjectData[0].PathTaperX = this.primData.PathTaperX;
457 objupdate.ObjectData[0].PathTaperY = this.primData.PathTaperY;
458 objupdate.ObjectData[0].PathTwist = this.primData.PathTwist;
459 objupdate.ObjectData[0].PathTwistBegin = this.primData.PathTwistBegin;
460
461 objupdate.ObjectData[0].ID = localID; // (uint)store.LocalID;
462 objupdate.ObjectData[0].FullID = store.FullID;
463
464 objupdate.ObjectData[0].ObjectData = new byte[60];
465 objupdate.ObjectData[0].ObjectData[46] = 128;
466 objupdate.ObjectData[0].ObjectData[47] = 63;
467 LLVector3 pos1 = posi; // store.Position;
468 //update position
469 byte[] pb = pos1.GetBytes();
470 Array.Copy(pb, 0, objupdate.ObjectData[0].ObjectData, 0, pb.Length);
471
472 this.uuid = objupdate.ObjectData[0].FullID;
473 this.localid = objupdate.ObjectData[0].ID;
474 this.Pos = pos1;
475 this.OurPacket = objupdate;
476 if (newprim)
477 {
478 this.newPrimFlag = true;
479 }
480 }
481
482 public ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()
483 {
484 uint ID = this.localid;
485 byte[] bytes = new byte[60];
486
487 int i = 0;
488 ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
489 //dat.TextureEntry = this.OurPacket.ObjectData[0].TextureEntry;
490 dat.TextureEntry = new byte[0];
491 //Console.WriteLine("texture-entry length in improvedterse block is " + this.OurPacket.ObjectData[0].TextureEntry.Length);
492 bytes[i++] = (byte)(ID % 256);
493 bytes[i++] = (byte)((ID >> 8) % 256);
494 bytes[i++] = (byte)((ID >> 16) % 256);
495 bytes[i++] = (byte)((ID >> 24) % 256);
496 bytes[i++] = 0;
497 bytes[i++] = 0;
498
499 LLVector3 lPos;
500 Axiom.MathLib.Quaternion lRot;
501 if (this._physActor != null && this.physicsEnabled)
502 {
503 PhysicsVector pPos = this._physActor.Position;
504 lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
505 lRot = this._physActor.Orientation;
506 }
507 else
508 {
509 lPos = this.Pos;
510 lRot = this.rotation;
511 }
512 byte[] pb = lPos.GetBytes();
513 Array.Copy(pb, 0, bytes, i, pb.Length);
514 i += 12;
515 ushort ac = 32767;
516
517 //vel
518 bytes[i++] = (byte)(ac % 256);
519 bytes[i++] = (byte)((ac >> 8) % 256);
520 bytes[i++] = (byte)(ac % 256);
521 bytes[i++] = (byte)((ac >> 8) % 256);
522 bytes[i++] = (byte)(ac % 256);
523 bytes[i++] = (byte)((ac >> 8) % 256);
524
525 //accel
526 bytes[i++] = (byte)(ac % 256);
527 bytes[i++] = (byte)((ac >> 8) % 256);
528 bytes[i++] = (byte)(ac % 256);
529 bytes[i++] = (byte)((ac >> 8) % 256);
530 bytes[i++] = (byte)(ac % 256);
531 bytes[i++] = (byte)((ac >> 8) % 256);
532
533 ushort rw, rx, ry, rz;
534 rw = (ushort)(32768 * (lRot.w + 1));
535 rx = (ushort)(32768 * (lRot.x + 1));
536 ry = (ushort)(32768 * (lRot.y + 1));
537 rz = (ushort)(32768 * (lRot.z + 1));
538
539 //rot
540 bytes[i++] = (byte)(rx % 256);
541 bytes[i++] = (byte)((rx >> 8) % 256);
542 bytes[i++] = (byte)(ry % 256);
543 bytes[i++] = (byte)((ry >> 8) % 256);
544 bytes[i++] = (byte)(rz % 256);
545 bytes[i++] = (byte)((rz >> 8) % 256);
546 bytes[i++] = (byte)(rw % 256);
547 bytes[i++] = (byte)((rw >> 8) % 256);
548
549 //rotation vel
550 bytes[i++] = (byte)(ac % 256);
551 bytes[i++] = (byte)((ac >> 8) % 256);
552 bytes[i++] = (byte)(ac % 256);
553 bytes[i++] = (byte)((ac >> 8) % 256);
554 bytes[i++] = (byte)(ac % 256);
555 bytes[i++] = (byte)((ac >> 8) % 256);
556
557 dat.Data = bytes;
558 return dat;
559 }
560
561 public override void BackUp()
562 {
563 this.primData.FullID = this.uuid;
564 this.primData.LocalID = this.localid;
565 this.primData.Position = this.Pos;
566 this.primData.Rotation = new LLQuaternion(this.rotation.x, this.rotation.y, this.rotation.z, this.rotation.w);
567 this.m_world.localStorage.StorePrim(this.primData);
568 }
569 }
570}
diff --git a/OpenSim.RegionServer/world/Primitive2.cs b/OpenSim.RegionServer/world/Primitive2.cs
deleted file mode 100644
index 6d071d4..0000000
--- a/OpenSim.RegionServer/world/Primitive2.cs
+++ /dev/null
@@ -1,491 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.types;
5using libsecondlife;
6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Physics.Manager;
9using OpenSim.Framework.Types;
10using OpenSim.Framework.Inventory;
11
12namespace OpenSim.world
13{
14 public class Primitive2 : Entity
15 {
16 protected PrimData primData;
17 //private ObjectUpdatePacket OurPacket;
18 private LLVector3 positionLastFrame = new LLVector3(0, 0, 0);
19 private Dictionary<uint, ClientView> m_clientThreads;
20 private ulong m_regionHandle;
21 private const uint FULL_MASK_PERMISSIONS = 2147483647;
22 private bool physicsEnabled = false;
23
24 private Dictionary<LLUUID, InventoryItem> inventoryItems;
25
26 #region Properties
27
28 public LLVector3 Scale
29 {
30 set
31 {
32 this.primData.Scale = value;
33 //this.dirtyFlag = true;
34 }
35 get
36 {
37 return this.primData.Scale;
38 }
39 }
40
41 public PhysicsActor PhysActor
42 {
43 set
44 {
45 this._physActor = value;
46 }
47 }
48 public override LLVector3 Pos
49 {
50 get
51 {
52 return base.Pos;
53 }
54 set
55 {
56 base.Pos = value;
57 }
58 }
59 #endregion
60
61 public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world)
62 {
63 m_clientThreads = clientThreads;
64 m_regionHandle = regionHandle;
65 m_world = world;
66 inventoryItems = new Dictionary<LLUUID, InventoryItem>();
67 }
68
69 public Primitive2(Dictionary<uint, ClientView> clientThreads, ulong regionHandle, World world, LLUUID owner)
70 {
71 m_clientThreads = clientThreads;
72 m_regionHandle = regionHandle;
73 m_world = world;
74 inventoryItems = new Dictionary<LLUUID, InventoryItem>();
75 this.primData = new PrimData();
76 this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
77 this.primData.OwnerID = owner;
78 }
79
80 public byte[] GetByteArray()
81 {
82 byte[] result = null;
83 List<byte[]> dataArrays = new List<byte[]>();
84 dataArrays.Add(primData.ToBytes());
85 foreach (Entity child in children)
86 {
87 if (child is OpenSim.world.Primitive2)
88 {
89 dataArrays.Add(((OpenSim.world.Primitive2)child).GetByteArray());
90 }
91 }
92 byte[] primstart = Helpers.StringToField("<Prim>");
93 byte[] primend = Helpers.StringToField("</Prim>");
94 int totalLength = primstart.Length + primend.Length;
95 for (int i = 0; i < dataArrays.Count; i++)
96 {
97 totalLength += dataArrays[i].Length;
98 }
99
100 result = new byte[totalLength];
101 int arraypos = 0;
102 Array.Copy(primstart, 0, result, 0, primstart.Length);
103 arraypos += primstart.Length;
104 for (int i = 0; i < dataArrays.Count; i++)
105 {
106 Array.Copy(dataArrays[i], 0, result, arraypos, dataArrays[i].Length);
107 arraypos += dataArrays[i].Length;
108 }
109 Array.Copy(primend, 0, result, arraypos, primend.Length);
110
111 return result;
112 }
113
114 #region Overridden Methods
115
116 public override void update()
117 {
118 LLVector3 pos2 = new LLVector3(0, 0, 0);
119 }
120
121 public override void BackUp()
122 {
123
124 }
125
126 #endregion
127
128 #region Packet handlers
129
130 public void UpdatePosition(LLVector3 pos)
131 {
132
133 }
134
135 public void UpdateShape(ObjectShapePacket.ObjectDataBlock addPacket)
136 {
137 this.primData.PathBegin = addPacket.PathBegin;
138 this.primData.PathEnd = addPacket.PathEnd;
139 this.primData.PathScaleX = addPacket.PathScaleX;
140 this.primData.PathScaleY = addPacket.PathScaleY;
141 this.primData.PathShearX = addPacket.PathShearX;
142 this.primData.PathShearY = addPacket.PathShearY;
143 this.primData.PathSkew = addPacket.PathSkew;
144 this.primData.ProfileBegin = addPacket.ProfileBegin;
145 this.primData.ProfileEnd = addPacket.ProfileEnd;
146 this.primData.PathCurve = addPacket.PathCurve;
147 this.primData.ProfileCurve = addPacket.ProfileCurve;
148 this.primData.ProfileHollow = addPacket.ProfileHollow;
149 this.primData.PathRadiusOffset = addPacket.PathRadiusOffset;
150 this.primData.PathRevolutions = addPacket.PathRevolutions;
151 this.primData.PathTaperX = addPacket.PathTaperX;
152 this.primData.PathTaperY = addPacket.PathTaperY;
153 this.primData.PathTwist = addPacket.PathTwist;
154 this.primData.PathTwistBegin = addPacket.PathTwistBegin;
155 }
156
157 public void UpdateTexture(byte[] tex)
158 {
159 this.primData.Texture = tex;
160 //this.dirtyFlag = true;
161 }
162
163 public void UpdateObjectFlags(ObjectFlagUpdatePacket pack)
164 {
165
166 }
167
168 public void AssignToParent(Primitive prim)
169 {
170
171 }
172
173 public void GetProperites(ClientView client)
174 {
175 ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
176 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
177 proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
178 proper.ObjectData[0].ItemID = LLUUID.Zero;
179 proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate;
180 proper.ObjectData[0].CreatorID = this.primData.OwnerID;
181 proper.ObjectData[0].FolderID = LLUUID.Zero;
182 proper.ObjectData[0].FromTaskID = LLUUID.Zero;
183 proper.ObjectData[0].GroupID = LLUUID.Zero;
184 proper.ObjectData[0].InventorySerial = 0;
185 proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
186 proper.ObjectData[0].ObjectID = this.uuid;
187 proper.ObjectData[0].OwnerID = primData.OwnerID;
188 proper.ObjectData[0].TouchName = new byte[0];
189 proper.ObjectData[0].TextureID = new byte[0];
190 proper.ObjectData[0].SitName = new byte[0];
191 proper.ObjectData[0].Name = new byte[0];
192 proper.ObjectData[0].Description = new byte[0];
193 proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
194 proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
195 proper.ObjectData[0].GroupMask = this.primData.GroupMask;
196 proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
197 proper.ObjectData[0].BaseMask = this.primData.BaseMask;
198
199 client.OutPacket(proper);
200 }
201
202 #endregion
203
204 # region Inventory Methods
205
206 public bool AddToInventory(InventoryItem item)
207 {
208 return false;
209 }
210
211 public InventoryItem RemoveFromInventory(LLUUID itemID)
212 {
213 return null;
214 }
215
216 public void RequestInventoryInfo(ClientView simClient, RequestTaskInventoryPacket packet)
217 {
218
219 }
220
221 public void RequestXferInventory(ClientView simClient, ulong xferID)
222 {
223 //will only currently work if the total size of the inventory data array is under about 1000 bytes
224 SendXferPacketPacket send = new SendXferPacketPacket();
225
226 send.XferID.ID = xferID;
227 send.XferID.Packet = 1 + 2147483648;
228 send.DataPacket.Data = this.ConvertInventoryToBytes();
229
230 simClient.OutPacket(send);
231 }
232
233 public byte[] ConvertInventoryToBytes()
234 {
235 System.Text.Encoding enc = System.Text.Encoding.ASCII;
236 byte[] result = new byte[0];
237 List<byte[]> inventoryData = new List<byte[]>();
238 int totallength = 0;
239 foreach (InventoryItem invItem in inventoryItems.Values)
240 {
241 byte[] data = enc.GetBytes(invItem.ExportString());
242 inventoryData.Add(data);
243 totallength += data.Length;
244 }
245 //TODO: copy arrays into the single result array
246
247 return result;
248 }
249
250 public void CreateInventoryFromBytes(byte[] data)
251 {
252
253 }
254
255 #endregion
256
257 #region Update viewers Methods
258
259 //should change these mehtods, so that outgoing packets are sent through the avatar class
260 public void SendFullUpdateToClient(ClientView remoteClient)
261 {
262 LLVector3 lPos;
263 if (this._physActor != null && this.physicsEnabled)
264 {
265 PhysicsVector pPos = this._physActor.Position;
266 lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
267 }
268 else
269 {
270 lPos = this.Pos;
271 }
272
273 ObjectUpdatePacket outPacket = new ObjectUpdatePacket();
274 outPacket.ObjectData = new ObjectUpdatePacket.ObjectDataBlock[1];
275 outPacket.ObjectData[0] = this.CreateUpdateBlock();
276 byte[] pb = lPos.GetBytes();
277 Array.Copy(pb, 0, outPacket.ObjectData[0].ObjectData, 0, pb.Length);
278
279 remoteClient.OutPacket(outPacket);
280 }
281
282 public void SendFullUpdateToAllClients()
283 {
284
285 }
286
287 public void SendTerseUpdateToClient(ClientView RemoteClient)
288 {
289
290 }
291
292 public void SendTerseUpdateToALLClients()
293 {
294
295 }
296
297 #endregion
298
299 #region Create Methods
300
301 public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID ownerID, uint localID)
302 {
303 PrimData PData = new PrimData();
304 this.primData = PData;
305 this.primData.CreationDate = (Int32)(DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalSeconds;
306
307 PData.OwnerID = ownerID;
308 PData.PCode = addPacket.ObjectData.PCode;
309 PData.PathBegin = addPacket.ObjectData.PathBegin;
310 PData.PathEnd = addPacket.ObjectData.PathEnd;
311 PData.PathScaleX = addPacket.ObjectData.PathScaleX;
312 PData.PathScaleY = addPacket.ObjectData.PathScaleY;
313 PData.PathShearX = addPacket.ObjectData.PathShearX;
314 PData.PathShearY = addPacket.ObjectData.PathShearY;
315 PData.PathSkew = addPacket.ObjectData.PathSkew;
316 PData.ProfileBegin = addPacket.ObjectData.ProfileBegin;
317 PData.ProfileEnd = addPacket.ObjectData.ProfileEnd;
318 PData.Scale = addPacket.ObjectData.Scale;
319 PData.PathCurve = addPacket.ObjectData.PathCurve;
320 PData.ProfileCurve = addPacket.ObjectData.ProfileCurve;
321 PData.ParentID = 0;
322 PData.ProfileHollow = addPacket.ObjectData.ProfileHollow;
323 PData.PathRadiusOffset = addPacket.ObjectData.PathRadiusOffset;
324 PData.PathRevolutions = addPacket.ObjectData.PathRevolutions;
325 PData.PathTaperX = addPacket.ObjectData.PathTaperX;
326 PData.PathTaperY = addPacket.ObjectData.PathTaperY;
327 PData.PathTwist = addPacket.ObjectData.PathTwist;
328 PData.PathTwistBegin = addPacket.ObjectData.PathTwistBegin;
329 LLVector3 pos1 = addPacket.ObjectData.RayEnd;
330 this.primData.FullID = this.uuid = LLUUID.Random();
331 this.localid = (uint)(localID);
332 this.primData.Position = this.Pos = pos1;
333 }
334
335 public void CreateFromBytes(byte[] data)
336 {
337
338 }
339
340 public void CreateFromPrimData(PrimData primData)
341 {
342 this.CreateFromPrimData(primData, primData.Position, primData.LocalID, false);
343 }
344
345 public void CreateFromPrimData(PrimData primData, LLVector3 posi, uint localID, bool newprim)
346 {
347
348 }
349
350 #endregion
351
352 #region Packet Update Methods
353 protected void SetDefaultPacketValues(ObjectUpdatePacket.ObjectDataBlock objdata)
354 {
355 objdata.PSBlock = new byte[0];
356 objdata.ExtraParams = new byte[1];
357 objdata.MediaURL = new byte[0];
358 objdata.NameValue = new byte[0];
359 objdata.Text = new byte[0];
360 objdata.TextColor = new byte[4];
361 objdata.JointAxisOrAnchor = new LLVector3(0, 0, 0);
362 objdata.JointPivot = new LLVector3(0, 0, 0);
363 objdata.Material = 3;
364 objdata.TextureAnim = new byte[0];
365 objdata.Sound = LLUUID.Zero;
366 LLObject.TextureEntry ntex = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-5005-000000000005"));
367 this.primData.Texture = objdata.TextureEntry = ntex.ToBytes();
368 objdata.State = 0;
369 objdata.Data = new byte[0];
370
371 objdata.ObjectData = new byte[60];
372 objdata.ObjectData[46] = 128;
373 objdata.ObjectData[47] = 63;
374 }
375
376 protected void SetPacketShapeData(ObjectUpdatePacket.ObjectDataBlock objectData)
377 {
378 objectData.OwnerID = this.primData.OwnerID;
379 objectData.PCode = this.primData.PCode;
380 objectData.PathBegin = this.primData.PathBegin;
381 objectData.PathEnd = this.primData.PathEnd;
382 objectData.PathScaleX = this.primData.PathScaleX;
383 objectData.PathScaleY = this.primData.PathScaleY;
384 objectData.PathShearX = this.primData.PathShearX;
385 objectData.PathShearY = this.primData.PathShearY;
386 objectData.PathSkew = this.primData.PathSkew;
387 objectData.ProfileBegin = this.primData.ProfileBegin;
388 objectData.ProfileEnd = this.primData.ProfileEnd;
389 objectData.Scale = this.primData.Scale;
390 objectData.PathCurve = this.primData.PathCurve;
391 objectData.ProfileCurve = this.primData.ProfileCurve;
392 objectData.ParentID = this.primData.ParentID;
393 objectData.ProfileHollow = this.primData.ProfileHollow;
394 objectData.PathRadiusOffset = this.primData.PathRadiusOffset;
395 objectData.PathRevolutions = this.primData.PathRevolutions;
396 objectData.PathTaperX = this.primData.PathTaperX;
397 objectData.PathTaperY = this.primData.PathTaperY;
398 objectData.PathTwist = this.primData.PathTwist;
399 objectData.PathTwistBegin = this.primData.PathTwistBegin;
400 }
401
402 #endregion
403 protected ObjectUpdatePacket.ObjectDataBlock CreateUpdateBlock()
404 {
405 ObjectUpdatePacket.ObjectDataBlock objupdate = new ObjectUpdatePacket.ObjectDataBlock();
406 this.SetDefaultPacketValues(objupdate);
407 objupdate.UpdateFlags = 32 + 65536 + 131072 + 256 + 4 + 8 + 2048 + 524288 + 268435456;
408 this.SetPacketShapeData(objupdate);
409 byte[] pb = this.Pos.GetBytes();
410 Array.Copy(pb, 0, objupdate.ObjectData, 0, pb.Length);
411 return objupdate;
412 }
413
414 protected ImprovedTerseObjectUpdatePacket.ObjectDataBlock CreateImprovedBlock()
415 {
416 uint ID = this.localid;
417 byte[] bytes = new byte[60];
418
419 int i = 0;
420 ImprovedTerseObjectUpdatePacket.ObjectDataBlock dat = new ImprovedTerseObjectUpdatePacket.ObjectDataBlock();
421 dat.TextureEntry = new byte[0];
422 bytes[i++] = (byte)(ID % 256);
423 bytes[i++] = (byte)((ID >> 8) % 256);
424 bytes[i++] = (byte)((ID >> 16) % 256);
425 bytes[i++] = (byte)((ID >> 24) % 256);
426 bytes[i++] = 0;
427 bytes[i++] = 0;
428
429 LLVector3 lPos;
430 Axiom.MathLib.Quaternion lRot;
431 if (this._physActor != null && this.physicsEnabled)
432 {
433 PhysicsVector pPos = this._physActor.Position;
434 lPos = new LLVector3(pPos.X, pPos.Y, pPos.Z);
435 lRot = this._physActor.Orientation;
436 }
437 else
438 {
439 lPos = this.Pos;
440 lRot = this.rotation;
441 }
442 byte[] pb = lPos.GetBytes();
443 Array.Copy(pb, 0, bytes, i, pb.Length);
444 i += 12;
445 ushort ac = 32767;
446
447 //vel
448 bytes[i++] = (byte)(ac % 256);
449 bytes[i++] = (byte)((ac >> 8) % 256);
450 bytes[i++] = (byte)(ac % 256);
451 bytes[i++] = (byte)((ac >> 8) % 256);
452 bytes[i++] = (byte)(ac % 256);
453 bytes[i++] = (byte)((ac >> 8) % 256);
454
455 //accel
456 bytes[i++] = (byte)(ac % 256);
457 bytes[i++] = (byte)((ac >> 8) % 256);
458 bytes[i++] = (byte)(ac % 256);
459 bytes[i++] = (byte)((ac >> 8) % 256);
460 bytes[i++] = (byte)(ac % 256);
461 bytes[i++] = (byte)((ac >> 8) % 256);
462
463 ushort rw, rx, ry, rz;
464 rw = (ushort)(32768 * (lRot.w + 1));
465 rx = (ushort)(32768 * (lRot.x + 1));
466 ry = (ushort)(32768 * (lRot.y + 1));
467 rz = (ushort)(32768 * (lRot.z + 1));
468
469 //rot
470 bytes[i++] = (byte)(rx % 256);
471 bytes[i++] = (byte)((rx >> 8) % 256);
472 bytes[i++] = (byte)(ry % 256);
473 bytes[i++] = (byte)((ry >> 8) % 256);
474 bytes[i++] = (byte)(rz % 256);
475 bytes[i++] = (byte)((rz >> 8) % 256);
476 bytes[i++] = (byte)(rw % 256);
477 bytes[i++] = (byte)((rw >> 8) % 256);
478
479 //rotation vel
480 bytes[i++] = (byte)(ac % 256);
481 bytes[i++] = (byte)((ac >> 8) % 256);
482 bytes[i++] = (byte)(ac % 256);
483 bytes[i++] = (byte)((ac >> 8) % 256);
484 bytes[i++] = (byte)(ac % 256);
485 bytes[i++] = (byte)((ac >> 8) % 256);
486
487 dat.Data = bytes;
488 return dat;
489 }
490 }
491}
diff --git a/OpenSim.RegionServer/world/SceneObject.cs b/OpenSim.RegionServer/world/SceneObject.cs
deleted file mode 100644
index a846fb5..0000000
--- a/OpenSim.RegionServer/world/SceneObject.cs
+++ /dev/null
@@ -1,77 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.types;
5using libsecondlife;
6using libsecondlife.Packets;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Physics.Manager;
9using OpenSim.Framework.Types;
10using OpenSim.Framework.Inventory;
11
12namespace OpenSim.world
13{
14 public class SceneObject : Entity
15 {
16 private LLUUID rootUUID;
17 private Dictionary<LLUUID, Primitive2> ChildPrimitives = new Dictionary<LLUUID, Primitive2>();
18 private Dictionary<uint, ClientView> m_clientThreads;
19 private World m_world;
20
21 public SceneObject()
22 {
23
24 }
25
26 public void CreateFromPacket(ObjectAddPacket addPacket, LLUUID agentID, uint localID)
27 {
28 }
29
30 public void CreateFromBytes(byte[] data)
31 {
32
33 }
34
35 public override void update()
36 {
37
38 }
39
40 public override void BackUp()
41 {
42
43 }
44
45 public void GetProperites(ClientView client)
46 {
47 /*
48 ObjectPropertiesPacket proper = new ObjectPropertiesPacket();
49 proper.ObjectData = new ObjectPropertiesPacket.ObjectDataBlock[1];
50 proper.ObjectData[0] = new ObjectPropertiesPacket.ObjectDataBlock();
51 proper.ObjectData[0].ItemID = LLUUID.Zero;
52 proper.ObjectData[0].CreationDate = (ulong)this.primData.CreationDate;
53 proper.ObjectData[0].CreatorID = this.primData.OwnerID;
54 proper.ObjectData[0].FolderID = LLUUID.Zero;
55 proper.ObjectData[0].FromTaskID = LLUUID.Zero;
56 proper.ObjectData[0].GroupID = LLUUID.Zero;
57 proper.ObjectData[0].InventorySerial = 0;
58 proper.ObjectData[0].LastOwnerID = LLUUID.Zero;
59 proper.ObjectData[0].ObjectID = this.uuid;
60 proper.ObjectData[0].OwnerID = primData.OwnerID;
61 proper.ObjectData[0].TouchName = new byte[0];
62 proper.ObjectData[0].TextureID = new byte[0];
63 proper.ObjectData[0].SitName = new byte[0];
64 proper.ObjectData[0].Name = new byte[0];
65 proper.ObjectData[0].Description = new byte[0];
66 proper.ObjectData[0].OwnerMask = this.primData.OwnerMask;
67 proper.ObjectData[0].NextOwnerMask = this.primData.NextOwnerMask;
68 proper.ObjectData[0].GroupMask = this.primData.GroupMask;
69 proper.ObjectData[0].EveryoneMask = this.primData.EveryoneMask;
70 proper.ObjectData[0].BaseMask = this.primData.BaseMask;
71
72 client.OutPacket(proper);
73 * */
74 }
75
76 }
77}
diff --git a/OpenSim.RegionServer/world/World.PacketHandlers.cs b/OpenSim.RegionServer/world/World.PacketHandlers.cs
deleted file mode 100644
index 7d74cb7..0000000
--- a/OpenSim.RegionServer/world/World.PacketHandlers.cs
+++ /dev/null
@@ -1,257 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5using libsecondlife.Packets;
6using OpenSim.Physics.Manager;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types;
9using OpenSim.Framework.Terrain;
10using OpenSim.Framework.Inventory;
11using OpenSim.Framework.Utilities;
12using OpenSim.Assets;
13
14namespace OpenSim.world
15{
16 public partial class World
17 {
18 public void ModifyTerrain(byte Action, float North, float West)
19 {
20 switch (Action)
21 {
22 case 1:
23 // raise terrain
24 Terrain.raise(North, West, 10.0, 0.001);
25 RegenerateTerrain(true, (int)North, (int)West);
26 break;
27 case 2:
28 //lower terrain
29 Terrain.lower(North, West, 10.0, 0.001);
30 RegenerateTerrain(true, (int)North, (int)West);
31 break;
32 }
33 return;
34 }
35
36 public void SimChat(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID)
37 {
38 foreach (ClientView client in m_clientThreads.Values)
39 {
40 // int dis = Util.fast_distance2d((int)(client.ClientAvatar.Pos.X - simClient.ClientAvatar.Pos.X), (int)(client.ClientAvatar.Pos.Y - simClient.ClientAvatar.Pos.Y));
41 int dis = (int)client.ClientAvatar.Pos.GetDistanceTo(fromPos);
42
43 switch (type)
44 {
45 case 0: // Whisper
46 if ((dis < 10) && (dis > -10))
47 {
48 //should change so the message is sent through the avatar rather than direct to the ClientView
49 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
50 }
51 break;
52 case 1: // Say
53 if ((dis < 30) && (dis > -30))
54 {
55 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
56 }
57 break;
58 case 2: // Shout
59 if ((dis < 100) && (dis > -100))
60 {
61 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
62 }
63 break;
64
65 case 0xff: // Broadcast
66 client.SendChatMessage(message, type, fromPos, fromName, fromAgentID);
67 break;
68 }
69
70 }
71 }
72
73 public void RezObject(AssetBase primasset, LLVector3 pos)
74 {
75 PrimData primd = new PrimData(primasset.Data);
76 Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
77 nPrim.CreateFromStorage(primd, pos, this._primCount, true);
78 this.Entities.Add(nPrim.uuid, nPrim);
79 this._primCount++;
80 }
81
82 public bool DeRezObject(ClientView simClient, Packet packet)
83 {
84 DeRezObjectPacket DeRezPacket = (DeRezObjectPacket)packet;
85
86 //Needs to delete object from physics at a later date
87 if (DeRezPacket.AgentBlock.DestinationID == LLUUID.Zero)
88 {
89 //currently following code not used (or don't know of any case of destination being zero
90 libsecondlife.LLUUID[] DeRezEnts;
91 DeRezEnts = new libsecondlife.LLUUID[DeRezPacket.ObjectData.Length];
92 int i = 0;
93 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
94 {
95
96 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
97 foreach (Entity ent in this.Entities.Values)
98 {
99 if (ent.localid == Data.ObjectLocalID)
100 {
101 DeRezEnts[i++] = ent.uuid;
102 this.localStorage.RemovePrim(ent.uuid);
103 KillObjectPacket kill = new KillObjectPacket();
104 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
105 kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
106 kill.ObjectData[0].ID = ent.localid;
107 foreach (ClientView client in m_clientThreads.Values)
108 {
109 client.OutPacket(kill);
110 }
111 //Uncommenting this means an old UUID will be re-used, thus crashing the asset server
112 //Uncomment when prim/object UUIDs are random or such
113 //2007-03-22 - Randomskk
114 //this._primCount--;
115 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Deleted UUID " + ent.uuid);
116 }
117 }
118 }
119 foreach (libsecondlife.LLUUID uuid in DeRezEnts)
120 {
121 lock (Entities)
122 {
123 Entities.Remove(uuid);
124 }
125 }
126 }
127 else
128 {
129 foreach (DeRezObjectPacket.ObjectDataBlock Data in DeRezPacket.ObjectData)
130 {
131 Entity selectedEnt = null;
132 //OpenSim.Framework.Console.MainConsole.Instance.WriteLine("LocalID:" + Data.ObjectLocalID.ToString());
133 foreach (Entity ent in this.Entities.Values)
134 {
135 if (ent.localid == Data.ObjectLocalID)
136 {
137 AssetBase primAsset = new AssetBase();
138 primAsset.FullID = LLUUID.Random();//DeRezPacket.AgentBlock.TransactionID.Combine(LLUUID.Zero); //should be combining with securesessionid
139 primAsset.InvType = 6;
140 primAsset.Type = 6;
141 primAsset.Name = "Prim";
142 primAsset.Description = "";
143 primAsset.Data = ((Primitive)ent).GetByteArray();
144 this._assetCache.AddAsset(primAsset);
145 this._inventoryCache.AddNewInventoryItem(simClient, DeRezPacket.AgentBlock.DestinationID, primAsset);
146 selectedEnt = ent;
147 break;
148 }
149 }
150 if (selectedEnt != null)
151 {
152 this.localStorage.RemovePrim(selectedEnt.uuid);
153 KillObjectPacket kill = new KillObjectPacket();
154 kill.ObjectData = new KillObjectPacket.ObjectDataBlock[1];
155 kill.ObjectData[0] = new KillObjectPacket.ObjectDataBlock();
156 kill.ObjectData[0].ID = selectedEnt.localid;
157 foreach (ClientView client in m_clientThreads.Values)
158 {
159 client.OutPacket(kill);
160 }
161 lock (Entities)
162 {
163 Entities.Remove(selectedEnt.uuid);
164 }
165 }
166 }
167 }
168 return true;
169 }
170
171 public void SendAvatarsToClient(ClientView RemoteClient)
172 {
173 foreach (ClientView client in m_clientThreads.Values)
174 {
175 if (client.AgentID != RemoteClient.AgentID)
176 {
177 // ObjectUpdatePacket objupdate = client.ClientAvatar.CreateUpdatePacket();
178 // RemoteClient.OutPacket(objupdate);
179 client.ClientAvatar.SendUpdateToOtherClient(RemoteClient.ClientAvatar);
180 client.ClientAvatar.SendAppearanceToOtherAgent(RemoteClient.ClientAvatar);
181 }
182 }
183 }
184
185 /*
186 public void RequestMapBlock(ClientView simClient, int minX, int minY, int maxX, int maxY)
187 {
188 System.Text.Encoding _enc = System.Text.Encoding.ASCII;
189 if (((m_regInfo.RegionLocX > minX) && (m_regInfo.RegionLocX < maxX)) && ((m_regInfo.RegionLocY > minY) && (m_regInfo.RegionLocY < maxY)))
190 {
191 MapBlockReplyPacket mapReply = new MapBlockReplyPacket();
192 mapReply.AgentData.AgentID = simClient.AgentID;
193 mapReply.AgentData.Flags = 0;
194 mapReply.Data = new MapBlockReplyPacket.DataBlock[1];
195 mapReply.Data[0] = new MapBlockReplyPacket.DataBlock();
196 mapReply.Data[0].MapImageID = new LLUUID("00000000-0000-0000-9999-000000000007");
197 mapReply.Data[0].X = (ushort)m_regInfo.RegionLocX;
198 mapReply.Data[0].Y = (ushort)m_regInfo.RegionLocY;
199 mapReply.Data[0].WaterHeight = (byte)m_regInfo.RegionWaterHeight;
200 mapReply.Data[0].Name = _enc.GetBytes(this.m_regionName);
201 mapReply.Data[0].RegionFlags = 72458694;
202 mapReply.Data[0].Access = 13;
203 mapReply.Data[0].Agents = 1; //should send number of clients connected
204 simClient.OutPacket(mapReply);
205 }
206 }
207 public bool RezObjectHandler(ClientView simClient, Packet packet)
208 {
209 RezObjectPacket rezPacket = (RezObjectPacket)packet;
210 AgentInventory inven = this._inventoryCache.GetAgentsInventory(simClient.AgentID);
211 if (inven != null)
212 {
213 if (inven.InventoryItems.ContainsKey(rezPacket.InventoryData.ItemID))
214 {
215 AssetBase asset = this._assetCache.GetAsset(inven.InventoryItems[rezPacket.InventoryData.ItemID].AssetID);
216 if (asset != null)
217 {
218 PrimData primd = new PrimData(asset.Data);
219 Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
220 nPrim.CreateFromStorage(primd, rezPacket.RezData.RayEnd, this._primCount, true);
221 this.Entities.Add(nPrim.uuid, nPrim);
222 this._primCount++;
223 this._inventoryCache.DeleteInventoryItem(simClient, rezPacket.InventoryData.ItemID);
224 }
225 }
226 }
227 return true;
228 }
229 public bool ModifyTerrain(ClientView simClient, Packet packet)
230 {
231 ModifyLandPacket modify = (ModifyLandPacket)packet;
232
233 switch (modify.ModifyBlock.Action)
234 {
235 case 1:
236 // raise terrain
237 if (modify.ParcelData.Length > 0)
238 {
239 Terrain.raise(modify.ParcelData[0].North, modify.ParcelData[0].West, 10.0, 0.1);
240 RegenerateTerrain(true, (int)modify.ParcelData[0].North, (int)modify.ParcelData[0].West);
241 }
242 break;
243 case 2:
244 //lower terrain
245 if (modify.ParcelData.Length > 0)
246 {
247 Terrain.lower(modify.ParcelData[0].North, modify.ParcelData[0].West, 10.0, 0.1);
248 RegenerateTerrain(true, (int)modify.ParcelData[0].North, (int)modify.ParcelData[0].West);
249 }
250 break;
251 }
252 return true;
253 }
254 */
255
256 }
257}
diff --git a/OpenSim.RegionServer/world/World.Scripting.cs b/OpenSim.RegionServer/world/World.Scripting.cs
deleted file mode 100644
index 44ef05a..0000000
--- a/OpenSim.RegionServer/world/World.Scripting.cs
+++ /dev/null
@@ -1,124 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using System.IO;
5using System.Reflection;
6using OpenSim.Framework;
7using OpenSim.Framework.Interfaces;
8using OpenSim.Framework.Types;
9using libsecondlife;
10
11namespace OpenSim.world
12{
13 public partial class World
14 {
15 private Dictionary<string, IScriptEngine> scriptEngines = new Dictionary<string, IScriptEngine>();
16
17 private void LoadScriptEngines()
18 {
19 this.LoadScriptPlugins();
20 }
21
22 public void LoadScriptPlugins()
23 {
24 string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory, "ScriptEngines");
25 string[] pluginFiles = Directory.GetFiles(path, "*.dll");
26
27
28 for (int i = 0; i < pluginFiles.Length; i++)
29 {
30 this.AddPlugin(pluginFiles[i]);
31 }
32 }
33
34 private void AddPlugin(string FileName)
35 {
36 Assembly pluginAssembly = Assembly.LoadFrom(FileName);
37
38 foreach (Type pluginType in pluginAssembly.GetTypes())
39 {
40 if (pluginType.IsPublic)
41 {
42 if (!pluginType.IsAbstract)
43 {
44 Type typeInterface = pluginType.GetInterface("IScriptEngine", true);
45
46 if (typeInterface != null)
47 {
48 IScriptEngine plug = (IScriptEngine)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
49 plug.Init(this);
50 this.scriptEngines.Add(plug.GetName(), plug);
51
52 }
53
54 typeInterface = null;
55 }
56 }
57 }
58
59 pluginAssembly = null;
60 }
61
62 public void LoadScript(string scriptType, string scriptName, string script, Entity ent)
63 {
64 if(this.scriptEngines.ContainsKey(scriptType))
65 {
66 this.scriptEngines[scriptType].LoadScript(script, scriptName, ent.localid);
67 }
68 }
69
70 #region IScriptAPI Methods
71
72 public OSVector3 GetEntityPosition(uint localID)
73 {
74 OSVector3 res = new OSVector3();
75 // Console.WriteLine("script- getting entity " + localID + " position");
76 foreach (Entity entity in this.Entities.Values)
77 {
78 if (entity.localid == localID)
79 {
80 res.X = entity.Pos.X;
81 res.Y = entity.Pos.Y;
82 res.Z = entity.Pos.Z;
83 }
84 }
85 return res;
86 }
87
88 public void SetEntityPosition(uint localID, float x , float y, float z)
89 {
90 foreach (Entity entity in this.Entities.Values)
91 {
92 if (entity.localid == localID && entity is Primitive)
93 {
94 LLVector3 pos = entity.Pos;
95 pos.X = x;
96 pos.Y = y;
97 Primitive prim = entity as Primitive;
98 // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
99 prim.UpdatePosition(pos);
100 // Console.WriteLine("script- setting entity " + localID + " positon");
101 }
102 }
103
104 }
105
106 public uint GetRandomAvatarID()
107 {
108 //Console.WriteLine("script- getting random avatar id");
109 uint res = 0;
110 foreach (Entity entity in this.Entities.Values)
111 {
112 if (entity is Avatar)
113 {
114 res = entity.localid;
115 }
116 }
117 return res;
118 }
119
120 #endregion
121
122
123 }
124}
diff --git a/OpenSim.RegionServer/world/World.cs b/OpenSim.RegionServer/world/World.cs
deleted file mode 100644
index 99fb8e0..0000000
--- a/OpenSim.RegionServer/world/World.cs
+++ /dev/null
@@ -1,646 +0,0 @@
1using System;
2using libsecondlife;
3using libsecondlife.Packets;
4using System.Collections.Generic;
5using System.Text;
6using System.Reflection;
7using System.IO;
8using System.Threading;
9using OpenSim.Physics.Manager;
10using OpenSim.Framework.Interfaces;
11using OpenSim.Framework.Types;
12using OpenSim.Framework.Terrain;
13using OpenSim.Framework.Inventory;
14using OpenSim.Assets;
15//using OpenSim.world.scripting;
16using OpenSim.RegionServer.world.scripting;
17using OpenSim.Terrain;
18
19namespace OpenSim.world
20{
21 public partial class World : WorldBase, ILocalStorageReceiver, IScriptAPI
22 {
23 public object LockPhysicsEngine = new object();
24 public Dictionary<libsecondlife.LLUUID, Avatar> Avatars;
25 public Dictionary<libsecondlife.LLUUID, Primitive> Prims;
26 //public ScriptEngine Scripts;
27 public uint _localNumber = 0;
28 private PhysicsScene phyScene;
29 private float timeStep = 0.1f;
30 public ILocalStorage localStorage;
31 private Random Rand = new Random();
32 private uint _primCount = 702000;
33 private int storageCount;
34 private Dictionary<LLUUID, ScriptHandler> m_scriptHandlers;
35 private Dictionary<string, ScriptFactory> m_scripts;
36 private Mutex updateLock;
37 public string m_datastore;
38
39 #region Properties
40 public PhysicsScene PhysScene
41 {
42 set
43 {
44 this.phyScene = value;
45 }
46 get
47 {
48 return (this.phyScene);
49 }
50 }
51 #endregion
52
53 #region Constructors
54 /// <summary>
55 /// Creates a new World class, and a region to go with it.
56 /// </summary>
57 /// <param name="clientThreads">Dictionary to contain client threads</param>
58 /// <param name="regionHandle">Region Handle for this region</param>
59 /// <param name="regionName">Region Name for this region</param>
60 public World(Dictionary<uint, ClientView> clientThreads, RegionInfo regInfo, ulong regionHandle, string regionName)
61 {
62 try
63 {
64 updateLock = new Mutex(false);
65 m_clientThreads = clientThreads;
66 m_regionHandle = regionHandle;
67 m_regionName = regionName;
68 m_regInfo = regInfo;
69
70 m_scriptHandlers = new Dictionary<LLUUID, ScriptHandler>();
71 m_scripts = new Dictionary<string, ScriptFactory>();
72
73 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating new entitities instance");
74 Entities = new Dictionary<libsecondlife.LLUUID, Entity>();
75 Avatars = new Dictionary<LLUUID, Avatar>();
76 Prims = new Dictionary<LLUUID, Primitive>();
77
78 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs - creating LandMap");
79 TerrainManager = new TerrainManager(new SecondLife());
80 Terrain = new TerrainEngine();
81 Avatar.SetupTemplate("avatar-texture.dat");
82 // MainConsole.Instance.WriteLine("World.cs - Creating script engine instance");
83 // Initialise this only after the world has loaded
84 // Scripts = new ScriptEngine(this);
85 Avatar.LoadAnims();
86 this.SetDefaultScripts();
87 this.LoadScriptEngines();
88 }
89 catch (Exception e)
90 {
91 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.CRITICAL, "World.cs: Constructor failed with exception " + e.ToString());
92 }
93 }
94 #endregion
95
96 #region Script Methods
97 /// <summary>
98 /// Loads a new script into the specified entity
99 /// </summary>
100 /// <param name="entity">Entity to be scripted</param>
101 /// <param name="script">The script to load</param>
102 public void AddScript(Entity entity, Script script)
103 {
104 try
105 {
106 ScriptHandler scriptHandler = new ScriptHandler(script, entity, this);
107 m_scriptHandlers.Add(scriptHandler.ScriptId, scriptHandler);
108 }
109 catch (Exception e)
110 {
111 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddScript() - Failed with exception " + e.ToString());
112 }
113 }
114
115 /// <summary>
116 /// Loads a new script into the specified entity, using a script loaded from a string.
117 /// </summary>
118 /// <param name="entity">The entity to be scripted</param>
119 /// <param name="scriptData">The string containing the script</param>
120 public void AddScript(Entity entity, string scriptData)
121 {
122 try
123 {
124 int scriptstart = 0;
125 int scriptend = 0;
126 string substring;
127 scriptstart = scriptData.LastIndexOf("<Script>");
128 scriptend = scriptData.LastIndexOf("</Script>");
129 substring = scriptData.Substring(scriptstart + 8, scriptend - scriptstart - 8);
130 substring = substring.Trim();
131 //Console.WriteLine("searching for script to add: " + substring);
132
133 ScriptFactory scriptFactory;
134 //Console.WriteLine("script string is " + substring);
135 if (substring.StartsWith("<ScriptEngine:"))
136 {
137 string substring1 = "";
138 string script = "";
139 // Console.WriteLine("searching for script engine");
140 substring1 = substring.Remove(0, 14);
141 int dev = substring1.IndexOf(',');
142 string sEngine = substring1.Substring(0, dev);
143 substring1 = substring1.Remove(0, dev + 1);
144 int end = substring1.IndexOf('>');
145 string sName = substring1.Substring(0, end);
146 //Console.WriteLine(" script info : " + sEngine + " , " + sName);
147 int startscript = substring.IndexOf('>');
148 script = substring.Remove(0, startscript + 1);
149 // Console.WriteLine("script data is " + script);
150 if (this.scriptEngines.ContainsKey(sEngine))
151 {
152 this.scriptEngines[sEngine].LoadScript(script, sName, entity.localid);
153 }
154 }
155 else if (this.m_scripts.TryGetValue(substring, out scriptFactory))
156 {
157 //Console.WriteLine("added script");
158 this.AddScript(entity, scriptFactory());
159 }
160 }
161 catch (Exception e)
162 {
163 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddScript() - Failed with exception " + e.ToString());
164 }
165 }
166
167 #endregion
168
169 #region Update Methods
170 /// <summary>
171 /// Performs per-frame updates on the world, this should be the central world loop
172 /// </summary>
173 public override void Update()
174 {
175 updateLock.WaitOne();
176 try
177 {
178 if (this.phyScene.IsThreaded)
179 {
180 this.phyScene.GetResults();
181
182 }
183
184 foreach (libsecondlife.LLUUID UUID in Entities.Keys)
185 {
186 Entities[UUID].addForces();
187 }
188
189 lock (this.LockPhysicsEngine)
190 {
191 this.phyScene.Simulate(timeStep);
192 }
193
194 foreach (libsecondlife.LLUUID UUID in Entities.Keys)
195 {
196 Entities[UUID].update();
197 }
198
199 foreach (ScriptHandler scriptHandler in m_scriptHandlers.Values)
200 {
201 scriptHandler.OnFrame();
202 }
203 foreach (IScriptEngine scripteng in this.scriptEngines.Values)
204 {
205 scripteng.OnFrame();
206 }
207 //backup world data
208 this.storageCount++;
209 if (storageCount > 1200) //set to how often you want to backup
210 {
211 this.Backup();
212 storageCount = 0;
213 }
214 }
215 catch (Exception e)
216 {
217 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: Update() - Failed with exception " + e.ToString());
218 }
219 updateLock.ReleaseMutex();
220 }
221
222 public bool Backup()
223 {
224 try
225 {
226 // Terrain backup routines
227 if (Terrain.tainted > 0)
228 {
229 Terrain.tainted = 0;
230 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain tainted, saving.");
231 localStorage.SaveMap(Terrain.getHeights1D());
232 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Terrain saved, informing Physics.");
233 phyScene.SetTerrain(Terrain.getHeights1D());
234 }
235
236 // Primitive backup routines
237 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: Backup() - Backing up Primitives");
238 foreach (libsecondlife.LLUUID UUID in Entities.Keys)
239 {
240 Entities[UUID].BackUp();
241 }
242
243 // Backup successful
244 return true;
245 }
246 catch (Exception e)
247 {
248 // Backup failed
249 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Backup() - Backup Failed with exception " + e.ToString());
250 return false;
251 }
252 }
253 #endregion
254
255 #region Setup Methods
256 /// <summary>
257 /// Loads a new storage subsystem from a named library
258 /// </summary>
259 /// <param name="dllName">Storage Library</param>
260 /// <returns>Successful or not</returns>
261 public bool LoadStorageDLL(string dllName)
262 {
263 try
264 {
265 Assembly pluginAssembly = Assembly.LoadFrom(dllName);
266 ILocalStorage store = null;
267
268 foreach (Type pluginType in pluginAssembly.GetTypes())
269 {
270 if (pluginType.IsPublic)
271 {
272 if (!pluginType.IsAbstract)
273 {
274 Type typeInterface = pluginType.GetInterface("ILocalStorage", true);
275
276 if (typeInterface != null)
277 {
278 ILocalStorage plug = (ILocalStorage)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
279 store = plug;
280
281 store.Initialise(this.m_datastore);
282 break;
283 }
284
285 typeInterface = null;
286 }
287 }
288 }
289 pluginAssembly = null;
290 this.localStorage = store;
291 return (store == null);
292 }
293 catch (Exception e)
294 {
295 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadStorageDLL() - Failed with exception " + e.ToString());
296 return false;
297 }
298 }
299
300 public void SetDefaultScripts()
301 {
302 this.m_scripts.Add("FollowRandomAvatar", delegate()
303 {
304 return new OpenSim.RegionServer.world.scripting.FollowRandomAvatar();
305 });
306 }
307
308 #endregion
309
310 #region Regenerate Terrain
311
312 /// <summary>
313 /// Rebuilds the terrain using a procedural algorithm
314 /// </summary>
315 public void RegenerateTerrain()
316 {
317 try
318 {
319 Terrain.hills();
320
321 lock (this.LockPhysicsEngine)
322 {
323 this.phyScene.SetTerrain(Terrain.getHeights1D());
324 }
325 this.localStorage.SaveMap(this.Terrain.getHeights1D());
326
327 foreach (ClientView client in m_clientThreads.Values)
328 {
329 this.SendLayerData(client);
330 }
331
332 foreach (libsecondlife.LLUUID UUID in Entities.Keys)
333 {
334 Entities[UUID].LandRenegerated();
335 }
336 }
337 catch (Exception e)
338 {
339 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
340 }
341 }
342
343 /// <summary>
344 /// Rebuilds the terrain using a 2D float array
345 /// </summary>
346 /// <param name="newMap">256,256 float array containing heights</param>
347 public void RegenerateTerrain(float[,] newMap)
348 {
349 try
350 {
351 this.Terrain.setHeights2D(newMap);
352 lock (this.LockPhysicsEngine)
353 {
354 this.phyScene.SetTerrain(this.Terrain.getHeights1D());
355 }
356 this.localStorage.SaveMap(this.Terrain.getHeights1D());
357
358 foreach (ClientView client in m_clientThreads.Values)
359 {
360 this.SendLayerData(client);
361 }
362
363 foreach (libsecondlife.LLUUID UUID in Entities.Keys)
364 {
365 Entities[UUID].LandRenegerated();
366 }
367 }
368 catch (Exception e)
369 {
370 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
371 }
372 }
373
374 /// <summary>
375 /// Rebuilds the terrain assuming changes occured at a specified point[?]
376 /// </summary>
377 /// <param name="changes">???</param>
378 /// <param name="pointx">???</param>
379 /// <param name="pointy">???</param>
380 public void RegenerateTerrain(bool changes, int pointx, int pointy)
381 {
382 try
383 {
384 if (changes)
385 {
386 lock (this.LockPhysicsEngine)
387 {
388 this.phyScene.SetTerrain(this.Terrain.getHeights1D());
389 }
390 this.localStorage.SaveMap(this.Terrain.getHeights1D());
391
392 foreach (ClientView client in m_clientThreads.Values)
393 {
394 this.SendLayerData(pointx, pointy, client);
395 }
396 }
397 }
398 catch (Exception e)
399 {
400 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RegenerateTerrain() - Failed with exception " + e.ToString());
401 }
402 }
403
404 #endregion
405
406 #region Load Terrain
407 /// <summary>
408 /// Loads the World heightmap
409 /// </summary>
410 public override void LoadWorldMap()
411 {
412 try
413 {
414 float[] map = this.localStorage.LoadWorld();
415 if (map == null)
416 {
417 Console.WriteLine("creating new terrain");
418 this.Terrain.hills();
419
420 this.localStorage.SaveMap(this.Terrain.getHeights1D());
421 }
422 else
423 {
424 this.Terrain.setHeights1D(map);
425 }
426 }
427 catch (Exception e)
428 {
429 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadWorldMap() - Failed with exception " + e.ToString());
430 }
431 }
432 #endregion
433
434 #region Primitives Methods
435
436 /// <summary>
437 /// Sends prims to a client
438 /// </summary>
439 /// <param name="RemoteClient">Client to send to</param>
440 public void GetInitialPrims(ClientView RemoteClient)
441 {
442 try
443 {
444 foreach (libsecondlife.LLUUID UUID in Entities.Keys)
445 {
446 if (Entities[UUID] is Primitive)
447 {
448 Primitive primitive = Entities[UUID] as Primitive;
449 primitive.UpdateClient(RemoteClient);
450 }
451 }
452 }
453 catch (Exception e)
454 {
455 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: GetInitialPrims() - Failed with exception " + e.ToString());
456 }
457 }
458
459 /// <summary>
460 /// Loads the World's objects
461 /// </summary>
462 public void LoadPrimsFromStorage()
463 {
464 try
465 {
466 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: LoadPrimsFromStorage() - Loading primitives");
467 this.localStorage.LoadPrimitives(this);
468 }
469 catch (Exception e)
470 {
471 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: LoadPrimsFromStorage() - Failed with exception " + e.ToString());
472 }
473 }
474
475 /// <summary>
476 /// Loads a specific object from storage
477 /// </summary>
478 /// <param name="prim">The object to load</param>
479 public void PrimFromStorage(PrimData prim)
480 {
481 try
482 {
483 if (prim.LocalID >= this._primCount)
484 {
485 _primCount = prim.LocalID + 1;
486 }
487 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: PrimFromStorage() - Reloading prim (localId " + prim.LocalID + " ) from storage");
488 Primitive nPrim = new Primitive(m_clientThreads, m_regionHandle, this);
489 nPrim.CreateFromStorage(prim);
490 this.Entities.Add(nPrim.uuid, nPrim);
491 }
492 catch (Exception e)
493 {
494 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: PrimFromStorage() - Failed with exception " + e.ToString());
495 }
496 }
497
498 public void AddNewPrim(ObjectAddPacket addPacket, ClientView AgentClient)
499 {
500 AddNewPrim(addPacket, AgentClient.AgentID);
501 }
502
503 public void AddNewPrim(ObjectAddPacket addPacket, LLUUID ownerID)
504 {
505 try
506 {
507 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs: AddNewPrim() - Creating new prim");
508 Primitive prim = new Primitive(m_clientThreads, m_regionHandle, this);
509 prim.CreateFromPacket(addPacket, ownerID, this._primCount);
510 PhysicsVector pVec = new PhysicsVector(prim.Pos.X, prim.Pos.Y, prim.Pos.Z);
511 PhysicsVector pSize = new PhysicsVector(0.255f, 0.255f, 0.255f);
512 if (OpenSim.world.Avatar.PhysicsEngineFlying)
513 {
514 lock (this.LockPhysicsEngine)
515 {
516 prim.PhysActor = this.phyScene.AddPrim(pVec, pSize);
517 }
518 }
519
520 this.Entities.Add(prim.uuid, prim);
521 this._primCount++;
522 }
523 catch (Exception e)
524 {
525 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddNewPrim() - Failed with exception " + e.ToString());
526 }
527 }
528
529 #endregion
530
531 #region Add/Remove Avatar Methods
532
533 public override void AddViewerAgent(ClientView agentClient)
534 {
535 //register for events
536 agentClient.OnChatFromViewer += new ClientView.ChatFromViewer(this.SimChat);
537 agentClient.OnRezObject += new ClientView.RezObject(this.RezObject);
538 agentClient.OnModifyTerrain += new ClientView.ModifyTerrain(this.ModifyTerrain);
539 agentClient.OnRegionHandShakeReply += new ClientView.GenericCall(this.SendLayerData);
540 agentClient.OnRequestWearables += new ClientView.GenericCall(this.GetInitialPrims);
541 agentClient.OnRequestAvatarsData += new ClientView.GenericCall(this.SendAvatarsToClient);
542
543 try
544 {
545 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
546 Avatar newAvatar = new Avatar(agentClient, this, m_regionName, m_clientThreads, m_regionHandle, true, 20);
547 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Adding new avatar to world");
548 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "World.cs:AddViewerAgent() - Starting RegionHandshake ");
549 newAvatar.SendRegionHandshake(this);
550 if (!agentClient.m_child)
551 {
552 PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
553 lock (this.LockPhysicsEngine)
554 {
555 newAvatar.PhysActor = this.phyScene.AddAvatar(pVec);
556 }
557 }
558 lock (Entities)
559 {
560 if (!Entities.ContainsKey(agentClient.AgentID))
561 {
562 this.Entities.Add(agentClient.AgentID, newAvatar);
563 }
564 else
565 {
566 Entities[agentClient.AgentID] = newAvatar;
567 }
568 }
569 lock (Avatars)
570 {
571 if (Avatars.ContainsKey(agentClient.AgentID))
572 {
573 Avatars[agentClient.AgentID] = newAvatar;
574 }
575 else
576 {
577 this.Avatars.Add(agentClient.AgentID, newAvatar);
578 }
579 }
580 }
581 catch (Exception e)
582 {
583 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
584 }
585 }
586
587 public override void RemoveViewerAgent(ClientView agentClient)
588 {
589 try
590 {
591 lock (Entities)
592 {
593 Entities.Remove(agentClient.AgentID);
594 }
595 lock (Avatars)
596 {
597 Avatars.Remove(agentClient.AgentID);
598 }
599 if (agentClient.ClientAvatar.PhysActor != null)
600 {
601 //this.phyScene.RemoveAvatar(agentClient.ClientAvatar.PhysActor);
602 }
603 }
604 catch (Exception e)
605 {
606 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: RemoveViewerAgent() - Failed with exception " + e.ToString());
607 }
608 }
609 #endregion
610
611 #region Request Avatars List Methods
612 //The idea is to have a group of method that return a list of avatars meeting some requirement
613 // ie it could be all Avatars within a certain range of the calling prim/avatar.
614
615 public List<Avatar> RequestAvatarList()
616 {
617 List<Avatar> result = new List<Avatar>();
618
619 foreach (Avatar avatar in Avatars.Values)
620 {
621 result.Add(avatar);
622 }
623
624 return result;
625 }
626 #endregion
627
628 #region ShutDown
629 /// <summary>
630 /// Tidy before shutdown
631 /// </summary>
632 public override void Close()
633 {
634 try
635 {
636 this.localStorage.ShutDown();
637 }
638 catch (Exception e)
639 {
640 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.HIGH, "World.cs: Close() - Failed with exception " + e.ToString());
641 }
642 }
643 #endregion
644
645 }
646}
diff --git a/OpenSim.RegionServer/world/WorldBase.cs b/OpenSim.RegionServer/world/WorldBase.cs
deleted file mode 100644
index edc5518..0000000
--- a/OpenSim.RegionServer/world/WorldBase.cs
+++ /dev/null
@@ -1,176 +0,0 @@
1using System;
2using libsecondlife;
3using libsecondlife.Packets;
4using System.Collections.Generic;
5using System.Text;
6using System.Reflection;
7using System.IO;
8using System.Threading;
9using OpenSim.Physics.Manager;
10using OpenSim.Framework.Interfaces;
11using OpenSim.Framework.Types;
12using OpenSim.Framework.Terrain;
13using OpenSim.Framework.Inventory;
14using OpenSim.Assets;
15using OpenSim.RegionServer.world.scripting;
16using OpenSim.Terrain;
17
18namespace OpenSim.world
19{
20 public class WorldBase
21 {
22 public Dictionary<libsecondlife.LLUUID, Entity> Entities;
23 protected Dictionary<uint, ClientView> m_clientThreads;
24 protected ulong m_regionHandle;
25 protected string m_regionName;
26 protected InventoryCache _inventoryCache;
27 protected AssetCache _assetCache;
28 protected RegionInfo m_regInfo;
29
30 public TerrainEngine Terrain; //TODO: Replace TerrainManager with this.
31 protected libsecondlife.TerrainManager TerrainManager; // To be referenced via TerrainEngine
32
33 #region Properties
34 public InventoryCache InventoryCache
35 {
36 set
37 {
38 this._inventoryCache = value;
39 }
40 }
41
42 public AssetCache AssetCache
43 {
44 set
45 {
46 this._assetCache = value;
47 }
48 }
49 #endregion
50
51 #region Constructors
52 public WorldBase()
53 {
54
55 }
56 #endregion
57
58 #region Setup Methods
59 /// <summary>
60 /// Register Packet handler Methods with the packet server (which will register them with the SimClient)
61 /// </summary>
62 /// <param name="packetServer"></param>
63 public virtual void RegisterPacketHandlers(PacketServer packetServer)
64 {
65
66 }
67 #endregion
68
69 #region Update Methods
70 /// <summary>
71 /// Normally called once every frame/tick to let the world preform anything required (like running the physics simulation)
72 /// </summary>
73 public virtual void Update()
74 {
75
76 }
77 #endregion
78
79 #region Terrain Methods
80
81 /// <summary>
82 /// Loads the World heightmap
83 /// </summary>
84 public virtual void LoadWorldMap()
85 {
86
87 }
88
89 /// <summary>
90 /// Send the region heightmap to the client
91 /// </summary>
92 /// <param name="RemoteClient">Client to send to</param>
93 public virtual void SendLayerData(ClientView RemoteClient)
94 {
95 try
96 {
97 int[] patches = new int[4];
98
99 for (int y = 0; y < 16; y++)
100 {
101 for (int x = 0; x < 16; x = x + 4)
102 {
103 patches[0] = x + 0 + y * 16;
104 patches[1] = x + 1 + y * 16;
105 patches[2] = x + 2 + y * 16;
106 patches[3] = x + 3 + y * 16;
107
108 Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);
109 RemoteClient.OutPacket(layerpack);
110 }
111 }
112 }
113 catch (Exception e)
114 {
115 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: SendLayerData() - Failed with exception " + e.ToString());
116 }
117 }
118
119 /// <summary>
120 /// Sends a specified patch to a client
121 /// </summary>
122 /// <param name="px">Patch coordinate (x) 0..16</param>
123 /// <param name="py">Patch coordinate (y) 0..16</param>
124 /// <param name="RemoteClient">The client to send to</param>
125 public void SendLayerData(int px, int py, ClientView RemoteClient)
126 {
127 try
128 {
129 int[] patches = new int[1];
130 int patchx, patchy;
131 patchx = px / 16;
132 patchy = py / 16;
133
134 patches[0] = patchx + 0 + patchy * 16;
135
136 Packet layerpack = TerrainManager.CreateLandPacket(Terrain.getHeights1D(), patches);
137 RemoteClient.OutPacket(layerpack);
138 }
139 catch (Exception e)
140 {
141 OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "World.cs: SendLayerData() - Failed with exception " + e.ToString());
142 }
143 }
144 #endregion
145
146 #region Add/Remove Agent/Avatar
147 /// <summary>
148 /// Add a new Agent's avatar
149 /// </summary>
150 /// <param name="agentClient"></param>
151 public virtual void AddViewerAgent(ClientView agentClient)
152 {
153
154 }
155
156 /// <summary>
157 /// Remove a Agent's avatar
158 /// </summary>
159 /// <param name="agentClient"></param>
160 public virtual void RemoveViewerAgent(ClientView agentClient)
161 {
162
163 }
164 #endregion
165
166 #region Shutdown
167 /// <summary>
168 /// Tidy before shutdown
169 /// </summary>
170 public virtual void Close()
171 {
172
173 }
174 #endregion
175 }
176}
diff --git a/OpenSim.RegionServer/world/scripting/IScriptContext.cs b/OpenSim.RegionServer/world/scripting/IScriptContext.cs
deleted file mode 100644
index 465c23b..0000000
--- a/OpenSim.RegionServer/world/scripting/IScriptContext.cs
+++ /dev/null
@@ -1,13 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5
6namespace OpenSim.RegionServer.world.scripting
7{
8 public interface IScriptContext
9 {
10 IScriptEntity Entity { get; }
11 bool TryGetRandomAvatar(out IScriptReadonlyEntity avatar);
12 }
13}
diff --git a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs b/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
deleted file mode 100644
index 2ef16a4..0000000
--- a/OpenSim.RegionServer/world/scripting/IScriptEntity.cs
+++ /dev/null
@@ -1,19 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5
6namespace OpenSim.RegionServer.world.scripting
7{
8 public interface IScriptReadonlyEntity
9 {
10 LLVector3 Pos { get; }
11 string Name { get; }
12 }
13
14 public interface IScriptEntity
15 {
16 LLVector3 Pos { get; set; }
17 string Name { get; }
18 }
19}
diff --git a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs b/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
deleted file mode 100644
index 15efc49..0000000
--- a/OpenSim.RegionServer/world/scripting/IScriptHandler.cs
+++ /dev/null
@@ -1,98 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5using OpenSim.Physics.Manager;
6using OpenSim.world;
7using Avatar=OpenSim.world.Avatar;
8using Primitive = OpenSim.world.Primitive;
9
10namespace OpenSim.RegionServer.world.scripting
11{
12 public delegate void ScriptEventHandler(IScriptContext context);
13
14 public class ScriptHandler : IScriptContext, IScriptEntity, IScriptReadonlyEntity
15 {
16 private World m_world;
17 private Script m_script;
18 private Entity m_entity;
19
20 public LLUUID ScriptId
21 {
22 get
23 {
24 return m_script.ScriptId;
25 }
26 }
27
28 public void OnFrame()
29 {
30 m_script.OnFrame(this);
31 }
32
33 public ScriptHandler(Script script, Entity entity, World world)
34 {
35 m_script = script;
36 m_entity = entity;
37 m_world = world;
38 }
39
40 #region IScriptContext Members
41
42 IScriptEntity IScriptContext.Entity
43 {
44 get
45 {
46 return this;
47 }
48 }
49
50 bool IScriptContext.TryGetRandomAvatar(out IScriptReadonlyEntity avatar)
51 {
52 foreach (Entity entity in m_world.Entities.Values )
53 {
54 if( entity is Avatar )
55 {
56 avatar = entity;
57 return true;
58 }
59 }
60
61 avatar = null;
62 return false;
63 }
64
65 #endregion
66
67 #region IScriptEntity and IScriptReadonlyEntity Members
68
69 public string Name
70 {
71 get
72 {
73 return m_entity.Name;
74 }
75 }
76
77 public LLVector3 Pos
78 {
79 get
80 {
81 return m_entity.Pos;
82 }
83
84 set
85 {
86 if (m_entity is Primitive)
87 {
88 Primitive prim = m_entity as Primitive;
89 // Of course, we really should have asked the physEngine if this is possible, and if not, returned false.
90 prim.UpdatePosition( value );
91 }
92 }
93 }
94
95 #endregion
96 }
97
98}
diff --git a/OpenSim.RegionServer/world/scripting/Script.cs b/OpenSim.RegionServer/world/scripting/Script.cs
deleted file mode 100644
index 48c18ff..0000000
--- a/OpenSim.RegionServer/world/scripting/Script.cs
+++ /dev/null
@@ -1,26 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5
6namespace OpenSim.RegionServer.world.scripting
7{
8 public class Script
9 {
10 private LLUUID m_scriptId;
11 public virtual LLUUID ScriptId
12 {
13 get
14 {
15 return m_scriptId;
16 }
17 }
18
19 public Script( LLUUID scriptId )
20 {
21 m_scriptId = scriptId;
22 }
23
24 public ScriptEventHandler OnFrame;
25 }
26}
diff --git a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs b/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
deleted file mode 100644
index 4c6d373..0000000
--- a/OpenSim.RegionServer/world/scripting/ScriptFactory.cs
+++ /dev/null
@@ -1,8 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4
5namespace OpenSim.RegionServer.world.scripting
6{
7 public delegate Script ScriptFactory();
8}
diff --git a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs b/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
deleted file mode 100644
index 6a689ab..0000000
--- a/OpenSim.RegionServer/world/scripting/Scripts/FollowRandomAvatar.cs
+++ /dev/null
@@ -1,37 +0,0 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using libsecondlife;
5
6namespace OpenSim.RegionServer.world.scripting
7{
8 public class FollowRandomAvatar : Script
9 {
10 public FollowRandomAvatar()
11 : base(LLUUID.Random())
12 {
13 OnFrame += MyOnFrame;
14 }
15
16 private void MyOnFrame(IScriptContext context)
17 {
18 LLVector3 pos = context.Entity.Pos;
19
20 IScriptReadonlyEntity avatar;
21
22 if (context.TryGetRandomAvatar(out avatar))
23 {
24 LLVector3 avatarPos = avatar.Pos;
25
26 float x = pos.X + ((float)avatarPos.X.CompareTo(pos.X)) / 2;
27 float y = pos.Y + ((float)avatarPos.Y.CompareTo(pos.Y)) / 2;
28
29 LLVector3 newPos = new LLVector3(x, y, pos.Z);
30
31 context.Entity.Pos = newPos;
32 }
33 }
34 }
35
36
37}
generated by cgit v1.1 at 2024-11-16 15:44:07 +0000