aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorAdam Frisby2008-04-29 14:04:55 +0000
committerAdam Frisby2008-04-29 14:04:55 +0000
commit375163a6fece8b3a57c7555246abe8338223a599 (patch)
tree163001ca96a4b4d08589e9772f78510677d5d0dc /OpenSim/Framework
parentPatch from Melanie: 0001087: Crash to bash de-linking objects. Thanks Melanie! (diff)
downloadopensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.zip
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.gz
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.bz2
opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.xz
* Spring cleaning.
* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/ACL.cs42
-rw-r--r--OpenSim/Framework/AgentCircuitData.cs52
-rw-r--r--OpenSim/Framework/AgentInventory.cs20
-rw-r--r--OpenSim/Framework/AssemblyInfo.cs2
-rw-r--r--OpenSim/Framework/AssetBase.cs37
-rw-r--r--OpenSim/Framework/AssetConfig.cs13
-rw-r--r--OpenSim/Framework/AssetLandmark.cs6
-rw-r--r--OpenSim/Framework/AssetRequest.cs2
-rw-r--r--OpenSim/Framework/AssetStorage.cs12
-rw-r--r--OpenSim/Framework/AuthenticateResponse.cs2
-rw-r--r--OpenSim/Framework/AvatarPickerAvatar.cs2
-rw-r--r--OpenSim/Framework/AvatarWearable.cs34
-rw-r--r--OpenSim/Framework/BlockingQueue.cs12
-rw-r--r--OpenSim/Framework/ChildAgentDataUpdate.cs28
-rw-r--r--OpenSim/Framework/ClientManager.cs24
-rw-r--r--OpenSim/Framework/ConfigurationMember.cs30
-rw-r--r--OpenSim/Framework/ConfigurationOption.cs13
-rw-r--r--OpenSim/Framework/Constants.cs2
-rw-r--r--OpenSim/Framework/Culture.cs2
-rw-r--r--OpenSim/Framework/EstateSettings.cs221
-rw-r--r--OpenSim/Framework/FriendListItem.cs6
-rw-r--r--OpenSim/Framework/GridConfig.cs29
-rw-r--r--OpenSim/Framework/GridInstantMessage.cs17
-rw-r--r--OpenSim/Framework/IAssetLoader.cs4
-rw-r--r--OpenSim/Framework/IAssetProvider.cs2
-rw-r--r--OpenSim/Framework/IAssetServer.cs4
-rw-r--r--OpenSim/Framework/IClientAPI.cs156
-rw-r--r--OpenSim/Framework/IGenericConfig.cs2
-rw-r--r--OpenSim/Framework/IInventoryData.cs6
-rw-r--r--OpenSim/Framework/IPlugin.cs2
-rw-r--r--OpenSim/Framework/IRegionCommsListener.cs2
-rw-r--r--OpenSim/Framework/IRegionLoader.cs2
-rw-r--r--OpenSim/Framework/IScene.cs20
-rw-r--r--OpenSim/Framework/IUserData.cs3
-rw-r--r--OpenSim/Framework/IUserService.cs8
-rw-r--r--OpenSim/Framework/InventoryCollection.cs2
-rw-r--r--OpenSim/Framework/InventoryConfig.cs60
-rw-r--r--OpenSim/Framework/InventoryFolderBase.cs80
-rw-r--r--OpenSim/Framework/InventoryItemBase.cs197
-rw-r--r--OpenSim/Framework/JId.cs9
-rw-r--r--OpenSim/Framework/LandData.cs35
-rw-r--r--OpenSim/Framework/Login.cs14
-rw-r--r--OpenSim/Framework/MapBlockData.cs12
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs60
-rw-r--r--OpenSim/Framework/NeighbourInfo.cs10
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs31
-rw-r--r--OpenSim/Framework/OSUUID.cs44
-rw-r--r--OpenSim/Framework/PacketPool.cs76
-rw-r--r--OpenSim/Framework/PrimitiveBaseShape.cs4
-rw-r--r--OpenSim/Framework/RegionCommsListener.cs33
-rw-r--r--OpenSim/Framework/RegionHandle.cs2
-rw-r--r--OpenSim/Framework/RegionInfo.cs148
-rw-r--r--OpenSim/Framework/RegionUpData.cs12
-rw-r--r--OpenSim/Framework/Remoting.cs4
-rw-r--r--OpenSim/Framework/SerializableInventory.cs14
-rw-r--r--OpenSim/Framework/SerializableRegionInfo.cs98
-rw-r--r--OpenSim/Framework/TaskInventoryItem.cs225
-rw-r--r--OpenSim/Framework/ThreadTracker.cs10
-rw-r--r--OpenSim/Framework/UndoStack.cs44
-rw-r--r--OpenSim/Framework/UserAgentData.cs192
-rw-r--r--OpenSim/Framework/UserConfig.cs26
-rw-r--r--OpenSim/Framework/UserProfileData.cs354
-rw-r--r--OpenSim/Framework/Util.cs65
-rw-r--r--OpenSim/Framework/sLLVector3.cs10
64 files changed, 1249 insertions, 1441 deletions
diff --git a/OpenSim/Framework/ACL.cs b/OpenSim/Framework/ACL.cs
index 88a3034..29d7f7a 100644
--- a/OpenSim/Framework/ACL.cs
+++ b/OpenSim/Framework/ACL.cs
@@ -43,8 +43,8 @@ namespace OpenSim.Framework
43 /// </summary> 43 /// </summary>
44 public class ACL 44 public class ACL
45 { 45 {
46 private Dictionary<string, Role> Roles = new Dictionary<string, Role>();
47 private Dictionary<string, Resource> Resources = new Dictionary<string, Resource>(); 46 private Dictionary<string, Resource> Resources = new Dictionary<string, Resource>();
47 private Dictionary<string, Role> Roles = new Dictionary<string, Role>();
48 48
49 public ACL AddRole(Role role) 49 public ACL AddRole(Role role)
50 { 50 {
@@ -125,14 +125,14 @@ namespace OpenSim.Framework
125 { 125 {
126 protected Role m_role; 126 protected Role m_role;
127 127
128 public Role ErrorRole 128 public AlreadyContainsRoleException(Role role)
129 { 129 {
130 get { return m_role; } 130 m_role = role;
131 } 131 }
132 132
133 public AlreadyContainsRoleException(Role role) 133 public Role ErrorRole
134 { 134 {
135 m_role = role; 135 get { return m_role; }
136 } 136 }
137 137
138 public override string ToString() 138 public override string ToString()
@@ -164,6 +164,18 @@ namespace OpenSim.Framework
164 private Role[] m_parents; 164 private Role[] m_parents;
165 private Dictionary<string, Permission> m_resources = new Dictionary<string, Permission>(); 165 private Dictionary<string, Permission> m_resources = new Dictionary<string, Permission>();
166 166
167 public Role(string name)
168 {
169 m_name = name;
170 m_parents = null;
171 }
172
173 public Role(string name, Role[] parents)
174 {
175 m_name = name;
176 m_parents = parents;
177 }
178
167 public string Name 179 public string Name
168 { 180 {
169 get { return m_name; } 181 get { return m_name; }
@@ -201,32 +213,20 @@ namespace OpenSim.Framework
201 { 213 {
202 m_resources[resource] = perm; 214 m_resources[resource] = perm;
203 } 215 }
204
205 public Role(string name)
206 {
207 m_name = name;
208 m_parents = null;
209 }
210
211 public Role(string name, Role[] parents)
212 {
213 m_name = name;
214 m_parents = parents;
215 }
216 } 216 }
217 217
218 public class Resource 218 public class Resource
219 { 219 {
220 private string m_name; 220 private string m_name;
221 221
222 public string Name 222 public Resource(string name)
223 { 223 {
224 get { return m_name; } 224 m_name = name;
225 } 225 }
226 226
227 public Resource(string name) 227 public string Name
228 { 228 {
229 m_name = name; 229 get { return m_name; }
230 } 230 }
231 } 231 }
232 232
diff --git a/OpenSim/Framework/AgentCircuitData.cs b/OpenSim/Framework/AgentCircuitData.cs
index a8cbaf0..8c184c4 100644
--- a/OpenSim/Framework/AgentCircuitData.cs
+++ b/OpenSim/Framework/AgentCircuitData.cs
@@ -32,6 +32,18 @@ namespace OpenSim.Framework
32{ 32{
33 public class AgentCircuitData 33 public class AgentCircuitData
34 { 34 {
35 public LLUUID AgentID;
36 public LLUUID BaseFolder;
37 public string CapsPath = String.Empty;
38 public bool child;
39 public uint circuitcode;
40 public string firstname;
41 public LLUUID InventoryFolder;
42 public string lastname;
43 public LLUUID SecureSessionID;
44 public LLUUID SessionID;
45 public LLVector3 startpos;
46
35 public AgentCircuitData() 47 public AgentCircuitData()
36 { 48 {
37 } 49 }
@@ -50,23 +62,25 @@ namespace OpenSim.Framework
50 BaseFolder = new LLUUID(cAgent.BaseFolder); 62 BaseFolder = new LLUUID(cAgent.BaseFolder);
51 CapsPath = cAgent.CapsPath; 63 CapsPath = cAgent.CapsPath;
52 } 64 }
53
54 public LLUUID AgentID;
55 public LLUUID SessionID;
56 public LLUUID SecureSessionID;
57 public LLVector3 startpos;
58 public string firstname;
59 public string lastname;
60 public uint circuitcode;
61 public bool child;
62 public LLUUID InventoryFolder;
63 public LLUUID BaseFolder;
64 public string CapsPath = String.Empty;
65 } 65 }
66 66
67 [Serializable] 67 [Serializable]
68 public class sAgentCircuitData 68 public class sAgentCircuitData
69 { 69 {
70 public Guid AgentID;
71 public Guid BaseFolder;
72 public string CapsPath = String.Empty;
73 public bool child;
74 public uint circuitcode;
75 public string firstname;
76 public Guid InventoryFolder;
77 public string lastname;
78 public Guid SecureSessionID;
79 public Guid SessionID;
80 public float startposx;
81 public float startposy;
82 public float startposz;
83
70 public sAgentCircuitData() 84 public sAgentCircuitData()
71 { 85 {
72 } 86 }
@@ -87,19 +101,5 @@ namespace OpenSim.Framework
87 BaseFolder = cAgent.BaseFolder.UUID; 101 BaseFolder = cAgent.BaseFolder.UUID;
88 CapsPath = cAgent.CapsPath; 102 CapsPath = cAgent.CapsPath;
89 } 103 }
90
91 public Guid AgentID;
92 public Guid SessionID;
93 public Guid SecureSessionID;
94 public float startposx;
95 public float startposy;
96 public float startposz;
97 public string firstname;
98 public string lastname;
99 public uint circuitcode;
100 public bool child;
101 public Guid InventoryFolder;
102 public Guid BaseFolder;
103 public string CapsPath = String.Empty;
104 } 104 }
105} \ No newline at end of file 105} \ No newline at end of file
diff --git a/OpenSim/Framework/AgentInventory.cs b/OpenSim/Framework/AgentInventory.cs
index ef3ad16..61e8636 100644
--- a/OpenSim/Framework/AgentInventory.cs
+++ b/OpenSim/Framework/AgentInventory.cs
@@ -35,11 +35,11 @@ namespace OpenSim.Framework
35 public class AgentInventory 35 public class AgentInventory
36 { 36 {
37 //Holds the local copy of Inventory info for a agent 37 //Holds the local copy of Inventory info for a agent
38 public LLUUID AgentID;
38 public Dictionary<LLUUID, InventoryFolder> InventoryFolders; 39 public Dictionary<LLUUID, InventoryFolder> InventoryFolders;
39 public Dictionary<LLUUID, InventoryItem> InventoryItems; 40 public Dictionary<LLUUID, InventoryItem> InventoryItems;
40 public InventoryFolder InventoryRoot; 41 public InventoryFolder InventoryRoot;
41 public int LastCached; //maybe used by opensim app, time this was last stored/compared to user server 42 public int LastCached; //maybe used by opensim app, time this was last stored/compared to user server
42 public LLUUID AgentID;
43 public AvatarWearable[] Wearables; 43 public AvatarWearable[] Wearables;
44 44
45 public AgentInventory() 45 public AgentInventory()
@@ -206,13 +206,13 @@ namespace OpenSim.Framework
206 206
207 public class InventoryFolder 207 public class InventoryFolder
208 { 208 {
209 public List<InventoryItem> Items;
210 //public List<InventoryFolder> Subfolders; 209 //public List<InventoryFolder> Subfolders;
210 public ushort DefaultType;
211 public LLUUID FolderID; 211 public LLUUID FolderID;
212 public string FolderName;
213 public List<InventoryItem> Items;
212 public LLUUID OwnerID; 214 public LLUUID OwnerID;
213 public LLUUID ParentID = LLUUID.Zero; 215 public LLUUID ParentID = LLUUID.Zero;
214 public string FolderName;
215 public ushort DefaultType;
216 public ushort Version; 216 public ushort Version;
217 217
218 public InventoryFolder() 218 public InventoryFolder()
@@ -224,15 +224,15 @@ namespace OpenSim.Framework
224 224
225 public class InventoryItem 225 public class InventoryItem
226 { 226 {
227 public LLUUID FolderID;
228 public LLUUID OwnerID;
229 public LLUUID ItemID;
230 public LLUUID AssetID; 227 public LLUUID AssetID;
231 public LLUUID CreatorID; 228 public LLUUID CreatorID;
229 public string Description;
230 public LLUUID FolderID;
232 public sbyte InvType; 231 public sbyte InvType;
233 public sbyte Type; 232 public LLUUID ItemID;
234 public string Name = String.Empty; 233 public string Name = String.Empty;
235 public string Description; 234 public LLUUID OwnerID;
235 public sbyte Type;
236 236
237 public InventoryItem() 237 public InventoryItem()
238 { 238 {
@@ -252,4 +252,4 @@ namespace OpenSim.Framework
252 return result; 252 return result;
253 } 253 }
254 } 254 }
255} 255} \ No newline at end of file
diff --git a/OpenSim/Framework/AssemblyInfo.cs b/OpenSim/Framework/AssemblyInfo.cs
index 8f86936..d43b259 100644
--- a/OpenSim/Framework/AssemblyInfo.cs
+++ b/OpenSim/Framework/AssemblyInfo.cs
@@ -60,4 +60,4 @@ using System.Runtime.InteropServices;
60// 60//
61 61
62[assembly : AssemblyVersion("1.0.0.0")] 62[assembly : AssemblyVersion("1.0.0.0")]
63[assembly : AssemblyFileVersion("1.0.0.0")] 63[assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file
diff --git a/OpenSim/Framework/AssetBase.cs b/OpenSim/Framework/AssetBase.cs
index ab09ac3..29d996b 100644
--- a/OpenSim/Framework/AssetBase.cs
+++ b/OpenSim/Framework/AssetBase.cs
@@ -34,13 +34,13 @@ namespace OpenSim.Framework
34 public class AssetBase 34 public class AssetBase
35 { 35 {
36 private byte[] _data; 36 private byte[] _data;
37 private string _description = String.Empty;
37 private LLUUID _fullid; 38 private LLUUID _fullid;
38 private sbyte _type;
39 private sbyte _invtype; 39 private sbyte _invtype;
40 private string _name = String.Empty;
41 private string _description = String.Empty;
42 private bool _local = false; 40 private bool _local = false;
41 private string _name = String.Empty;
43 private bool _temporary = false; 42 private bool _temporary = false;
43 private sbyte _type;
44 44
45 public AssetBase() 45 public AssetBase()
46 { 46 {
@@ -52,49 +52,58 @@ namespace OpenSim.Framework
52 Name = name; 52 Name = name;
53 } 53 }
54 54
55 public virtual LLUUID FullID { 55 public virtual LLUUID FullID
56 {
56 get { return _fullid; } 57 get { return _fullid; }
57 set { _fullid = value; } 58 set { _fullid = value; }
58 } 59 }
59 60
60 public virtual string ID { 61 public virtual string ID
62 {
61 get { return _fullid.ToString(); } 63 get { return _fullid.ToString(); }
62 set { _fullid = new LLUUID(value); } 64 set { _fullid = new LLUUID(value); }
63 } 65 }
64 66
65 public virtual byte[] Data { 67 public virtual byte[] Data
68 {
66 get { return _data; } 69 get { return _data; }
67 set { _data = value; } 70 set { _data = value; }
68 } 71 }
69 72
70 public virtual sbyte Type { 73 public virtual sbyte Type
74 {
71 get { return _type; } 75 get { return _type; }
72 set { _type = value; } 76 set { _type = value; }
73 } 77 }
74 78
75 public virtual sbyte InvType { 79 public virtual sbyte InvType
80 {
76 get { return _invtype; } 81 get { return _invtype; }
77 set { _invtype = value; } 82 set { _invtype = value; }
78 } 83 }
79 84
80 public virtual string Name { 85 public virtual string Name
86 {
81 get { return _name; } 87 get { return _name; }
82 set { _name = value; } 88 set { _name = value; }
83 } 89 }
84 90
85 public virtual string Description { 91 public virtual string Description
92 {
86 get { return _description; } 93 get { return _description; }
87 set { _description = value; } 94 set { _description = value; }
88 } 95 }
89 96
90 public virtual bool Local { 97 public virtual bool Local
98 {
91 get { return _local; } 99 get { return _local; }
92 set { _local = value; } 100 set { _local = value; }
93 } 101 }
94 102
95 public virtual bool Temporary { 103 public virtual bool Temporary
104 {
96 get { return _temporary; } 105 get { return _temporary; }
97 set { _temporary = value; } 106 set { _temporary = value; }
98 } 107 }
99 } 108 }
100} 109} \ No newline at end of file
diff --git a/OpenSim/Framework/AssetConfig.cs b/OpenSim/Framework/AssetConfig.cs
index 85dbaa6..dc73f37 100644
--- a/OpenSim/Framework/AssetConfig.cs
+++ b/OpenSim/Framework/AssetConfig.cs
@@ -34,16 +34,13 @@ namespace OpenSim.Framework
34 /// </summary> 34 /// </summary>
35 public class AssetConfig 35 public class AssetConfig
36 { 36 {
37 public string DefaultStartupMsg = String.Empty;
38
39 public string DatabaseProvider = String.Empty;
40
41 public string DatabaseConnect = String.Empty;
42
43 public const uint DefaultHttpPort = 8003; 37 public const uint DefaultHttpPort = 8003;
44 public uint HttpPort = DefaultHttpPort;
45 38
46 private ConfigurationMember configMember; 39 private ConfigurationMember configMember;
40 public string DatabaseConnect = String.Empty;
41 public string DatabaseProvider = String.Empty;
42 public string DefaultStartupMsg = String.Empty;
43 public uint HttpPort = DefaultHttpPort;
47 44
48 public AssetConfig(string description, string filename) 45 public AssetConfig(string description, string filename)
49 { 46 {
@@ -89,4 +86,4 @@ namespace OpenSim.Framework
89 return true; 86 return true;
90 } 87 }
91 } 88 }
92} 89} \ No newline at end of file
diff --git a/OpenSim/Framework/AssetLandmark.cs b/OpenSim/Framework/AssetLandmark.cs
index f322636..de3028b 100644
--- a/OpenSim/Framework/AssetLandmark.cs
+++ b/OpenSim/Framework/AssetLandmark.cs
@@ -32,10 +32,10 @@ namespace OpenSim.Framework
32{ 32{
33 public class AssetLandmark : AssetBase 33 public class AssetLandmark : AssetBase
34 { 34 {
35 public int Version;
36 public LLVector3 Position; 35 public LLVector3 Position;
37 public LLUUID RegionID;
38 public ulong RegionHandle; 36 public ulong RegionHandle;
37 public LLUUID RegionID;
38 public int Version;
39 39
40 public AssetLandmark(AssetBase a) 40 public AssetLandmark(AssetBase a)
41 { 41 {
@@ -58,4 +58,4 @@ namespace OpenSim.Framework
58 ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle); 58 ulong.TryParse(parts[3].Substring(14, parts[3].Length - 14), out RegionHandle);
59 } 59 }
60 } 60 }
61} 61} \ No newline at end of file
diff --git a/OpenSim/Framework/AssetRequest.cs b/OpenSim/Framework/AssetRequest.cs
index 86808f4..71d5298 100644
--- a/OpenSim/Framework/AssetRequest.cs
+++ b/OpenSim/Framework/AssetRequest.cs
@@ -34,4 +34,4 @@ namespace OpenSim.Framework
34 public LLUUID AssetID; 34 public LLUUID AssetID;
35 public bool IsTexture; 35 public bool IsTexture;
36 } 36 }
37} 37} \ No newline at end of file
diff --git a/OpenSim/Framework/AssetStorage.cs b/OpenSim/Framework/AssetStorage.cs
index 9c0f52c..d58d866 100644
--- a/OpenSim/Framework/AssetStorage.cs
+++ b/OpenSim/Framework/AssetStorage.cs
@@ -31,6 +31,11 @@ namespace OpenSim.Framework
31{ 31{
32 public class AssetStorage 32 public class AssetStorage
33 { 33 {
34 public byte[] Data;
35 public string Name;
36 public sbyte Type;
37 public LLUUID UUID;
38
34 public AssetStorage() 39 public AssetStorage()
35 { 40 {
36 } 41 }
@@ -39,10 +44,5 @@ namespace OpenSim.Framework
39 { 44 {
40 UUID = assetUUID; 45 UUID = assetUUID;
41 } 46 }
42
43 public byte[] Data;
44 public sbyte Type;
45 public string Name;
46 public LLUUID UUID;
47 } 47 }
48} 48} \ No newline at end of file
diff --git a/OpenSim/Framework/AuthenticateResponse.cs b/OpenSim/Framework/AuthenticateResponse.cs
index f7319d1..b652c01 100644
--- a/OpenSim/Framework/AuthenticateResponse.cs
+++ b/OpenSim/Framework/AuthenticateResponse.cs
@@ -36,4 +36,4 @@ namespace OpenSim.Framework
36 { 36 {
37 } 37 }
38 } 38 }
39} 39} \ No newline at end of file
diff --git a/OpenSim/Framework/AvatarPickerAvatar.cs b/OpenSim/Framework/AvatarPickerAvatar.cs
index 26a5bb2..a7e986f 100644
--- a/OpenSim/Framework/AvatarPickerAvatar.cs
+++ b/OpenSim/Framework/AvatarPickerAvatar.cs
@@ -35,4 +35,4 @@ namespace OpenSim.Framework
35 public string firstName; 35 public string firstName;
36 public string lastName; 36 public string lastName;
37 } 37 }
38} 38} \ No newline at end of file
diff --git a/OpenSim/Framework/AvatarWearable.cs b/OpenSim/Framework/AvatarWearable.cs
index cd5f7f6..fdcc776 100644
--- a/OpenSim/Framework/AvatarWearable.cs
+++ b/OpenSim/Framework/AvatarWearable.cs
@@ -48,6 +48,20 @@ namespace OpenSim.Framework
48 ItemID = itemId; 48 ItemID = itemId;
49 } 49 }
50 50
51 protected AvatarWearable(SerializationInfo info, StreamingContext context)
52 {
53 //System.Console.WriteLine("AvatarWearable Deserialize BGN");
54 if (info == null)
55 {
56 throw new ArgumentNullException("info");
57 }
58
59 AssetID = new LLUUID((Guid) info.GetValue("AssetID", typeof (Guid)));
60 ItemID = new LLUUID((Guid) info.GetValue("ItemID", typeof (Guid)));
61
62 //System.Console.WriteLine("AvatarWearable Deserialize END");
63 }
64
51 public static AvatarWearable[] DefaultWearables 65 public static AvatarWearable[] DefaultWearables
52 { 66 {
53 get 67 get
@@ -72,24 +86,12 @@ namespace OpenSim.Framework
72 } 86 }
73 } 87 }
74 88
75 protected AvatarWearable(SerializationInfo info, StreamingContext context) 89 #region ISerializable Members
76 {
77 //System.Console.WriteLine("AvatarWearable Deserialize BGN");
78 if (info == null)
79 {
80 throw new ArgumentNullException("info");
81 }
82
83 AssetID = new LLUUID((Guid)info.GetValue("AssetID", typeof(Guid)));
84 ItemID = new LLUUID((Guid)info.GetValue("ItemID", typeof(Guid)));
85
86 //System.Console.WriteLine("AvatarWearable Deserialize END");
87 }
88 90
89 [SecurityPermission(SecurityAction.LinkDemand, 91 [SecurityPermission(SecurityAction.LinkDemand,
90 Flags = SecurityPermissionFlag.SerializationFormatter)] 92 Flags = SecurityPermissionFlag.SerializationFormatter)]
91 public virtual void GetObjectData( 93 public virtual void GetObjectData(
92 SerializationInfo info, StreamingContext context) 94 SerializationInfo info, StreamingContext context)
93 { 95 {
94 if (info == null) 96 if (info == null)
95 { 97 {
@@ -99,5 +101,7 @@ namespace OpenSim.Framework
99 info.AddValue("AssetID", AssetID.UUID); 101 info.AddValue("AssetID", AssetID.UUID);
100 info.AddValue("ItemID", ItemID.UUID); 102 info.AddValue("ItemID", ItemID.UUID);
101 } 103 }
104
105 #endregion
102 } 106 }
103} 107} \ No newline at end of file
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs
index dbb3d84..345b361 100644
--- a/OpenSim/Framework/BlockingQueue.cs
+++ b/OpenSim/Framework/BlockingQueue.cs
@@ -64,13 +64,13 @@ namespace OpenSim.Framework
64 return m_queue.Contains(item); 64 return m_queue.Contains(item);
65 } 65 }
66 } 66 }
67 67
68 public int Count() 68 public int Count()
69 { 69 {
70 lock(m_queueSync) 70 lock (m_queueSync)
71 { 71 {
72 return m_queue.Count; 72 return m_queue.Count;
73 } 73 }
74 } 74 }
75 75
76 public T[] GetQueueArray() 76 public T[] GetQueueArray()
@@ -81,4 +81,4 @@ namespace OpenSim.Framework
81 } 81 }
82 } 82 }
83 } 83 }
84} 84} \ No newline at end of file
diff --git a/OpenSim/Framework/ChildAgentDataUpdate.cs b/OpenSim/Framework/ChildAgentDataUpdate.cs
index 8706f8d..423a208 100644
--- a/OpenSim/Framework/ChildAgentDataUpdate.cs
+++ b/OpenSim/Framework/ChildAgentDataUpdate.cs
@@ -32,21 +32,21 @@ namespace OpenSim.Framework
32 [Serializable] 32 [Serializable]
33 public class ChildAgentDataUpdate 33 public class ChildAgentDataUpdate
34 { 34 {
35 public ChildAgentDataUpdate() 35 public Guid ActiveGroupID;
36 {
37 }
38
39 public sLLVector3 Position;
40 public ulong regionHandle;
41 public float drawdistance;
42 public sLLVector3 cameraPosition;
43 public sLLVector3 Velocity;
44 public float AVHeight;
45 public Guid AgentID; 36 public Guid AgentID;
46 public float godlevel;
47 public byte[] throttles;
48 public bool alwaysrun; 37 public bool alwaysrun;
49 public Guid ActiveGroupID; 38 public float AVHeight;
39 public sLLVector3 cameraPosition;
40 public float drawdistance;
41 public float godlevel;
50 public uint GroupAccess; 42 public uint GroupAccess;
43 public sLLVector3 Position;
44 public ulong regionHandle;
45 public byte[] throttles;
46 public sLLVector3 Velocity;
47
48 public ChildAgentDataUpdate()
49 {
50 }
51 } 51 }
52} 52} \ No newline at end of file
diff --git a/OpenSim/Framework/ClientManager.cs b/OpenSim/Framework/ClientManager.cs
index 160d5b6..35c9319 100644
--- a/OpenSim/Framework/ClientManager.cs
+++ b/OpenSim/Framework/ClientManager.cs
@@ -42,6 +42,11 @@ namespace OpenSim.Framework
42 42
43 private Dictionary<uint, IClientAPI> m_clients; 43 private Dictionary<uint, IClientAPI> m_clients;
44 44
45 public ClientManager()
46 {
47 m_clients = new Dictionary<uint, IClientAPI>();
48 }
49
45 public void ForEachClient(ForEachClientDelegate whatToDo) 50 public void ForEachClient(ForEachClientDelegate whatToDo)
46 { 51 {
47 // Wasteful, I know 52 // Wasteful, I know
@@ -65,11 +70,6 @@ namespace OpenSim.Framework
65 } 70 }
66 } 71 }
67 72
68 public ClientManager()
69 {
70 m_clients = new Dictionary<uint, IClientAPI>();
71 }
72
73 public void Remove(uint id) 73 public void Remove(uint id)
74 { 74 {
75 //m_log.InfoFormat("[CLIENT]: Removing client with code {0}, current count {1}", id, m_clients.Count); 75 //m_log.InfoFormat("[CLIENT]: Removing client with code {0}, current count {1}", id, m_clients.Count);
@@ -94,7 +94,7 @@ namespace OpenSim.Framework
94 bool tryGetRet = false; 94 bool tryGetRet = false;
95 lock (m_clients) 95 lock (m_clients)
96 tryGetRet = m_clients.TryGetValue(circuitCode, out client); 96 tryGetRet = m_clients.TryGetValue(circuitCode, out client);
97 if(tryGetRet) 97 if (tryGetRet)
98 { 98 {
99 client.InPacket(packet); 99 client.InPacket(packet);
100 } 100 }
@@ -106,7 +106,7 @@ namespace OpenSim.Framework
106 bool tryGetRet = false; 106 bool tryGetRet = false;
107 lock (m_clients) 107 lock (m_clients)
108 tryGetRet = m_clients.TryGetValue(circuitCode, out client); 108 tryGetRet = m_clients.TryGetValue(circuitCode, out client);
109 if (tryGetRet) 109 if (tryGetRet)
110 { 110 {
111 CloseAllCircuits(client.AgentId); 111 CloseAllCircuits(client.AgentId);
112 } 112 }
@@ -125,7 +125,7 @@ namespace OpenSim.Framework
125 bool tryGetRet = false; 125 bool tryGetRet = false;
126 lock (m_clients) 126 lock (m_clients)
127 tryGetRet = m_clients.TryGetValue(circuits[i], out client); 127 tryGetRet = m_clients.TryGetValue(circuits[i], out client);
128 if(tryGetRet) 128 if (tryGetRet)
129 { 129 {
130 Remove(client.CircuitCode); 130 Remove(client.CircuitCode);
131 client.Close(false); 131 client.Close(false);
@@ -138,7 +138,7 @@ namespace OpenSim.Framework
138 } 138 }
139 } 139 }
140 140
141 public uint[] GetAllCircuits(LLUUID agentId) 141 public uint[] GetAllCircuits(LLUUID agentId)
142 { 142 {
143 List<uint> circuits = new List<uint>(); 143 List<uint> circuits = new List<uint>();
144 // Wasteful, I know 144 // Wasteful, I know
@@ -149,7 +149,7 @@ namespace OpenSim.Framework
149 m_clients.Values.CopyTo(LocalClients, 0); 149 m_clients.Values.CopyTo(LocalClients, 0);
150 } 150 }
151 151
152 for (int i = 0; i < LocalClients.Length; i++ ) 152 for (int i = 0; i < LocalClients.Length; i++)
153 { 153 {
154 if (LocalClients[i].AgentId == agentId) 154 if (LocalClients[i].AgentId == agentId)
155 { 155 {
@@ -173,7 +173,7 @@ namespace OpenSim.Framework
173 173
174 public void ViewerEffectHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock) 174 public void ViewerEffectHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock)
175 { 175 {
176 ViewerEffectPacket packet = (ViewerEffectPacket) PacketPool.Instance.GetPacket(PacketType.ViewerEffect); 176 ViewerEffectPacket packet = (ViewerEffectPacket) PacketPool.Instance.GetPacket(PacketType.ViewerEffect);
177 // TODO: don't create new blocks if recycling an old packet 177 // TODO: don't create new blocks if recycling an old packet
178 packet.Effect = effectBlock; 178 packet.Effect = effectBlock;
179 179
@@ -205,4 +205,4 @@ namespace OpenSim.Framework
205 } 205 }
206 } 206 }
207 } 207 }
208} 208} \ No newline at end of file
diff --git a/OpenSim/Framework/ConfigurationMember.cs b/OpenSim/Framework/ConfigurationMember.cs
index 12590b4..91b87a5 100644
--- a/OpenSim/Framework/ConfigurationMember.cs
+++ b/OpenSim/Framework/ConfigurationMember.cs
@@ -39,26 +39,33 @@ namespace OpenSim.Framework
39{ 39{
40 public class ConfigurationMember 40 public class ConfigurationMember
41 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 #region Delegates
43 43
44 public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result); 44 public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);
45 45
46 public delegate void ConfigurationOptionsLoad(); 46 public delegate void ConfigurationOptionsLoad();
47 47
48 private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>(); 48 #endregion
49 private string configurationFilename = String.Empty; 49
50 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
51 private int cE = 0;
52
50 private string configurationDescription = String.Empty; 53 private string configurationDescription = String.Empty;
54 private string configurationFilename = String.Empty;
51 private XmlNode configurationFromXMLNode = null; 55 private XmlNode configurationFromXMLNode = null;
52 private ConfigurationOptionsLoad loadFunction; 56 private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>();
53 private ConfigurationOptionResult resultFunction;
54
55 private IGenericConfig configurationPlugin = null; 57 private IGenericConfig configurationPlugin = null;
56 private bool useConsoleToPromptOnError = true; 58
57 /// <summary> 59 /// <summary>
58 /// This is the default configuration DLL loaded 60 /// This is the default configuration DLL loaded
59 /// </summary> 61 /// </summary>
60 private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll"; 62 private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll";
61 63
64 private ConfigurationOptionsLoad loadFunction;
65 private ConfigurationOptionResult resultFunction;
66
67 private bool useConsoleToPromptOnError = true;
68
62 public ConfigurationMember(string configuration_filename, string configuration_description, 69 public ConfigurationMember(string configuration_filename, string configuration_description,
63 ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error) 70 ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function, bool use_console_to_prompt_on_error)
64 { 71 {
@@ -150,7 +157,6 @@ namespace OpenSim.Framework
150 } 157 }
151 158
152 // TEMP - REMOVE 159 // TEMP - REMOVE
153 private int cE = 0;
154 public void performConfigurationRetrieve() 160 public void performConfigurationRetrieve()
155 { 161 {
156 if (cE > 1) 162 if (cE > 1)
@@ -162,14 +168,14 @@ namespace OpenSim.Framework
162 if (loadFunction == null) 168 if (loadFunction == null)
163 { 169 {
164 m_log.Error("Load Function for '" + configurationDescription + 170 m_log.Error("Load Function for '" + configurationDescription +
165 "' is null. Refusing to run configuration."); 171 "' is null. Refusing to run configuration.");
166 return; 172 return;
167 } 173 }
168 174
169 if (resultFunction == null) 175 if (resultFunction == null)
170 { 176 {
171 m_log.Error("Result Function for '" + configurationDescription + 177 m_log.Error("Result Function for '" + configurationDescription +
172 "' is null. Refusing to run configuration."); 178 "' is null. Refusing to run configuration.");
173 return; 179 return;
174 } 180 }
175 181
@@ -261,7 +267,7 @@ namespace OpenSim.Framework
261 { 267 {
262 console_result = 268 console_result =
263 MainConsole.Instance.CmdPrompt(configOption.configurationQuestion, 269 MainConsole.Instance.CmdPrompt(configOption.configurationQuestion,
264 configOption.configurationDefault); 270 configOption.configurationDefault);
265 } 271 }
266 } 272 }
267 else 273 else
@@ -500,4 +506,4 @@ namespace OpenSim.Framework
500 configurationPlugin.Close(); 506 configurationPlugin.Close();
501 } 507 }
502 } 508 }
503} 509} \ No newline at end of file
diff --git a/OpenSim/Framework/ConfigurationOption.cs b/OpenSim/Framework/ConfigurationOption.cs
index b9919ca..9bb5d8f 100644
--- a/OpenSim/Framework/ConfigurationOption.cs
+++ b/OpenSim/Framework/ConfigurationOption.cs
@@ -31,8 +31,14 @@ namespace OpenSim.Framework
31{ 31{
32 public class ConfigurationOption 32 public class ConfigurationOption
33 { 33 {
34 #region Delegates
35
34 public delegate bool ConfigurationOptionShouldBeAsked(string configuration_key); 36 public delegate bool ConfigurationOptionShouldBeAsked(string configuration_key);
35 37
38 #endregion
39
40 #region ConfigurationTypes enum
41
36 public enum ConfigurationTypes 42 public enum ConfigurationTypes
37 { 43 {
38 TYPE_STRING, 44 TYPE_STRING,
@@ -53,12 +59,15 @@ namespace OpenSim.Framework
53 TYPE_DOUBLE 59 TYPE_DOUBLE
54 } ; 60 } ;
55 61
62 #endregion
63
64 public string configurationDefault = String.Empty;
65
56 public string configurationKey = String.Empty; 66 public string configurationKey = String.Empty;
57 public string configurationQuestion = String.Empty; 67 public string configurationQuestion = String.Empty;
58 public string configurationDefault = String.Empty;
59 68
60 public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING; 69 public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING;
61 public bool configurationUseDefaultNoPrompt = false; 70 public bool configurationUseDefaultNoPrompt = false;
62 public ConfigurationOptionShouldBeAsked shouldIBeAsked; //Should I be asked now? Based on previous answers 71 public ConfigurationOptionShouldBeAsked shouldIBeAsked; //Should I be asked now? Based on previous answers
63 } 72 }
64} 73} \ No newline at end of file
diff --git a/OpenSim/Framework/Constants.cs b/OpenSim/Framework/Constants.cs
index 66b0885..395b71d 100644
--- a/OpenSim/Framework/Constants.cs
+++ b/OpenSim/Framework/Constants.cs
@@ -32,4 +32,4 @@ namespace OpenSim.Framework
32 public const uint RegionSize = 256; 32 public const uint RegionSize = 256;
33 public const byte TerrainPatchSize = 16; 33 public const byte TerrainPatchSize = 16;
34 } 34 }
35} 35} \ No newline at end of file
diff --git a/OpenSim/Framework/Culture.cs b/OpenSim/Framework/Culture.cs
index 1102060..bf4eec4 100644
--- a/OpenSim/Framework/Culture.cs
+++ b/OpenSim/Framework/Culture.cs
@@ -50,4 +50,4 @@ namespace OpenSim.Framework
50 Thread.CurrentThread.CurrentCulture = m_cultureInfo; 50 Thread.CurrentThread.CurrentCulture = m_cultureInfo;
51 } 51 }
52 } 52 }
53} 53} \ No newline at end of file
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index efb55fe..331d7c3 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -36,10 +36,72 @@ namespace OpenSim.Framework
36 public class EstateSettings 36 public class EstateSettings
37 { 37 {
38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 38 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
39 private ConfigurationMember configMember;
39 40
40 //Settings to this island 41 //Settings to this island
41 private float m_billableFactor; 42 private float m_billableFactor;
42 43
44 private uint m_estateID;
45 private LLUUID m_estateManager0;
46 private LLUUID m_estateManager1;
47 private LLUUID m_estateManager2;
48 private LLUUID m_estateManager3;
49 private LLUUID m_estateManager4;
50 private LLUUID m_estateManager5;
51 private LLUUID m_estateManager6;
52 private LLUUID m_estateManager7;
53 private LLUUID m_estateManager8;
54 private LLUUID m_estateManager9;
55 private string m_estateName;
56 private byte m_maxAgents;
57 private float m_objectBonusFactor;
58
59 private uint m_parentEstateID;
60 private int m_pricePerMeter;
61 private int m_redirectGridX;
62 private int m_redirectGridY;
63 private bool m_regionAllowTerraform;
64 private Simulator.RegionFlags m_regionFlags;
65 private ushort m_regionWaterHeight;
66 private Simulator.SimAccess m_simAccess;
67 private float m_sunHour;
68 private LLVector3 m_sunPosition;
69 private LLUUID m_terrainBase0;
70 private LLUUID m_terrainBase1;
71 private LLUUID m_terrainBase2;
72 private LLUUID m_terrainBase3;
73 private LLUUID m_terrainDetail0;
74 private LLUUID m_terrainDetail1;
75 private LLUUID m_terrainDetail2;
76 private LLUUID m_terrainDetail3;
77 private string m_terrainFile;
78 private float m_terrainHeightRange0;
79 private float m_terrainHeightRange1;
80 private float m_terrainHeightRange2;
81 private float m_terrainHeightRange3;
82 private LLUUID m_terrainImageID;
83 private float m_terrainLowerLimit;
84 private double m_terrainMultiplier;
85 private float m_terrainRaiseLimit;
86 private float m_terrainStartHeight0;
87 private float m_terrainStartHeight1;
88 private float m_terrainStartHeight2;
89 private float m_terrainStartHeight3;
90 private bool m_useFixedSun;
91 private float m_waterHeight;
92
93 public EstateSettings()
94 {
95 // Temporary hack to prevent multiple loadings.
96 if (configMember == null)
97 {
98 configMember =
99 new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS",
100 loadConfigurationOptions, handleIncomingConfiguration, true);
101 configMember.performConfigurationRetrieve();
102 }
103 }
104
43 public float billableFactor 105 public float billableFactor
44 { 106 {
45 get { return m_billableFactor; } 107 get { return m_billableFactor; }
@@ -50,8 +112,6 @@ namespace OpenSim.Framework
50 } 112 }
51 } 113 }
52 114
53 private uint m_estateID;
54
55 public uint estateID 115 public uint estateID
56 { 116 {
57 get { return m_estateID; } 117 get { return m_estateID; }
@@ -62,8 +122,6 @@ namespace OpenSim.Framework
62 } 122 }
63 } 123 }
64 124
65 private uint m_parentEstateID;
66
67 public uint parentEstateID 125 public uint parentEstateID
68 { 126 {
69 get { return m_parentEstateID; } 127 get { return m_parentEstateID; }
@@ -74,8 +132,6 @@ namespace OpenSim.Framework
74 } 132 }
75 } 133 }
76 134
77 private byte m_maxAgents;
78
79 public byte maxAgents 135 public byte maxAgents
80 { 136 {
81 get { return m_maxAgents; } 137 get { return m_maxAgents; }
@@ -86,8 +142,6 @@ namespace OpenSim.Framework
86 } 142 }
87 } 143 }
88 144
89 private float m_objectBonusFactor;
90
91 public float objectBonusFactor 145 public float objectBonusFactor
92 { 146 {
93 get { return m_objectBonusFactor; } 147 get { return m_objectBonusFactor; }
@@ -98,8 +152,6 @@ namespace OpenSim.Framework
98 } 152 }
99 } 153 }
100 154
101 private int m_redirectGridX;
102
103 public int redirectGridX 155 public int redirectGridX
104 { 156 {
105 get { return m_redirectGridX; } 157 get { return m_redirectGridX; }
@@ -110,8 +162,6 @@ namespace OpenSim.Framework
110 } 162 }
111 } 163 }
112 164
113 private int m_redirectGridY;
114
115 public int redirectGridY 165 public int redirectGridY
116 { 166 {
117 get { return m_redirectGridY; } 167 get { return m_redirectGridY; }
@@ -122,8 +172,6 @@ namespace OpenSim.Framework
122 } 172 }
123 } 173 }
124 174
125 private Simulator.RegionFlags m_regionFlags;
126
127 public Simulator.RegionFlags regionFlags 175 public Simulator.RegionFlags regionFlags
128 { 176 {
129 get { return m_regionFlags; } 177 get { return m_regionFlags; }
@@ -131,24 +179,20 @@ namespace OpenSim.Framework
131 { 179 {
132 //m_regionFlags = (Simulator.RegionFlags)0x400000; 180 //m_regionFlags = (Simulator.RegionFlags)0x400000;
133 m_regionFlags = value; 181 m_regionFlags = value;
134 configMember.forceSetConfigurationOption("region_flags", ((uint)m_regionFlags).ToString()); 182 configMember.forceSetConfigurationOption("region_flags", ((uint) m_regionFlags).ToString());
135 } 183 }
136 } 184 }
137 185
138 private Simulator.SimAccess m_simAccess;
139
140 public Simulator.SimAccess simAccess 186 public Simulator.SimAccess simAccess
141 { 187 {
142 get { return m_simAccess; } 188 get { return m_simAccess; }
143 set 189 set
144 { 190 {
145 m_simAccess = value; 191 m_simAccess = value;
146 configMember.forceSetConfigurationOption("sim_access", ((byte)m_simAccess).ToString()); 192 configMember.forceSetConfigurationOption("sim_access", ((byte) m_simAccess).ToString());
147 } 193 }
148 } 194 }
149 195
150 private float m_sunHour;
151
152 public float sunHour 196 public float sunHour
153 { 197 {
154 get { return m_sunHour; } 198 get { return m_sunHour; }
@@ -159,8 +203,6 @@ namespace OpenSim.Framework
159 } 203 }
160 } 204 }
161 205
162 private LLVector3 m_sunPosition;
163
164 public LLVector3 sunPosition 206 public LLVector3 sunPosition
165 { 207 {
166 get { return m_sunPosition; } 208 get { return m_sunPosition; }
@@ -171,8 +213,6 @@ namespace OpenSim.Framework
171 } 213 }
172 } 214 }
173 215
174 private float m_terrainRaiseLimit;
175
176 public float terrainRaiseLimit 216 public float terrainRaiseLimit
177 { 217 {
178 get { return m_terrainRaiseLimit; } 218 get { return m_terrainRaiseLimit; }
@@ -183,8 +223,6 @@ namespace OpenSim.Framework
183 } 223 }
184 } 224 }
185 225
186 private float m_terrainLowerLimit;
187
188 public float terrainLowerLimit 226 public float terrainLowerLimit
189 { 227 {
190 get { return m_terrainLowerLimit; } 228 get { return m_terrainLowerLimit; }
@@ -195,8 +233,6 @@ namespace OpenSim.Framework
195 } 233 }
196 } 234 }
197 235
198 private bool m_useFixedSun;
199
200 public bool useFixedSun 236 public bool useFixedSun
201 { 237 {
202 get { return m_useFixedSun; } 238 get { return m_useFixedSun; }
@@ -207,8 +243,6 @@ namespace OpenSim.Framework
207 } 243 }
208 } 244 }
209 245
210 private int m_pricePerMeter;
211
212 public int pricePerMeter 246 public int pricePerMeter
213 { 247 {
214 get { return m_pricePerMeter; } 248 get { return m_pricePerMeter; }
@@ -220,8 +254,6 @@ namespace OpenSim.Framework
220 } 254 }
221 255
222 256
223 private ushort m_regionWaterHeight;
224
225 public ushort regionWaterHeight 257 public ushort regionWaterHeight
226 { 258 {
227 get { return m_regionWaterHeight; } 259 get { return m_regionWaterHeight; }
@@ -233,8 +265,6 @@ namespace OpenSim.Framework
233 } 265 }
234 266
235 267
236 private bool m_regionAllowTerraform;
237
238 public bool regionAllowTerraform 268 public bool regionAllowTerraform
239 { 269 {
240 get { return m_regionAllowTerraform; } 270 get { return m_regionAllowTerraform; }
@@ -248,7 +278,6 @@ namespace OpenSim.Framework
248 278
249 // Region Information 279 // Region Information
250 // Low resolution 'base' textures. No longer used. 280 // Low resolution 'base' textures. No longer used.
251 private LLUUID m_terrainBase0;
252 281
253 public LLUUID terrainBase0 282 public LLUUID terrainBase0
254 { 283 {
@@ -260,8 +289,6 @@ namespace OpenSim.Framework
260 } 289 }
261 } 290 }
262 291
263 private LLUUID m_terrainBase1;
264
265 public LLUUID terrainBase1 292 public LLUUID terrainBase1
266 { 293 {
267 get { return m_terrainBase1; } 294 get { return m_terrainBase1; }
@@ -272,8 +299,6 @@ namespace OpenSim.Framework
272 } 299 }
273 } 300 }
274 301
275 private LLUUID m_terrainBase2;
276
277 public LLUUID terrainBase2 302 public LLUUID terrainBase2
278 { 303 {
279 get { return m_terrainBase2; } 304 get { return m_terrainBase2; }
@@ -284,8 +309,6 @@ namespace OpenSim.Framework
284 } 309 }
285 } 310 }
286 311
287 private LLUUID m_terrainBase3;
288
289 public LLUUID terrainBase3 312 public LLUUID terrainBase3
290 { 313 {
291 get { return m_terrainBase3; } 314 get { return m_terrainBase3; }
@@ -298,7 +321,6 @@ namespace OpenSim.Framework
298 321
299 322
300 // Higher resolution terrain textures 323 // Higher resolution terrain textures
301 private LLUUID m_terrainDetail0;
302 324
303 public LLUUID terrainDetail0 325 public LLUUID terrainDetail0
304 { 326 {
@@ -310,8 +332,6 @@ namespace OpenSim.Framework
310 } 332 }
311 } 333 }
312 334
313 private LLUUID m_terrainDetail1;
314
315 public LLUUID terrainDetail1 335 public LLUUID terrainDetail1
316 { 336 {
317 get { return m_terrainDetail1; } 337 get { return m_terrainDetail1; }
@@ -322,8 +342,6 @@ namespace OpenSim.Framework
322 } 342 }
323 } 343 }
324 344
325 private LLUUID m_terrainDetail2;
326
327 public LLUUID terrainDetail2 345 public LLUUID terrainDetail2
328 { 346 {
329 get { return m_terrainDetail2; } 347 get { return m_terrainDetail2; }
@@ -334,8 +352,6 @@ namespace OpenSim.Framework
334 } 352 }
335 } 353 }
336 354
337 private LLUUID m_terrainDetail3;
338
339 public LLUUID terrainDetail3 355 public LLUUID terrainDetail3
340 { 356 {
341 get { return m_terrainDetail3; } 357 get { return m_terrainDetail3; }
@@ -347,7 +363,6 @@ namespace OpenSim.Framework
347 } 363 }
348 364
349 // First quad - each point is bilinearly interpolated at each meter of terrain 365 // First quad - each point is bilinearly interpolated at each meter of terrain
350 private float m_terrainStartHeight0;
351 366
352 public float terrainStartHeight0 367 public float terrainStartHeight0
353 { 368 {
@@ -360,8 +375,6 @@ namespace OpenSim.Framework
360 } 375 }
361 376
362 377
363 private float m_terrainStartHeight1;
364
365 public float terrainStartHeight1 378 public float terrainStartHeight1
366 { 379 {
367 get { return m_terrainStartHeight1; } 380 get { return m_terrainStartHeight1; }
@@ -372,8 +385,6 @@ namespace OpenSim.Framework
372 } 385 }
373 } 386 }
374 387
375 private float m_terrainStartHeight2;
376
377 public float terrainStartHeight2 388 public float terrainStartHeight2
378 { 389 {
379 get { return m_terrainStartHeight2; } 390 get { return m_terrainStartHeight2; }
@@ -384,8 +395,6 @@ namespace OpenSim.Framework
384 } 395 }
385 } 396 }
386 397
387 private float m_terrainStartHeight3;
388
389 public float terrainStartHeight3 398 public float terrainStartHeight3
390 { 399 {
391 get { return m_terrainStartHeight3; } 400 get { return m_terrainStartHeight3; }
@@ -399,7 +408,6 @@ namespace OpenSim.Framework
399 // Second quad - also bilinearly interpolated. 408 // Second quad - also bilinearly interpolated.
400 // Terrain texturing is done that: 409 // Terrain texturing is done that:
401 // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y] 410 // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
402 private float m_terrainHeightRange0;
403 411
404 public float terrainHeightRange0 412 public float terrainHeightRange0
405 { 413 {
@@ -411,8 +419,6 @@ namespace OpenSim.Framework
411 } 419 }
412 } 420 }
413 421
414 private float m_terrainHeightRange1;
415
416 public float terrainHeightRange1 422 public float terrainHeightRange1
417 { 423 {
418 get { return m_terrainHeightRange1; } 424 get { return m_terrainHeightRange1; }
@@ -423,8 +429,6 @@ namespace OpenSim.Framework
423 } 429 }
424 } 430 }
425 431
426 private float m_terrainHeightRange2;
427
428 public float terrainHeightRange2 432 public float terrainHeightRange2
429 { 433 {
430 get { return m_terrainHeightRange2; } 434 get { return m_terrainHeightRange2; }
@@ -435,8 +439,6 @@ namespace OpenSim.Framework
435 } 439 }
436 } 440 }
437 441
438 private float m_terrainHeightRange3;
439
440 public float terrainHeightRange3 442 public float terrainHeightRange3
441 { 443 {
442 get { return m_terrainHeightRange3; } 444 get { return m_terrainHeightRange3; }
@@ -448,7 +450,6 @@ namespace OpenSim.Framework
448 } 450 }
449 451
450 // Terrain Default (Must be in F32 Format!) 452 // Terrain Default (Must be in F32 Format!)
451 private string m_terrainFile;
452 453
453 public string terrainFile 454 public string terrainFile
454 { 455 {
@@ -460,8 +461,6 @@ namespace OpenSim.Framework
460 } 461 }
461 } 462 }
462 463
463 private double m_terrainMultiplier;
464
465 public double terrainMultiplier 464 public double terrainMultiplier
466 { 465 {
467 get { return m_terrainMultiplier; } 466 get { return m_terrainMultiplier; }
@@ -472,8 +471,6 @@ namespace OpenSim.Framework
472 } 471 }
473 } 472 }
474 473
475 private float m_waterHeight;
476
477 public float waterHeight 474 public float waterHeight
478 { 475 {
479 get { return m_waterHeight; } 476 get { return m_waterHeight; }
@@ -484,8 +481,6 @@ namespace OpenSim.Framework
484 } 481 }
485 } 482 }
486 483
487 private LLUUID m_terrainImageID;
488
489 public LLUUID terrainImageID 484 public LLUUID terrainImageID
490 { 485 {
491 get { return m_terrainImageID; } 486 get { return m_terrainImageID; }
@@ -501,7 +496,6 @@ namespace OpenSim.Framework
501 } 496 }
502 497
503 // Estate name 498 // Estate name
504 private string m_estateName;
505 499
506 public string estateName 500 public string estateName
507 { 501 {
@@ -513,24 +507,14 @@ namespace OpenSim.Framework
513 } 507 }
514 } 508 }
515 509
516 private LLUUID m_estateManager0;
517 private LLUUID m_estateManager1;
518 private LLUUID m_estateManager2;
519 private LLUUID m_estateManager3;
520 private LLUUID m_estateManager4;
521 private LLUUID m_estateManager5;
522 private LLUUID m_estateManager6;
523 private LLUUID m_estateManager7;
524 private LLUUID m_estateManager8;
525 private LLUUID m_estateManager9;
526
527 public LLUUID[] estateManagers 510 public LLUUID[] estateManagers
528 { 511 {
529 get { 512 get
513 {
530 // returns a condensed array of LLUUIDs 514 // returns a condensed array of LLUUIDs
531 return GetEstateManagers(); 515 return GetEstateManagers();
532 } 516 }
533 set 517 set
534 { 518 {
535 // Sets a Condensed array of LLUUIDS 519 // Sets a Condensed array of LLUUIDS
536 int i = 0; 520 int i = 0;
@@ -611,8 +595,8 @@ namespace OpenSim.Framework
611 595
612 for (i = 0; i < 10; i++) 596 for (i = 0; i < 10; i++)
613 { 597 {
614 // Writes out the Estate managers to the XML file. 598 // Writes out the Estate managers to the XML file.
615 configMember.forceSetConfigurationOption("estate_manager_" + i, (GetEstateManagerAtPos(i)).ToString()); 599 configMember.forceSetConfigurationOption("estate_manager_" + i, (GetEstateManagerAtPos(i)).ToString());
616 } 600 }
617 } 601 }
618 } 602 }
@@ -626,37 +610,36 @@ namespace OpenSim.Framework
626 { 610 {
627 case 0: 611 case 0:
628 return m_estateManager0; 612 return m_estateManager0;
629 613
630 case 1: 614 case 1:
631 return m_estateManager1; 615 return m_estateManager1;
632 616
633 case 2: 617 case 2:
634 return m_estateManager2; 618 return m_estateManager2;
635 619
636 case 3: 620 case 3:
637 return m_estateManager3; 621 return m_estateManager3;
638 622
639 case 4: 623 case 4:
640 return m_estateManager4; 624 return m_estateManager4;
641 625
642 case 5: 626 case 5:
643 return m_estateManager5; 627 return m_estateManager5;
644 628
645 case 6: 629 case 6:
646 return m_estateManager6; 630 return m_estateManager6;
647 631
648 case 7: 632 case 7:
649 return m_estateManager7; 633 return m_estateManager7;
650 634
651 case 8: 635 case 8:
652 return m_estateManager8; 636 return m_estateManager8;
653 637
654 case 9: 638 case 9:
655 return m_estateManager9; 639 return m_estateManager9;
656 640
657 default: 641 default:
658 return LLUUID.Zero; 642 return LLUUID.Zero;
659
660 } 643 }
661 } 644 }
662 645
@@ -671,8 +654,8 @@ namespace OpenSim.Framework
671 { 654 {
672 pos = GetNextEstateManager(pos); 655 pos = GetNextEstateManager(pos);
673 656
674 rEstateManagers[i] = GetEstateManagerAtPos(pos); pos++; 657 rEstateManagers[i] = GetEstateManagerAtPos(pos);
675 658 pos++;
676 } 659 }
677 return rEstateManagers; 660 return rEstateManagers;
678 } 661 }
@@ -681,12 +664,11 @@ namespace OpenSim.Framework
681 { 664 {
682 // This is a utility function that skips over estate managers set to LLUUID.Zero 665 // This is a utility function that skips over estate managers set to LLUUID.Zero
683 int i = startpos; 666 int i = startpos;
684 for (i=startpos;i<10;i++) 667 for (i = startpos; i < 10; i++)
685 { 668 {
686 if (GetEstateManagerAtPos(i) != LLUUID.Zero) return i; 669 if (GetEstateManagerAtPos(i) != LLUUID.Zero) return i;
687 } 670 }
688 return i; 671 return i;
689
690 } 672 }
691 673
692 private int GetNumberOfEstateManagers() 674 private int GetNumberOfEstateManagers()
@@ -723,14 +705,13 @@ namespace OpenSim.Framework
723 705
724 //Saves it to the estate settings file 706 //Saves it to the estate settings file
725 estateManagers = nestateManagers; 707 estateManagers = nestateManagers;
726
727 } 708 }
728 709
729 public void RemoveEstateManager(LLUUID avatarID) 710 public void RemoveEstateManager(LLUUID avatarID)
730 { 711 {
731 int notfoundparam = 11; // starting high so the condense routine (max ten) doesn't run if we don't find it. 712 int notfoundparam = 11; // starting high so the condense routine (max ten) doesn't run if we don't find it.
732 LLUUID[] testateManagers = GetEstateManagers(); // temporary estate managers list 713 LLUUID[] testateManagers = GetEstateManagers(); // temporary estate managers list
733 714
734 715
735 int i = 0; 716 int i = 0;
736 int foundpos = notfoundparam; 717 int foundpos = notfoundparam;
@@ -766,20 +747,6 @@ namespace OpenSim.Framework
766 747
767 #endregion 748 #endregion
768 749
769 private ConfigurationMember configMember;
770
771 public EstateSettings()
772 {
773 // Temporary hack to prevent multiple loadings.
774 if (configMember == null)
775 {
776 configMember =
777 new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS",
778 loadConfigurationOptions, handleIncomingConfiguration, true);
779 configMember.performConfigurationRetrieve();
780 }
781 }
782
783 public void loadConfigurationOptions() 750 public void loadConfigurationOptions()
784 { 751 {
785 configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty, 752 configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, String.Empty,
@@ -1010,38 +977,38 @@ namespace OpenSim.Framework
1010 break; 977 break;
1011 978
1012 case "estate_manager_0": 979 case "estate_manager_0":
1013 m_estateManager0 = (LLUUID)configuration_result; 980 m_estateManager0 = (LLUUID) configuration_result;
1014 break; 981 break;
1015 case "estate_manager_1": 982 case "estate_manager_1":
1016 m_estateManager1 = (LLUUID)configuration_result; 983 m_estateManager1 = (LLUUID) configuration_result;
1017 break; 984 break;
1018 case "estate_manager_2": 985 case "estate_manager_2":
1019 m_estateManager2 = (LLUUID)configuration_result; 986 m_estateManager2 = (LLUUID) configuration_result;
1020 break; 987 break;
1021 case "estate_manager_3": 988 case "estate_manager_3":
1022 m_estateManager3 = (LLUUID)configuration_result; 989 m_estateManager3 = (LLUUID) configuration_result;
1023 break; 990 break;
1024 case "estate_manager_4": 991 case "estate_manager_4":
1025 m_estateManager4 = (LLUUID)configuration_result; 992 m_estateManager4 = (LLUUID) configuration_result;
1026 break; 993 break;
1027 case "estate_manager_5": 994 case "estate_manager_5":
1028 m_estateManager5 = (LLUUID)configuration_result; 995 m_estateManager5 = (LLUUID) configuration_result;
1029 break; 996 break;
1030 case "estate_manager_6": 997 case "estate_manager_6":
1031 m_estateManager6 = (LLUUID)configuration_result; 998 m_estateManager6 = (LLUUID) configuration_result;
1032 break; 999 break;
1033 case "estate_manager_7": 1000 case "estate_manager_7":
1034 m_estateManager7 = (LLUUID)configuration_result; 1001 m_estateManager7 = (LLUUID) configuration_result;
1035 break; 1002 break;
1036 case "estate_manager_8": 1003 case "estate_manager_8":
1037 m_estateManager8 = (LLUUID)configuration_result; 1004 m_estateManager8 = (LLUUID) configuration_result;
1038 break; 1005 break;
1039 case "estate_manager_9": 1006 case "estate_manager_9":
1040 m_estateManager9 = (LLUUID)configuration_result; 1007 m_estateManager9 = (LLUUID) configuration_result;
1041 break; 1008 break;
1042 } 1009 }
1043 1010
1044 return true; 1011 return true;
1045 } 1012 }
1046 } 1013 }
1047} 1014} \ No newline at end of file
diff --git a/OpenSim/Framework/FriendListItem.cs b/OpenSim/Framework/FriendListItem.cs
index 9220705..d3ca759 100644
--- a/OpenSim/Framework/FriendListItem.cs
+++ b/OpenSim/Framework/FriendListItem.cs
@@ -31,15 +31,15 @@ namespace OpenSim.Framework
31{ 31{
32 public class FriendListItem 32 public class FriendListItem
33 { 33 {
34 public LLUUID FriendListOwner;
35 public LLUUID Friend; 34 public LLUUID Friend;
35 public LLUUID FriendListOwner;
36 36
37 // These are what the list owner gives the friend permission to do 37 // These are what the list owner gives the friend permission to do
38 public uint FriendPerms;
39 38
40 // These are what the friend gives the listowner permission to do 39 // These are what the friend gives the listowner permission to do
41 public uint FriendListOwnerPerms; 40 public uint FriendListOwnerPerms;
41 public uint FriendPerms;
42 42
43 public bool onlinestatus = false; 43 public bool onlinestatus = false;
44 } 44 }
45} 45} \ No newline at end of file
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 7ccd0c4..f0cf91f 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -31,27 +31,22 @@ namespace OpenSim.Framework
31{ 31{
32 public class GridConfig 32 public class GridConfig
33 { 33 {
34 public string GridOwner = String.Empty;
35 public string DefaultAssetServer = String.Empty;
36 public string AssetSendKey = String.Empty;
37 public string AssetRecvKey = String.Empty;
38
39 public string DefaultUserServer = String.Empty;
40 public string UserSendKey = String.Empty;
41 public string UserRecvKey = String.Empty;
42
43 public string SimSendKey = String.Empty;
44 public string SimRecvKey = String.Empty;
45
46 public string DatabaseProvider = String.Empty;
47
48
49 public static uint DefaultHttpPort = 8001; 34 public static uint DefaultHttpPort = 8001;
50 public uint HttpPort = DefaultHttpPort;
51 35
52 public string AllowForcefulBanlines = "TRUE"; 36 public string AllowForcefulBanlines = "TRUE";
37 public string AssetRecvKey = String.Empty;
38 public string AssetSendKey = String.Empty;
53 39
54 private ConfigurationMember configMember; 40 private ConfigurationMember configMember;
41 public string DatabaseProvider = String.Empty;
42 public string DefaultAssetServer = String.Empty;
43 public string DefaultUserServer = String.Empty;
44 public string GridOwner = String.Empty;
45 public uint HttpPort = DefaultHttpPort;
46 public string SimRecvKey = String.Empty;
47 public string SimSendKey = String.Empty;
48 public string UserRecvKey = String.Empty;
49 public string UserSendKey = String.Empty;
55 50
56 public GridConfig(string description, string filename) 51 public GridConfig(string description, string filename)
57 { 52 {
@@ -144,4 +139,4 @@ namespace OpenSim.Framework
144 return true; 139 return true;
145 } 140 }
146 } 141 }
147} 142} \ No newline at end of file
diff --git a/OpenSim/Framework/GridInstantMessage.cs b/OpenSim/Framework/GridInstantMessage.cs
index 77e5460..08c5f28 100644
--- a/OpenSim/Framework/GridInstantMessage.cs
+++ b/OpenSim/Framework/GridInstantMessage.cs
@@ -32,16 +32,15 @@ namespace OpenSim.Framework
32 [Serializable] 32 [Serializable]
33 public class GridInstantMessage 33 public class GridInstantMessage
34 { 34 {
35 public byte[] binaryBucket;
36 public byte dialog;
35 public Guid fromAgentID; 37 public Guid fromAgentID;
38 public string fromAgentName;
36 public Guid fromAgentSession; 39 public Guid fromAgentSession;
37 public Guid toAgentID; 40 public bool fromGroup;
38 public Guid imSessionID; 41 public Guid imSessionID;
39 public uint timestamp;
40 public string fromAgentName;
41 42
42 public string message; 43 public string message;
43 public byte dialog;
44 public bool fromGroup;
45 public byte offline; 44 public byte offline;
46 45
47 public uint ParentEstateID; 46 public uint ParentEstateID;
@@ -49,11 +48,11 @@ namespace OpenSim.Framework
49 public sLLVector3 Position; 48 public sLLVector3 Position;
50 49
51 public Guid RegionID; 50 public Guid RegionID;
52 51 public uint timestamp;
53 public byte[] binaryBucket; 52 public Guid toAgentID;
54 53
55 public GridInstantMessage() 54 public GridInstantMessage()
56 { 55 {
57 } 56 }
58 } 57 }
59} 58} \ No newline at end of file
diff --git a/OpenSim/Framework/IAssetLoader.cs b/OpenSim/Framework/IAssetLoader.cs
index 89db68a..6aa71d3 100644
--- a/OpenSim/Framework/IAssetLoader.cs
+++ b/OpenSim/Framework/IAssetLoader.cs
@@ -28,10 +28,10 @@
28using System; 28using System;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 public interface IAssetLoader 32 public interface IAssetLoader
33 { 33 {
34 void ForEachDefaultXmlAsset(Action<AssetBase> action); 34 void ForEachDefaultXmlAsset(Action<AssetBase> action);
35 void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action); 35 void ForEachDefaultXmlAsset(string assetSetFilename, Action<AssetBase> action);
36 } 36 }
37} 37} \ No newline at end of file
diff --git a/OpenSim/Framework/IAssetProvider.cs b/OpenSim/Framework/IAssetProvider.cs
index dcb79ea..5c02ff1 100644
--- a/OpenSim/Framework/IAssetProvider.cs
+++ b/OpenSim/Framework/IAssetProvider.cs
@@ -38,4 +38,4 @@ namespace OpenSim.Framework
38 void CommitAssets(); // force a sync to the database 38 void CommitAssets(); // force a sync to the database
39 void Initialise(string connect); 39 void Initialise(string connect);
40 } 40 }
41} 41} \ No newline at end of file
diff --git a/OpenSim/Framework/IAssetServer.cs b/OpenSim/Framework/IAssetServer.cs
index 23c0642..06a7e32 100644
--- a/OpenSim/Framework/IAssetServer.cs
+++ b/OpenSim/Framework/IAssetServer.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Framework
50 /// <param name="asset"></param> 50 /// <param name="asset"></param>
51 /// <param name="IsTexture"></param> 51 /// <param name="IsTexture"></param>
52 void AssetReceived(AssetBase asset, bool IsTexture); 52 void AssetReceived(AssetBase asset, bool IsTexture);
53 53
54 /// <summary> 54 /// <summary>
55 /// Call back made when an asset server could not retrieve a requested asset 55 /// Call back made when an asset server could not retrieve a requested asset
56 /// </summary> 56 /// </summary>
@@ -62,4 +62,4 @@ namespace OpenSim.Framework
62 { 62 {
63 IAssetServer GetAssetServer(); 63 IAssetServer GetAssetServer();
64 } 64 }
65} 65} \ No newline at end of file
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 985e085..20d4e62 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -74,14 +74,19 @@ namespace OpenSim.Framework
74 /// </summary> 74 /// </summary>
75 public class ChatFromViewerArgs : EventArgs, IEventArgs 75 public class ChatFromViewerArgs : EventArgs, IEventArgs
76 { 76 {
77 protected string m_message;
78 protected ChatTypeEnum m_type;
79 protected int m_channel; 77 protected int m_channel;
80 protected LLVector3 m_position;
81 protected string m_from; 78 protected string m_from;
79 protected string m_message;
80 protected LLVector3 m_position;
82 81
83 protected IClientAPI m_sender;
84 protected IScene m_scene; 82 protected IScene m_scene;
83 protected IClientAPI m_sender;
84 protected ChatTypeEnum m_type;
85
86 public ChatFromViewerArgs()
87 {
88 m_position = new LLVector3();
89 }
85 90
86 /// <summary> 91 /// <summary>
87 /// The message sent by the user 92 /// The message sent by the user
@@ -128,6 +133,8 @@ namespace OpenSim.Framework
128 set { m_from = value; } 133 set { m_from = value; }
129 } 134 }
130 135
136 #region IEventArgs Members
137
131 /// <summary> 138 /// <summary>
132 /// The client responsible for sending the message, or null. 139 /// The client responsible for sending the message, or null.
133 /// </summary> 140 /// </summary>
@@ -146,18 +153,15 @@ namespace OpenSim.Framework
146 set { m_scene = value; } 153 set { m_scene = value; }
147 } 154 }
148 155
149 public ChatFromViewerArgs() 156 #endregion
150 {
151 m_position = new LLVector3();
152 }
153 } 157 }
154 158
155 public class TextureRequestArgs : EventArgs 159 public class TextureRequestArgs : EventArgs
156 { 160 {
157 protected LLUUID m_requestedAssetID;
158 private sbyte m_discardLevel; 161 private sbyte m_discardLevel;
159 private uint m_packetNumber; 162 private uint m_packetNumber;
160 private float m_priority; 163 private float m_priority;
164 protected LLUUID m_requestedAssetID;
161 165
162 public float Priority 166 public float Priority
163 { 167 {
@@ -206,6 +210,8 @@ namespace OpenSim.Framework
206 set { m_nowWearing = value; } 210 set { m_nowWearing = value; }
207 } 211 }
208 212
213 #region Nested type: Wearable
214
209 public class Wearable 215 public class Wearable
210 { 216 {
211 public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000"); 217 public LLUUID ItemID = new LLUUID("00000000-0000-0000-0000-000000000000");
@@ -217,6 +223,8 @@ namespace OpenSim.Framework
217 Type = type; 223 Type = type;
218 } 224 }
219 } 225 }
226
227 #endregion
220 } 228 }
221 229
222 public delegate void TextureRequest(Object sender, TextureRequestArgs e); 230 public delegate void TextureRequest(Object sender, TextureRequestArgs e);
@@ -224,18 +232,18 @@ namespace OpenSim.Framework
224 public delegate void AvatarNowWearing(Object sender, AvatarWearingArgs e); 232 public delegate void AvatarNowWearing(Object sender, AvatarWearingArgs e);
225 233
226 public delegate void ImprovedInstantMessage(IClientAPI remoteclient, 234 public delegate void ImprovedInstantMessage(IClientAPI remoteclient,
227 LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp, 235 LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp,
228 string fromAgentName, string message, byte dialog, bool fromGroup, byte offline, uint ParentEstateID, 236 string fromAgentName, string message, byte dialog, bool fromGroup, byte offline, uint ParentEstateID,
229 LLVector3 Position, LLUUID RegionID, byte[] binaryBucket); // This shouldn't be cut down... 237 LLVector3 Position, LLUUID RegionID, byte[] binaryBucket); // This shouldn't be cut down...
230 // especially if we're ever going to implement groups, presence, estate message dialogs... 238 // especially if we're ever going to implement groups, presence, estate message dialogs...
231 239
232 public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, LLVector3 RayStart, 240 public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 RayEnd, LLVector3 RayStart,
233 LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 241 LLUUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
234 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags, 242 uint EveryoneMask, uint GroupMask, uint NextOwnerMask, uint ItemFlags,
235 bool RezSelected, bool RemoveItem, LLUUID fromTaskID ); 243 bool RezSelected, bool RemoveItem, LLUUID fromTaskID);
236 244
237 public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt, 245 public delegate void RezSingleAttachmentFromInv(IClientAPI remoteClient, LLUUID itemID, uint AttachmentPt,
238 uint ItemFlags, uint NextOwnerMask); 246 uint ItemFlags, uint NextOwnerMask);
239 247
240 public delegate void ObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot); 248 public delegate void ObjectAttach(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, LLQuaternion rot);
241 249
@@ -305,12 +313,10 @@ namespace OpenSim.Framework
305 313
306 public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags, LLUUID AgentID, LLUUID GroupID); 314 public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags, LLUUID AgentID, LLUUID GroupID);
307 315
308 public delegate void ObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID, 316 public delegate void ObjectDuplicateOnRay(uint localID, uint dupeFlags, LLUUID AgentID, LLUUID GroupID,
309 LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart, 317 LLUUID RayTargetObj, LLVector3 RayEnd, LLVector3 RayStart,
310 bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates); 318 bool BypassRaycast, bool RayEndIsIntersection, bool CopyCenters, bool CopyRotates);
311 319
312
313
314 320
315 public delegate void StatusChange(bool status); 321 public delegate void StatusChange(bool status);
316 322
@@ -355,7 +361,9 @@ namespace OpenSim.Framework
355 361
356 public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); 362 public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);
357 363
358 public delegate void AddNewPrim(LLUUID ownerID, LLVector3 RayEnd, LLQuaternion rot, PrimitiveBaseShape shape, byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID, byte RayEndIsIntersection); 364 public delegate void AddNewPrim(
365 LLUUID ownerID, LLVector3 RayEnd, LLQuaternion rot, PrimitiveBaseShape shape, byte bypassRaycast, LLVector3 RayStart, LLUUID RayTargetID,
366 byte RayEndIsIntersection);
359 367
360 public delegate void RequestGodlikePowers(LLUUID AgentID, LLUUID SessionID, LLUUID token, bool GodLike, IClientAPI remote_client); 368 public delegate void RequestGodlikePowers(LLUUID AgentID, LLUUID SessionID, LLUUID token, bool GodLike, IClientAPI remote_client);
361 369
@@ -409,7 +417,7 @@ namespace OpenSim.Framework
409 public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID); 417 public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID);
410 418
411 public delegate void MoveTaskInventory(IClientAPI remoteClient, LLUUID folderID, uint localID, LLUUID itemID); 419 public delegate void MoveTaskInventory(IClientAPI remoteClient, LLUUID folderID, uint localID, LLUUID itemID);
412 420
413 public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID); 421 public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID);
414 422
415 public delegate void UDPAssetUploadRequest( 423 public delegate void UDPAssetUploadRequest(
@@ -422,17 +430,17 @@ namespace OpenSim.Framework
422 430
423 public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID); 431 public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID);
424 432
425 public delegate void FriendActionDelegate(IClientAPI remoteClient,LLUUID agentID,LLUUID transactionID,List<LLUUID> callingCardFolders); 433 public delegate void FriendActionDelegate(IClientAPI remoteClient, LLUUID agentID, LLUUID transactionID, List<LLUUID> callingCardFolders);
426 434
427 public delegate void FriendshipTermination(IClientAPI remoteClient,LLUUID agentID, LLUUID ExID); 435 public delegate void FriendshipTermination(IClientAPI remoteClient, LLUUID agentID, LLUUID ExID);
428 436
429 public delegate void PacketStats(int inPackets, int outPackets, int unAckedBytes); 437 public delegate void PacketStats(int inPackets, int outPackets, int unAckedBytes);
430 438
431 public delegate void MoneyTransferRequest(LLUUID sourceID, LLUUID destID, int amount, int transactionType, string description); 439 public delegate void MoneyTransferRequest(LLUUID sourceID, LLUUID destID, int amount, int transactionType, string description);
432 440
433 public delegate void ParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned, 441 public delegate void ParcelBuy(LLUUID agentId, LLUUID groupId, bool final, bool groupOwned,
434 bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated); 442 bool removeContribution, int parcelLocalID, int parcelArea, int parcelPrice, bool authenticated);
435 443
436 // We keep all this information for fraud purposes in the future. 444 // We keep all this information for fraud purposes in the future.
437 public delegate void MoneyBalanceRequest(IClientAPI remoteClient, LLUUID agentID, LLUUID sessionID, LLUUID TransactionID); 445 public delegate void MoneyBalanceRequest(IClientAPI remoteClient, LLUUID agentID, LLUUID sessionID, LLUUID TransactionID);
438 446
@@ -443,10 +451,33 @@ namespace OpenSim.Framework
443 public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID); 451 public delegate void ObjectIncludeInSearch(IClientAPI remoteClient, bool IncludeInSearch, uint localID);
444 452
445 public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer); 453 public delegate void ScriptAnswer(IClientAPI remoteClient, LLUUID objectID, LLUUID itemID, int answer);
454
446 public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID); 455 public delegate void RequestPayPrice(IClientAPI remoteClient, LLUUID objectID);
447 456
448 public interface IClientAPI 457 public interface IClientAPI
449 { 458 {
459 LLVector3 StartPos { get; set; }
460
461 LLUUID AgentId { get; }
462
463 LLUUID SessionId { get; }
464
465 LLUUID SecureSessionId { get; }
466
467 string FirstName { get; }
468
469 string LastName { get; }
470
471 int NextAnimationSequenceNumber { get; }
472
473 /// <summary>
474 /// Returns the full name of the agent/avatar represented by this client
475 /// </summary>
476 /// <param name="newPack"></param>
477 /// <param name="packType"></param>
478 string Name { get; }
479
480 uint CircuitCode { get; }
450 event ImprovedInstantMessage OnInstantMessage; 481 event ImprovedInstantMessage OnInstantMessage;
451 event ChatFromViewer OnChatFromViewer; 482 event ChatFromViewer OnChatFromViewer;
452 event TextureRequest OnRequestTexture; 483 event TextureRequest OnRequestTexture;
@@ -563,38 +594,15 @@ namespace OpenSim.Framework
563 event MoneyBalanceRequest OnMoneyBalanceRequest; 594 event MoneyBalanceRequest OnMoneyBalanceRequest;
564 event UpdateAvatarProperties OnUpdateAvatarProperties; 595 event UpdateAvatarProperties OnUpdateAvatarProperties;
565 event ParcelBuy OnParcelBuy; 596 event ParcelBuy OnParcelBuy;
566 event RequestPayPrice OnRequestPayPrice ; 597 event RequestPayPrice OnRequestPayPrice;
567 598
568 event ObjectIncludeInSearch OnObjectIncludeInSearch; 599 event ObjectIncludeInSearch OnObjectIncludeInSearch;
569 600
570 event UUIDNameRequest OnTeleportHomeRequest; 601 event UUIDNameRequest OnTeleportHomeRequest;
571 602
572 event ScriptAnswer OnScriptAnswer; 603 event ScriptAnswer OnScriptAnswer;
573 604
574 event AgentSit OnUndo; 605 event AgentSit OnUndo;
575
576 LLVector3 StartPos { get; set; }
577
578 LLUUID AgentId { get; }
579
580 LLUUID SessionId { get; }
581
582 LLUUID SecureSessionId { get; }
583
584 string FirstName { get; }
585
586 string LastName { get; }
587
588 int NextAnimationSequenceNumber { get; }
589
590 /// <summary>
591 /// Returns the full name of the agent/avatar represented by this client
592 /// </summary>
593 /// <param name="newPack"></param>
594 /// <param name="packType"></param>
595 string Name { get; }
596
597 uint CircuitCode { get; }
598 606
599 void OutPacket(Packet newPack, ThrottleOutPacketType packType); 607 void OutPacket(Packet newPack, ThrottleOutPacketType packType);
600 void SendWearables(AvatarWearable[] wearables, int serial); 608 void SendWearables(AvatarWearable[] wearables, int serial);
@@ -608,9 +616,10 @@ namespace OpenSim.Framework
608 616
609 void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, 617 void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent,
610 LLUUID imSessionID, string fromName, byte dialog, uint timeStamp); 618 LLUUID imSessionID, string fromName, byte dialog, uint timeStamp);
619
611 void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, 620 void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent,
612 LLUUID imSessionID, string fromName, byte dialog, uint timeStamp, 621 LLUUID imSessionID, string fromName, byte dialog, uint timeStamp,
613 byte[] binaryBucket); 622 byte[] binaryBucket);
614 623
615 void SendLayerData(float[] map); 624 void SendLayerData(float[] map);
616 void SendLayerData(int px, int py, float[] map); 625 void SendLayerData(int px, int py, float[] map);
@@ -645,9 +654,9 @@ namespace OpenSim.Framework
645 654
646 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, 655 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
647 LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, 656 LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color,
648 uint parentID, byte[] particleSystem, LLQuaternion rotation, byte clickAction, byte[] textureanimation, 657 uint parentID, byte[] particleSystem, LLQuaternion rotation, byte clickAction, byte[] textureanimation,
649 bool attachment, uint AttachmentPoint, LLUUID AssetId); 658 bool attachment, uint AttachmentPoint, LLUUID AssetId);
650 659
651 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, 660 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
652 LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color, 661 LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, byte[] color,
653 uint parentID, byte[] particleSystem, LLQuaternion rotation, byte clickAction); 662 uint parentID, byte[] particleSystem, LLQuaternion rotation, byte clickAction);
@@ -657,7 +666,7 @@ namespace OpenSim.Framework
657 666
658 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, 667 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position,
659 LLQuaternion rotation, LLVector3 velocity, LLVector3 rotationalvelocity); 668 LLQuaternion rotation, LLVector3 velocity, LLVector3 rotationalvelocity);
660 669
661 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items, 670 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items,
662 List<InventoryFolderBase> folders, bool fetchFolders, 671 List<InventoryFolderBase> folders, bool fetchFolders,
663 bool fetchItems); 672 bool fetchItems);
@@ -672,20 +681,20 @@ namespace OpenSim.Framework
672 681
673 void SendRemoveInventoryItem(LLUUID itemID); 682 void SendRemoveInventoryItem(LLUUID itemID);
674 void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName); 683 void SendTaskInventory(LLUUID taskID, short serial, byte[] fileName);
675 684
676 /// <summary> 685 /// <summary>
677 /// Used by the server to inform the client of a new inventory item. Used when transferring items 686 /// Used by the server to inform the client of a new inventory item. Used when transferring items
678 /// between avatars, possibly among other things. 687 /// between avatars, possibly among other things.
679 /// </summary> 688 /// </summary>
680 /// <param name="item"></param> 689 /// <param name="item"></param>
681 void SendBulkUpdateInventory(InventoryItemBase item); 690 void SendBulkUpdateInventory(InventoryItemBase item);
682 691
683 void SendXferPacket(ulong xferID, uint packet, byte[] data); 692 void SendXferPacket(ulong xferID, uint packet, byte[] data);
684 693
685 void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit, 694 void SendEconomyData(float EnergyEfficiency, int ObjectCapacity, int ObjectCount, int PriceEnergyUnit,
686 int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor, 695 int PriceGroupCreate, int PriceObjectClaim, float PriceObjectRent, float PriceObjectScaleFactor,
687 int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay, 696 int PriceParcelClaim, float PriceParcelClaimFactor, int PriceParcelRent, int PricePublicObjectDecay,
688 int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent); 697 int PricePublicObjectDelete, int PriceRentLight, int PriceUpload, int TeleportMinPrice, float TeleportPriceExponent);
689 698
690 void SendAvatarPickerReply(AvatarPickerReplyPacket Pack); 699 void SendAvatarPickerReply(AvatarPickerReplyPacket Pack);
691 700
@@ -709,10 +718,11 @@ namespace OpenSim.Framework
709 718
710 void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, 719 void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout,
711 uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID); 720 uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID);
721
712 void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question); 722 void SendScriptQuestion(LLUUID taskID, string taskName, string ownerName, LLUUID itemID, int question);
713 723
714 byte[] GetThrottlesPacked(float multiplier); 724 byte[] GetThrottlesPacked(float multiplier);
715 725
716 726
717 void SetDebug(int newDebug); 727 void SetDebug(int newDebug);
718 void InPacket(Packet NewPack); 728 void InPacket(Packet NewPack);
@@ -734,16 +744,16 @@ namespace OpenSim.Framework
734 [Serializable] 744 [Serializable]
735 public class ClientInfo 745 public class ClientInfo
736 { 746 {
737 public byte[] usecircuit;
738 public EndPoint userEP;
739 public EndPoint proxyEP;
740 public sAgentCircuitData agentcircuit; 747 public sAgentCircuitData agentcircuit;
741 748
742 public Dictionary<uint, uint> pendingAcks;
743 public Dictionary<uint, byte[]> needAck; 749 public Dictionary<uint, byte[]> needAck;
744 750
745 public List<byte[]> out_packets; 751 public List<byte[]> out_packets;
752 public Dictionary<uint, uint> pendingAcks;
753 public EndPoint proxyEP;
746 754
747 public uint sequence; 755 public uint sequence;
756 public byte[] usecircuit;
757 public EndPoint userEP;
748 } 758 }
749} 759} \ No newline at end of file
diff --git a/OpenSim/Framework/IGenericConfig.cs b/OpenSim/Framework/IGenericConfig.cs
index 767a920..9c1d522 100644
--- a/OpenSim/Framework/IGenericConfig.cs
+++ b/OpenSim/Framework/IGenericConfig.cs
@@ -37,4 +37,4 @@ namespace OpenSim.Framework
37 void Commit(); 37 void Commit();
38 void Close(); 38 void Close();
39 } 39 }
40} 40} \ No newline at end of file
diff --git a/OpenSim/Framework/IInventoryData.cs b/OpenSim/Framework/IInventoryData.cs
index 508099e..f283085 100644
--- a/OpenSim/Framework/IInventoryData.cs
+++ b/OpenSim/Framework/IInventoryData.cs
@@ -56,14 +56,14 @@ namespace OpenSim.Framework
56 /// </summary> 56 /// </summary>
57 /// <returns>A string containing the plugin version</returns> 57 /// <returns>A string containing the plugin version</returns>
58 string getVersion(); 58 string getVersion();
59 59
60 /// <summary> 60 /// <summary>
61 /// Returns all child folders in the hierarchy from the parent folder and down. 61 /// Returns all child folders in the hierarchy from the parent folder and down.
62 /// Does not return the parent folder itself. 62 /// Does not return the parent folder itself.
63 /// </summary> 63 /// </summary>
64 /// <param name="parentID">The folder to get subfolders for</param> 64 /// <param name="parentID">The folder to get subfolders for</param>
65 /// <returns>A list of inventory folders</returns> 65 /// <returns>A list of inventory folders</returns>
66 List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID); 66 List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID);
67 67
68 /// <summary> 68 /// <summary>
69 /// Returns a list of inventory items contained within the specified folder 69 /// Returns a list of inventory items contained within the specified folder
@@ -149,4 +149,4 @@ namespace OpenSim.Framework
149 /// <param name="folder">The id of the folder</param> 149 /// <param name="folder">The id of the folder</param>
150 void deleteInventoryFolder(LLUUID folder); 150 void deleteInventoryFolder(LLUUID folder);
151 } 151 }
152} 152} \ No newline at end of file
diff --git a/OpenSim/Framework/IPlugin.cs b/OpenSim/Framework/IPlugin.cs
index 96f8257..8a0b2b1 100644
--- a/OpenSim/Framework/IPlugin.cs
+++ b/OpenSim/Framework/IPlugin.cs
@@ -49,4 +49,4 @@ namespace OpenSim.Framework
49 /// </summary> 49 /// </summary>
50 void Initialise(); 50 void Initialise();
51 } 51 }
52} 52} \ No newline at end of file
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
index 7726634..1476855 100644
--- a/OpenSim/Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/IRegionCommsListener.cs
@@ -64,4 +64,4 @@ namespace OpenSim.Framework
64 event RegionUp OnRegionUp; 64 event RegionUp OnRegionUp;
65 event ChildAgentUpdate OnChildAgentUpdate; 65 event ChildAgentUpdate OnChildAgentUpdate;
66 } 66 }
67} 67} \ No newline at end of file
diff --git a/OpenSim/Framework/IRegionLoader.cs b/OpenSim/Framework/IRegionLoader.cs
index d383825..87638a9 100644
--- a/OpenSim/Framework/IRegionLoader.cs
+++ b/OpenSim/Framework/IRegionLoader.cs
@@ -34,4 +34,4 @@ namespace OpenSim.Framework
34 void SetIniConfigSource(IniConfigSource configSource); 34 void SetIniConfigSource(IniConfigSource configSource);
35 RegionInfo[] LoadRegions(); 35 RegionInfo[] LoadRegions();
36 } 36 }
37} 37} \ No newline at end of file
diff --git a/OpenSim/Framework/IScene.cs b/OpenSim/Framework/IScene.cs
index cdf6257..018b51f 100644
--- a/OpenSim/Framework/IScene.cs
+++ b/OpenSim/Framework/IScene.cs
@@ -39,11 +39,16 @@ namespace OpenSim.Framework
39 Up = 1, 39 Up = 1,
40 Crashed = 2, 40 Crashed = 2,
41 Starting = 3, 41 Starting = 3,
42 SlaveScene = 4 42 SlaveScene = 4
43 }; 43 } ;
44 44
45 public interface IScene 45 public interface IScene
46 { 46 {
47 RegionInfo RegionInfo { get; }
48 uint NextLocalId { get; }
49 RegionStatus Region_Status { get; set; }
50
51 ClientManager ClientManager { get; }
47 event restart OnRestart; 52 event restart OnRestart;
48 53
49 void AddNewClient(IClientAPI client, bool child); 54 void AddNewClient(IClientAPI client, bool child);
@@ -55,15 +60,8 @@ namespace OpenSim.Framework
55 60
56 string GetSimulatorVersion(); 61 string GetSimulatorVersion();
57 62
58 RegionInfo RegionInfo { get; }
59 uint NextLocalId { get; }
60
61 bool PresenceChildStatus(LLUUID avatarID); 63 bool PresenceChildStatus(LLUUID avatarID);
62 64
63 RegionStatus Region_Status { get; set; } 65 string GetCapsPath(LLUUID agentId);
64
65 ClientManager ClientManager { get; }
66
67 string GetCapsPath(LLUUID agentId);
68 } 66 }
69} 67} \ No newline at end of file
diff --git a/OpenSim/Framework/IUserData.cs b/OpenSim/Framework/IUserData.cs
index 9749135..a926883 100644
--- a/OpenSim/Framework/IUserData.cs
+++ b/OpenSim/Framework/IUserData.cs
@@ -139,6 +139,7 @@ namespace OpenSim.Framework
139 /// </summary> 139 /// </summary>
140 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 140 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
141 List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); 141 List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
142
142 /// <summary> 143 /// <summary>
143 /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES) 144 /// Attempts to move currency units between accounts (NOT RELIABLE / TRUSTWORTHY. DONT TRY RUN YOUR OWN CURRENCY EXCHANGE WITH REAL VALUES)
144 /// </summary> 145 /// </summary>
@@ -174,4 +175,4 @@ namespace OpenSim.Framework
174 /// </summary> 175 /// </summary>
175 void Initialise(); 176 void Initialise();
176 } 177 }
177} 178} \ No newline at end of file
diff --git a/OpenSim/Framework/IUserService.cs b/OpenSim/Framework/IUserService.cs
index 88e992e..2b6e0d5 100644
--- a/OpenSim/Framework/IUserService.cs
+++ b/OpenSim/Framework/IUserService.cs
@@ -39,16 +39,16 @@ namespace OpenSim.Framework
39 /// <param name="lname">Last name</param> 39 /// <param name="lname">Last name</param>
40 /// <returns>A user profile. Returns null if no profile is found</returns> 40 /// <returns>A user profile. Returns null if no profile is found</returns>
41 UserProfileData GetUserProfile(string firstName, string lastName); 41 UserProfileData GetUserProfile(string firstName, string lastName);
42 42
43 //UserProfileData GetUserProfile(string name); 43 //UserProfileData GetUserProfile(string name);
44 44
45 /// <summary> 45 /// <summary>
46 /// Loads a user profile from a database by UUID 46 /// Loads a user profile from a database by UUID
47 /// </summary> 47 /// </summary>
48 /// <param name="uuid">The target UUID</param> 48 /// <param name="uuid">The target UUID</param>
49 /// <returns>A user profile. Returns null if no user profile is found.</returns> 49 /// <returns>A user profile. Returns null if no user profile is found.</returns>
50 UserProfileData GetUserProfile(LLUUID userId); 50 UserProfileData GetUserProfile(LLUUID userId);
51 51
52 void clearUserAgent(LLUUID avatarID); 52 void clearUserAgent(LLUUID avatarID);
53 List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID QueryID, string Query); 53 List<AvatarPickerAvatar> GenerateAgentPickerRequestResponse(LLUUID QueryID, string Query);
54 54
@@ -109,4 +109,4 @@ namespace OpenSim.Framework
109 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param> 109 /// <param name="friendlistowner">The agent that we're retreiving the friends Data.</param>
110 List<FriendListItem> GetUserFriendList(LLUUID friendlistowner); 110 List<FriendListItem> GetUserFriendList(LLUUID friendlistowner);
111 } 111 }
112} 112} \ No newline at end of file
diff --git a/OpenSim/Framework/InventoryCollection.cs b/OpenSim/Framework/InventoryCollection.cs
index e5e8f62..df18efb 100644
--- a/OpenSim/Framework/InventoryCollection.cs
+++ b/OpenSim/Framework/InventoryCollection.cs
@@ -39,4 +39,4 @@ namespace OpenSim.Framework
39 public List<InventoryItemBase> Items; 39 public List<InventoryItemBase> Items;
40 public LLUUID UserID; 40 public LLUUID UserID;
41 } 41 }
42} 42} \ No newline at end of file
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index 1e22fe8..67abbaf 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -34,18 +34,16 @@ namespace OpenSim.Framework
34 /// </summary> 34 /// </summary>
35 public class InventoryConfig 35 public class InventoryConfig
36 { 36 {
37 public string DefaultStartupMsg = String.Empty;
38 public string UserServerURL = String.Empty;
39 public string UserSendKey = String.Empty;
40 public string UserRecvKey = String.Empty;
41
42 public string DatabaseProvider = String.Empty;
43 public string DatabaseConnect = String.Empty;
44 public static uint DefaultHttpPort = 8004; 37 public static uint DefaultHttpPort = 8004;
45 38
46 public uint HttpPort = DefaultHttpPort;
47
48 private ConfigurationMember configMember; 39 private ConfigurationMember configMember;
40 public string DatabaseConnect = String.Empty;
41 public string DatabaseProvider = String.Empty;
42 public string DefaultStartupMsg = String.Empty;
43 public uint HttpPort = DefaultHttpPort;
44 public string UserRecvKey = String.Empty;
45 public string UserSendKey = String.Empty;
46 public string UserServerURL = String.Empty;
49 47
50 public InventoryConfig(string description, string filename) 48 public InventoryConfig(string description, string filename)
51 { 49 {
@@ -79,30 +77,30 @@ namespace OpenSim.Framework
79 { 77 {
80 switch (configuration_key) 78 switch (configuration_key)
81 { 79 {
82 case "default_startup_message": 80 case "default_startup_message":
83 DefaultStartupMsg = (string) configuration_result; 81 DefaultStartupMsg = (string) configuration_result;
84 break; 82 break;
85 case "default_user_server": 83 case "default_user_server":
86 UserServerURL = (string) configuration_result; 84 UserServerURL = (string) configuration_result;
87 break; 85 break;
88 case "user_send_key": 86 case "user_send_key":
89 UserSendKey = (string) configuration_result; 87 UserSendKey = (string) configuration_result;
90 break; 88 break;
91 case "user_recv_key": 89 case "user_recv_key":
92 UserRecvKey = (string) configuration_result; 90 UserRecvKey = (string) configuration_result;
93 break; 91 break;
94 case "database_provider": 92 case "database_provider":
95 DatabaseProvider = (string) configuration_result; 93 DatabaseProvider = (string) configuration_result;
96 break; 94 break;
97 case "database_connect": 95 case "database_connect":
98 DatabaseConnect = (string) configuration_result; 96 DatabaseConnect = (string) configuration_result;
99 break; 97 break;
100 case "http_port": 98 case "http_port":
101 HttpPort = (uint) configuration_result; 99 HttpPort = (uint) configuration_result;
102 break; 100 break;
103 } 101 }
104 102
105 return true; 103 return true;
106 } 104 }
107 } 105 }
108} 106} \ No newline at end of file
diff --git a/OpenSim/Framework/InventoryFolderBase.cs b/OpenSim/Framework/InventoryFolderBase.cs
index d3af3c7..910f7da 100644
--- a/OpenSim/Framework/InventoryFolderBase.cs
+++ b/OpenSim/Framework/InventoryFolderBase.cs
@@ -35,6 +35,11 @@ namespace OpenSim.Framework
35 public class InventoryFolderBase 35 public class InventoryFolderBase
36 { 36 {
37 /// <summary> 37 /// <summary>
38 /// The UUID for this folder
39 /// </summary>
40 private LLUUID _id;
41
42 /// <summary>
38 /// The name of the folder (64 characters or less) 43 /// The name of the folder (64 characters or less)
39 /// </summary> 44 /// </summary>
40 private string _name; 45 private string _name;
@@ -50,11 +55,6 @@ namespace OpenSim.Framework
50 private LLUUID _parentID; 55 private LLUUID _parentID;
51 56
52 /// <summary> 57 /// <summary>
53 /// The UUID for this folder
54 /// </summary>
55 private LLUUID _id;
56
57 /// <summary>
58 /// Type of items normally stored in this folder 58 /// Type of items normally stored in this folder
59 /// </summary> 59 /// </summary>
60 private short _type; 60 private short _type;
@@ -65,59 +65,41 @@ namespace OpenSim.Framework
65 /// time to time (1.19.1 caused us some fits there). 65 /// time to time (1.19.1 caused us some fits there).
66 /// </summary> 66 /// </summary>
67 private ushort _version; 67 private ushort _version;
68 68
69 public string Name { 69 public string Name
70 get { 70 {
71 return _name; 71 get { return _name; }
72 } 72 set { _name = value; }
73 set {
74 _name = value;
75 }
76 } 73 }
77 74
78 public LLUUID Owner { 75 public LLUUID Owner
79 get { 76 {
80 return _owner; 77 get { return _owner; }
81 } 78 set { _owner = value; }
82 set {
83 _owner = value;
84 }
85 } 79 }
86 80
87 public LLUUID ParentID { 81 public LLUUID ParentID
88 get { 82 {
89 return _parentID; 83 get { return _parentID; }
90 } 84 set { _parentID = value; }
91 set {
92 _parentID = value;
93 }
94 } 85 }
95 86
96 public LLUUID ID { 87 public LLUUID ID
97 get { 88 {
98 return _id; 89 get { return _id; }
99 } 90 set { _id = value; }
100 set {
101 _id = value;
102 }
103 } 91 }
104 92
105 public short Type { 93 public short Type
106 get { 94 {
107 return _type; 95 get { return _type; }
108 } 96 set { _type = value; }
109 set {
110 _type = value;
111 }
112 } 97 }
113 98
114 public ushort Version { 99 public ushort Version
115 get { 100 {
116 return _version; 101 get { return _version; }
117 } 102 set { _version = value; }
118 set {
119 _version = value;
120 }
121 } 103 }
122 } 104 }
123} 105} \ No newline at end of file
diff --git a/OpenSim/Framework/InventoryItemBase.cs b/OpenSim/Framework/InventoryItemBase.cs
index ccb8163..3d75a8a 100644
--- a/OpenSim/Framework/InventoryItemBase.cs
+++ b/OpenSim/Framework/InventoryItemBase.cs
@@ -35,11 +35,6 @@ namespace OpenSim.Framework
35 public class InventoryItemBase 35 public class InventoryItemBase
36 { 36 {
37 /// <summary> 37 /// <summary>
38 /// A UUID containing the ID for the inventory item itself
39 /// </summary>
40 private LLUUID _id;
41
42 /// <summary>
43 /// The UUID of the associated asset on the asset server 38 /// The UUID of the associated asset on the asset server
44 /// </summary> 39 /// </summary>
45 private LLUUID _assetID; 40 private LLUUID _assetID;
@@ -50,170 +45,136 @@ namespace OpenSim.Framework
50 private int _assetType; 45 private int _assetType;
51 46
52 /// <summary> 47 /// <summary>
53 /// The type of inventory item. (Can be slightly different to the asset type 48 ///
54 /// </summary> 49 /// </summary>
55 private int _invType; 50 private uint _basePermissions;
56 51
57 /// <summary> 52 /// <summary>
58 /// The folder this item is contained in 53 /// The creator of this item
59 /// </summary> 54 /// </summary>
60 private LLUUID _folder; 55 private LLUUID _creator;
61 56
62 /// <summary> 57 /// <summary>
63 /// The owner of this inventory item 58 /// A mask containing permissions for the current owner (cannot be enforced)
64 /// </summary> 59 /// </summary>
65 private LLUUID _owner; 60 private uint _currentPermissions;
66 61
67 /// <summary> 62 /// <summary>
68 /// The creator of this item 63 /// The description of the inventory item (must be less than 64 characters)
69 /// </summary> 64 /// </summary>
70 private LLUUID _creator; 65 private string _description;
71 66
72 /// <summary> 67 /// <summary>
73 /// The name of the inventory item (must be less than 64 characters) 68 ///
74 /// </summary> 69 /// </summary>
75 private string _name; 70 private uint _everyOnePermissions;
76 71
77 /// <summary> 72 /// <summary>
78 /// The description of the inventory item (must be less than 64 characters) 73 /// The folder this item is contained in
79 /// </summary> 74 /// </summary>
80 private string _description; 75 private LLUUID _folder;
81 76
82 /// <summary> 77 /// <summary>
83 /// A mask containing the permissions for the next owner (cannot be enforced) 78 /// A UUID containing the ID for the inventory item itself
84 /// </summary> 79 /// </summary>
85 private uint _nextPermissions; 80 private LLUUID _id;
86 81
87 /// <summary> 82 /// <summary>
88 /// A mask containing permissions for the current owner (cannot be enforced) 83 /// The type of inventory item. (Can be slightly different to the asset type
89 /// </summary> 84 /// </summary>
90 private uint _currentPermissions; 85 private int _invType;
91 86
92 /// <summary> 87 /// <summary>
93 /// 88 /// The name of the inventory item (must be less than 64 characters)
94 /// </summary> 89 /// </summary>
95 private uint _basePermissions; 90 private string _name;
96 91
97 /// <summary> 92 /// <summary>
98 /// 93 /// A mask containing the permissions for the next owner (cannot be enforced)
99 /// </summary> 94 /// </summary>
100 private uint _everyOnePermissions; 95 private uint _nextPermissions;
101 96
102 public LLUUID ID { 97 /// <summary>
103 get { 98 /// The owner of this inventory item
104 return _id; 99 /// </summary>
105 } 100 private LLUUID _owner;
106 set { 101
107 _id = value; 102 public LLUUID ID
108 } 103 {
104 get { return _id; }
105 set { _id = value; }
109 } 106 }
110 107
111 public int InvType { 108 public int InvType
112 get { 109 {
113 return _invType; 110 get { return _invType; }
114 } 111 set { _invType = value; }
115 set {
116 _invType = value;
117 }
118 } 112 }
119 113
120 public LLUUID Folder { 114 public LLUUID Folder
121 get { 115 {
122 return _folder; 116 get { return _folder; }
123 } 117 set { _folder = value; }
124 set {
125 _folder = value;
126 }
127 } 118 }
128 119
129 public LLUUID Owner { 120 public LLUUID Owner
130 get { 121 {
131 return _owner; 122 get { return _owner; }
132 } 123 set { _owner = value; }
133 set {
134 _owner = value;
135 }
136 } 124 }
137 125
138 public LLUUID Creator { 126 public LLUUID Creator
139 get { 127 {
140 return _creator; 128 get { return _creator; }
141 } 129 set { _creator = value; }
142 set {
143 _creator = value;
144 }
145 } 130 }
146 131
147 public string Name { 132 public string Name
148 get { 133 {
149 return _name; 134 get { return _name; }
150 } 135 set { _name = value; }
151 set {
152 _name = value;
153 }
154 } 136 }
155 137
156 public string Description { 138 public string Description
157 get { 139 {
158 return _description; 140 get { return _description; }
159 } 141 set { _description = value; }
160 set {
161 _description = value;
162 }
163 } 142 }
164 143
165 public uint NextPermissions { 144 public uint NextPermissions
166 get { 145 {
167 return _nextPermissions; 146 get { return _nextPermissions; }
168 } 147 set { _nextPermissions = value; }
169 set {
170 _nextPermissions = value;
171 }
172 } 148 }
173 149
174 public uint CurrentPermissions { 150 public uint CurrentPermissions
175 get { 151 {
176 return _currentPermissions; 152 get { return _currentPermissions; }
177 } 153 set { _currentPermissions = value; }
178 set {
179 _currentPermissions = value;
180 }
181 } 154 }
182 155
183 public uint BasePermissions { 156 public uint BasePermissions
184 get { 157 {
185 return _basePermissions; 158 get { return _basePermissions; }
186 } 159 set { _basePermissions = value; }
187 set {
188 _basePermissions = value;
189 }
190 } 160 }
191 161
192 public uint EveryOnePermissions { 162 public uint EveryOnePermissions
193 get { 163 {
194 return _everyOnePermissions; 164 get { return _everyOnePermissions; }
195 } 165 set { _everyOnePermissions = value; }
196 set {
197 _everyOnePermissions = value;
198 }
199 } 166 }
200 167
201 public int AssetType { 168 public int AssetType
202 get { 169 {
203 return _assetType; 170 get { return _assetType; }
204 } 171 set { _assetType = value; }
205 set {
206 _assetType = value;
207 }
208 } 172 }
209 173
210 public LLUUID AssetID { 174 public LLUUID AssetID
211 get { 175 {
212 return _assetID; 176 get { return _assetID; }
213 } 177 set { _assetID = value; }
214 set {
215 _assetID = value;
216 }
217 } 178 }
218 } 179 }
219} 180} \ No newline at end of file
diff --git a/OpenSim/Framework/JId.cs b/OpenSim/Framework/JId.cs
index dac4838..00e8ef1 100644
--- a/OpenSim/Framework/JId.cs
+++ b/OpenSim/Framework/JId.cs
@@ -31,15 +31,15 @@ namespace OpenSim.Framework
31{ 31{
32 public class JId 32 public class JId
33 { 33 {
34 public string resource = String.Empty;
34 public string ServerIP = String.Empty; 35 public string ServerIP = String.Empty;
35 public int ServerPort = 0; 36 public int ServerPort = 0;
36 public string username = String.Empty; 37 public string username = String.Empty;
37 public string resource = String.Empty;
38 38
39 public JId() 39 public JId()
40 { 40 {
41
42 } 41 }
42
43 public JId(string sJId) 43 public JId(string sJId)
44 { 44 {
45 // user@address:port/resource 45 // user@address:port/resource
@@ -53,14 +53,13 @@ namespace OpenSim.Framework
53 string[] resourcesplit = serversplit[1].Split('/'); 53 string[] resourcesplit = serversplit[1].Split('/');
54 54
55 ServerPort = Convert.ToInt32(resourcesplit[0]); 55 ServerPort = Convert.ToInt32(resourcesplit[0]);
56 56
57 if (resourcesplit.GetUpperBound(0) == 2) 57 if (resourcesplit.GetUpperBound(0) == 2)
58 resource = resourcesplit[1]; 58 resource = resourcesplit[1];
59 59
60 username = jidsplit[0]; 60 username = jidsplit[0];
61
62 } 61 }
63 } 62 }
64 } 63 }
65 } 64 }
66} 65} \ No newline at end of file
diff --git a/OpenSim/Framework/LandData.cs b/OpenSim/Framework/LandData.cs
index 6d2c5d7..68c4c2e 100644
--- a/OpenSim/Framework/LandData.cs
+++ b/OpenSim/Framework/LandData.cs
@@ -33,28 +33,20 @@ namespace OpenSim.Framework
33{ 33{
34 public class LandData 34 public class LandData
35 { 35 {
36 public byte[] landBitmapByteArray = new byte[512];
37 public string landName = "Your Parcel";
38 public string landDesc = String.Empty;
39 public LLUUID ownerID = LLUUID.Zero;
40 public bool isGroupOwned = false;
41 public LLVector3 AABBMin = new LLVector3();
42 public LLVector3 AABBMax = new LLVector3(); 36 public LLVector3 AABBMax = new LLVector3();
37 public LLVector3 AABBMin = new LLVector3();
43 public int area = 0; 38 public int area = 0;
44 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned 39 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
45 public LLUUID authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID 40 public LLUUID authBuyerID = LLUUID.Zero; //Unemplemented. Authorized Buyer's UUID
46 public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category 41 public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
47 public int claimDate = 0; //Unemplemented 42 public int claimDate = 0; //Unemplemented
48 public int claimPrice = 0; //Unemplemented 43 public int claimPrice = 0; //Unemplemented
44 public LLUUID globalID = LLUUID.Zero;
49 public LLUUID groupID = LLUUID.Zero; //Unemplemented 45 public LLUUID groupID = LLUUID.Zero; //Unemplemented
50 public int groupPrims = 0; 46 public int groupPrims = 0;
51 public int otherPrims = 0; 47 public bool isGroupOwned = false;
52 public int ownerPrims = 0; 48 public byte[] landBitmapByteArray = new byte[512];
53 public int selectedPrims = 0; 49 public string landDesc = String.Empty;
54 public int simwidePrims = 0;
55 public int simwideArea = 0;
56 public int salePrice = 0; //Unemeplemented. Parcels price.
57 public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;
58 50
59 51
60 public uint landFlags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark | 52 public uint landFlags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark |
@@ -64,21 +56,28 @@ namespace OpenSim.Framework
64 (uint) Parcel.ParcelFlags.SoundLocal; 56 (uint) Parcel.ParcelFlags.SoundLocal;
65 57
66 public byte landingType = 0; 58 public byte landingType = 0;
59 public string landName = "Your Parcel";
60 public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;
61 public int localID = 0;
67 public byte mediaAutoScale = 0; 62 public byte mediaAutoScale = 0;
68 public LLUUID mediaID = LLUUID.Zero; 63 public LLUUID mediaID = LLUUID.Zero;
69 public int localID = 0;
70 public LLUUID globalID = LLUUID.Zero;
71 64
72 public string mediaURL = String.Empty; 65 public string mediaURL = String.Empty;
73 public string musicURL = String.Empty; 66 public string musicURL = String.Empty;
67 public int otherPrims = 0;
68 public LLUUID ownerID = LLUUID.Zero;
69 public int ownerPrims = 0;
70 public List<ParcelManager.ParcelAccessEntry> parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
74 public float passHours = 0; 71 public float passHours = 0;
75 public int passPrice = 0; 72 public int passPrice = 0;
73 public int salePrice = 0; //Unemeplemented. Parcels price.
74 public int selectedPrims = 0;
75 public int simwideArea = 0;
76 public int simwidePrims = 0;
76 public LLUUID snapshotID = LLUUID.Zero; 77 public LLUUID snapshotID = LLUUID.Zero;
77 public LLVector3 userLocation = new LLVector3(); 78 public LLVector3 userLocation = new LLVector3();
78 public LLVector3 userLookAt = new LLVector3(); 79 public LLVector3 userLookAt = new LLVector3();
79 80
80 public List<ParcelManager.ParcelAccessEntry> parcelAccessList = new List<ParcelManager.ParcelAccessEntry>();
81
82 public LandData() 81 public LandData()
83 { 82 {
84 globalID = LLUUID.Random(); 83 globalID = LLUUID.Random();
@@ -136,4 +135,4 @@ namespace OpenSim.Framework
136 return landData; 135 return landData;
137 } 136 }
138 } 137 }
139} 138} \ No newline at end of file
diff --git a/OpenSim/Framework/Login.cs b/OpenSim/Framework/Login.cs
index bc3375d..e754e9f 100644
--- a/OpenSim/Framework/Login.cs
+++ b/OpenSim/Framework/Login.cs
@@ -32,15 +32,15 @@ namespace OpenSim.Framework
32{ 32{
33 public class Login 33 public class Login
34 { 34 {
35 public string First = "Test";
36 public string Last = "User";
37 public LLUUID Agent; 35 public LLUUID Agent;
38 public LLUUID Session;
39 public LLUUID SecureSession = LLUUID.Zero;
40 public LLUUID InventoryFolder;
41 public LLUUID BaseFolder; 36 public LLUUID BaseFolder;
42 public uint CircuitCode;
43 public string CapsPath = String.Empty; 37 public string CapsPath = String.Empty;
38 public uint CircuitCode;
39 public string First = "Test";
40 public LLUUID InventoryFolder;
41 public string Last = "User";
42 public LLUUID SecureSession = LLUUID.Zero;
43 public LLUUID Session;
44 public LLVector3 StartPos; 44 public LLVector3 StartPos;
45 45
46 public Login() 46 public Login()
@@ -48,4 +48,4 @@ namespace OpenSim.Framework
48 StartPos = new LLVector3(128, 128, 70); 48 StartPos = new LLVector3(128, 128, 70);
49 } 49 }
50 } 50 }
51} 51} \ No newline at end of file
diff --git a/OpenSim/Framework/MapBlockData.cs b/OpenSim/Framework/MapBlockData.cs
index b9c88fa..60f5be3 100644
--- a/OpenSim/Framework/MapBlockData.cs
+++ b/OpenSim/Framework/MapBlockData.cs
@@ -32,18 +32,18 @@ namespace OpenSim.Framework
32{ 32{
33 public class MapBlockData 33 public class MapBlockData
34 { 34 {
35 public uint Flags;
36 public ushort X;
37 public ushort Y;
38 public byte Agents;
39 public byte Access; 35 public byte Access;
40 public byte WaterHeight; 36 public byte Agents;
37 public uint Flags;
41 public LLUUID MapImageId; 38 public LLUUID MapImageId;
42 public String Name; 39 public String Name;
43 public uint RegionFlags; 40 public uint RegionFlags;
41 public byte WaterHeight;
42 public ushort X;
43 public ushort Y;
44 44
45 public MapBlockData() 45 public MapBlockData()
46 { 46 {
47 } 47 }
48 } 48 }
49} 49} \ No newline at end of file
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index dbc06db..c378d27 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -34,25 +34,21 @@ namespace OpenSim.Framework
34 /// </summary> 34 /// </summary>
35 public class MessageServerConfig 35 public class MessageServerConfig
36 { 36 {
37 public string DefaultStartupMsg = String.Empty;
38 public string UserServerURL = String.Empty;
39 public string UserSendKey = String.Empty;
40 public string UserRecvKey = String.Empty;
41
42 public string GridServerURL = String.Empty;
43 public string GridSendKey = String.Empty;
44 public string GridRecvKey = String.Empty;
45 public string MessageServerIP = String.Empty;
46
47 public string DatabaseProvider = String.Empty;
48 public string GridCommsProvider = String.Empty;
49
50 public static uint DefaultHttpPort = 8006; 37 public static uint DefaultHttpPort = 8006;
51 public static bool DefaultHttpSSL = false; 38 public static bool DefaultHttpSSL = false;
39 private ConfigurationMember configMember;
40 public string DatabaseProvider = String.Empty;
41 public string DefaultStartupMsg = String.Empty;
42 public string GridCommsProvider = String.Empty;
43 public string GridRecvKey = String.Empty;
44 public string GridSendKey = String.Empty;
45 public string GridServerURL = String.Empty;
52 public uint HttpPort = DefaultHttpPort; 46 public uint HttpPort = DefaultHttpPort;
53 public bool HttpSSL = DefaultHttpSSL; 47 public bool HttpSSL = DefaultHttpSSL;
54 48 public string MessageServerIP = String.Empty;
55 private ConfigurationMember configMember; 49 public string UserRecvKey = String.Empty;
50 public string UserSendKey = String.Empty;
51 public string UserServerURL = String.Empty;
56 52
57 public MessageServerConfig(string description, string filename) 53 public MessageServerConfig(string description, string filename)
58 { 54 {
@@ -60,9 +56,9 @@ namespace OpenSim.Framework
60 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true); 56 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
61 configMember.performConfigurationRetrieve(); 57 configMember.performConfigurationRetrieve();
62 } 58 }
59
63 public void loadConfigurationOptions() 60 public void loadConfigurationOptions()
64 { 61 {
65
66 configMember.addConfigurationOption("default_user_server", 62 configMember.addConfigurationOption("default_user_server",
67 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 63 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
68 "Default User Server URI", 64 "Default User Server URI",
@@ -82,7 +78,7 @@ namespace OpenSim.Framework
82 78
83 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 79 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
84 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 80 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
85 81
86 configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 82 configMember.addConfigurationOption("region_comms_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
87 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false); 83 "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false);
88 84
@@ -91,51 +87,49 @@ namespace OpenSim.Framework
91 configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 87 configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
92 "Use SSL? true/false", DefaultHttpSSL.ToString(), false); 88 "Use SSL? true/false", DefaultHttpSSL.ToString(), false);
93 configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 89 configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
94 "My Published IP Address", "127.0.0.1", false); 90 "My Published IP Address", "127.0.0.1", false);
95
96 } 91 }
97 92
98 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 93 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
99 { 94 {
100 switch (configuration_key) 95 switch (configuration_key)
101 { 96 {
102
103 case "default_user_server": 97 case "default_user_server":
104 UserServerURL = (string)configuration_result; 98 UserServerURL = (string) configuration_result;
105 break; 99 break;
106 case "user_send_key": 100 case "user_send_key":
107 UserSendKey = (string)configuration_result; 101 UserSendKey = (string) configuration_result;
108 break; 102 break;
109 case "user_recv_key": 103 case "user_recv_key":
110 UserRecvKey = (string)configuration_result; 104 UserRecvKey = (string) configuration_result;
111 break; 105 break;
112 case "default_grid_server": 106 case "default_grid_server":
113 GridServerURL = (string)configuration_result; 107 GridServerURL = (string) configuration_result;
114 break; 108 break;
115 case "grid_send_key": 109 case "grid_send_key":
116 GridSendKey = (string)configuration_result; 110 GridSendKey = (string) configuration_result;
117 break; 111 break;
118 case "grid_recv_key": 112 case "grid_recv_key":
119 GridRecvKey = (string)configuration_result; 113 GridRecvKey = (string) configuration_result;
120 break; 114 break;
121 case "database_provider": 115 case "database_provider":
122 DatabaseProvider = (string)configuration_result; 116 DatabaseProvider = (string) configuration_result;
123 break; 117 break;
124 case "http_port": 118 case "http_port":
125 HttpPort = (uint)configuration_result; 119 HttpPort = (uint) configuration_result;
126 break; 120 break;
127 case "http_ssl": 121 case "http_ssl":
128 HttpSSL = (bool)configuration_result; 122 HttpSSL = (bool) configuration_result;
129 break; 123 break;
130 case "region_comms_provider": 124 case "region_comms_provider":
131 GridCommsProvider = (string)configuration_result; 125 GridCommsProvider = (string) configuration_result;
132 break; 126 break;
133 case "published_ip": 127 case "published_ip":
134 MessageServerIP = (string)configuration_result; 128 MessageServerIP = (string) configuration_result;
135 break; 129 break;
136 } 130 }
137 131
138 return true; 132 return true;
139 } 133 }
140 } 134 }
141} 135} \ No newline at end of file
diff --git a/OpenSim/Framework/NeighbourInfo.cs b/OpenSim/Framework/NeighbourInfo.cs
index bf2db9f..3932c6d 100644
--- a/OpenSim/Framework/NeighbourInfo.cs
+++ b/OpenSim/Framework/NeighbourInfo.cs
@@ -29,14 +29,14 @@ namespace OpenSim.Framework
29{ 29{
30 public class NeighbourInfo 30 public class NeighbourInfo
31 { 31 {
32 public NeighbourInfo()
33 {
34 }
35
36 public ulong regionhandle; 32 public ulong regionhandle;
37 public uint RegionLocX; 33 public uint RegionLocX;
38 public uint RegionLocY; 34 public uint RegionLocY;
39 public string sim_ip; 35 public string sim_ip;
40 public uint sim_port; 36 public uint sim_port;
37
38 public NeighbourInfo()
39 {
40 }
41 } 41 }
42} 42} \ No newline at end of file
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index ee11924..399a365 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -32,23 +32,22 @@ namespace OpenSim.Framework
32{ 32{
33 public class NetworkServersInfo 33 public class NetworkServersInfo
34 { 34 {
35 public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/"; 35 public static readonly uint DefaultHttpListenerPort = 9000;
36 public static uint RemotingListenerPort = 8895;
36 public string AssetSendKey = String.Empty; 37 public string AssetSendKey = String.Empty;
38 public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
37 39
38 public string GridURL = String.Empty;
39 public string GridSendKey = String.Empty;
40 public string GridRecvKey = String.Empty; 40 public string GridRecvKey = String.Empty;
41 public string UserURL = String.Empty; 41 public string GridSendKey = String.Empty;
42 public string UserSendKey = String.Empty; 42 public string GridURL = String.Empty;
43 public string UserRecvKey = String.Empty;
44 public bool isSandbox;
45
46 public string InventoryURL = String.Empty;
47
48 public static readonly uint DefaultHttpListenerPort = 9000;
49 public uint HttpListenerPort = DefaultHttpListenerPort; 43 public uint HttpListenerPort = DefaultHttpListenerPort;
50 44 public string InventoryURL = String.Empty;
51 public static uint RemotingListenerPort = 8895; 45 public bool isSandbox;
46 private uint? m_defaultHomeLocX;
47 private uint? m_defaultHomeLocY;
48 public string UserRecvKey = String.Empty;
49 public string UserSendKey = String.Empty;
50 public string UserURL = String.Empty;
52 51
53 52
54 public NetworkServersInfo() 53 public NetworkServersInfo()
@@ -61,15 +60,11 @@ namespace OpenSim.Framework
61 m_defaultHomeLocY = defaultHomeLocY; 60 m_defaultHomeLocY = defaultHomeLocY;
62 } 61 }
63 62
64 private uint? m_defaultHomeLocX;
65
66 public uint DefaultHomeLocX 63 public uint DefaultHomeLocX
67 { 64 {
68 get { return m_defaultHomeLocX.Value; } 65 get { return m_defaultHomeLocX.Value; }
69 } 66 }
70 67
71 private uint? m_defaultHomeLocY;
72
73 public uint DefaultHomeLocY 68 public uint DefaultHomeLocY
74 { 69 {
75 get { return m_defaultHomeLocY.Value; } 70 get { return m_defaultHomeLocY.Value; }
@@ -100,4 +95,4 @@ namespace OpenSim.Framework
100 InventoryConfig.DefaultHttpPort.ToString()); 95 InventoryConfig.DefaultHttpPort.ToString());
101 } 96 }
102 } 97 }
103} 98} \ No newline at end of file
diff --git a/OpenSim/Framework/OSUUID.cs b/OpenSim/Framework/OSUUID.cs
index 90de347..cb83ff2 100644
--- a/OpenSim/Framework/OSUUID.cs
+++ b/OpenSim/Framework/OSUUID.cs
@@ -31,13 +31,17 @@ using libsecondlife;
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
33 [Serializable] 33 [Serializable]
34 public class OSUUID: IComparable 34 public class OSUUID : IComparable
35 { 35 {
36 public static readonly OSUUID Zero = new OSUUID();
36 public Guid UUID; 37 public Guid UUID;
37 38
38 public OSUUID() {} 39 public OSUUID()
40 {
41 }
39 42
40 /* Constructors */ 43 /* Constructors */
44
41 public OSUUID(string s) 45 public OSUUID(string s)
42 { 46 {
43 if (s == null) 47 if (s == null)
@@ -61,6 +65,21 @@ namespace OpenSim.Framework
61 UUID = new Guid(0, 0, 0, BitConverter.GetBytes(u)); 65 UUID = new Guid(0, 0, 0, BitConverter.GetBytes(u));
62 } 66 }
63 67
68 #region IComparable Members
69
70 public int CompareTo(object obj)
71 {
72 if (obj is OSUUID)
73 {
74 OSUUID ID = (OSUUID) obj;
75 return UUID.CompareTo(ID.UUID);
76 }
77
78 throw new ArgumentException("object is not a OSUUID");
79 }
80
81 #endregion
82
64 // out conversion 83 // out conversion
65 public override string ToString() 84 public override string ToString()
66 { 85 {
@@ -81,20 +100,9 @@ namespace OpenSim.Framework
81 public override bool Equals(object o) 100 public override bool Equals(object o)
82 { 101 {
83 if (!(o is LLUUID)) return false; 102 if (!(o is LLUUID)) return false;
84
85 OSUUID uuid = (OSUUID)o;
86 return UUID == uuid.UUID;
87 }
88
89 public int CompareTo(object obj)
90 {
91 if (obj is OSUUID)
92 {
93 OSUUID ID = (OSUUID)obj;
94 return this.UUID.CompareTo(ID.UUID);
95 }
96 103
97 throw new ArgumentException("object is not a OSUUID"); 104 OSUUID uuid = (OSUUID) o;
105 return UUID == uuid.UUID;
98 } 106 }
99 107
100 // Static methods 108 // Static methods
@@ -102,7 +110,5 @@ namespace OpenSim.Framework
102 { 110 {
103 return new OSUUID(Guid.NewGuid()); 111 return new OSUUID(Guid.NewGuid());
104 } 112 }
105
106 public static readonly OSUUID Zero = new OSUUID();
107 } 113 }
108} 114} \ No newline at end of file
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 22f952a..be56cdc 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -35,18 +35,31 @@ namespace OpenSim.Framework
35{ 35{
36 public sealed class PacketPool 36 public sealed class PacketPool
37 { 37 {
38 static public void EncodeProxyMessage(byte[] bytes, ref int numBytes, EndPoint trueEP) 38 private static readonly PacketPool instance = new PacketPool();
39
40 private Hashtable pool = new Hashtable();
41
42 static PacketPool()
43 {
44 }
45
46 public static PacketPool Instance
47 {
48 get { return instance; }
49 }
50
51 public static void EncodeProxyMessage(byte[] bytes, ref int numBytes, EndPoint trueEP)
39 { 52 {
40 if( numBytes > 4090 ) // max UPD size = 4096 53 if (numBytes > 4090) // max UPD size = 4096
41 { 54 {
42 throw new Exception("ERROR: No space to encode the proxy EP"); 55 throw new Exception("ERROR: No space to encode the proxy EP");
43 } 56 }
44 57
45 ushort port = (ushort) ((IPEndPoint) trueEP).Port; 58 ushort port = (ushort) ((IPEndPoint) trueEP).Port;
46 bytes[numBytes++] = (byte)(port % 256); 59 bytes[numBytes++] = (byte) (port % 256);
47 bytes[numBytes++] = (byte)(port / 256); 60 bytes[numBytes++] = (byte) (port / 256);
48 61
49 foreach (byte b in ((IPEndPoint)trueEP).Address.GetAddressBytes()) 62 foreach (byte b in ((IPEndPoint) trueEP).Address.GetAddressBytes())
50 { 63 {
51 bytes[numBytes++] = b; 64 bytes[numBytes++] = b;
52 } 65 }
@@ -57,8 +70,8 @@ namespace OpenSim.Framework
57 70
58 numBytes = x; 71 numBytes = x;
59 } 72 }
60 73
61 static public EndPoint DecodeProxyMessage(byte[] bytes, ref int numBytes) 74 public static EndPoint DecodeProxyMessage(byte[] bytes, ref int numBytes)
62 { 75 {
63 // IPv4 Only 76 // IPv4 Only
64 byte[] addr = new byte[4]; 77 byte[] addr = new byte[4];
@@ -68,35 +81,19 @@ namespace OpenSim.Framework
68 addr[1] = bytes[--numBytes]; 81 addr[1] = bytes[--numBytes];
69 addr[0] = bytes[--numBytes]; 82 addr[0] = bytes[--numBytes];
70 83
71 ushort port = (ushort)(bytes[--numBytes] * 256); 84 ushort port = (ushort) (bytes[--numBytes] * 256);
72 port += (ushort)bytes[--numBytes]; 85 port += (ushort) bytes[--numBytes];
73
74 return (EndPoint) new IPEndPoint(new IPAddress(addr), (int)port);
75 }
76 86
77 // Set up a thread-safe singleton pattern 87 return (EndPoint) new IPEndPoint(new IPAddress(addr), (int) port);
78 static PacketPool()
79 {
80 } 88 }
81 89
82 static readonly PacketPool instance = new PacketPool(); 90 public Packet GetPacket(PacketType type)
83
84 public static PacketPool Instance
85 { 91 {
86 get
87 {
88 return instance;
89 }
90 }
91
92 private Hashtable pool = new Hashtable();
93
94 public Packet GetPacket(PacketType type) {
95 Packet packet = null; 92 Packet packet = null;
96 93
97 lock(pool) 94 lock (pool)
98 { 95 {
99 if(pool[type] == null || ((Stack) pool[type]).Count == 0) 96 if (pool[type] == null || ((Stack) pool[type]).Count == 0)
100 { 97 {
101 // Creating a new packet if we cannot reuse an old package 98 // Creating a new packet if we cannot reuse an old package
102 packet = Packet.BuildPacket(type); 99 packet = Packet.BuildPacket(type);
@@ -104,14 +101,14 @@ namespace OpenSim.Framework
104 else 101 else
105 { 102 {
106 // Recycle old packages 103 // Recycle old packages
107 packet=(Packet) ((Stack) pool[type]).Pop(); 104 packet = (Packet) ((Stack) pool[type]).Pop();
108 } 105 }
109 } 106 }
110 107
111 return packet; 108 return packet;
112 } 109 }
113 110
114 // private byte[] decoded_header = new byte[10]; 111 // private byte[] decoded_header = new byte[10];
115 private PacketType GetType(byte[] bytes) 112 private PacketType GetType(byte[] bytes)
116 { 113 {
117 byte[] decoded_header = new byte[10 + 8]; 114 byte[] decoded_header = new byte[10 + 8];
@@ -120,7 +117,7 @@ namespace OpenSim.Framework
120 117
121 Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10); 118 Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10);
122 119
123 if((bytes[0] & Helpers.MSG_ZEROCODED)!=0) 120 if ((bytes[0] & Helpers.MSG_ZEROCODED) != 0)
124 { 121 {
125 Helpers.ZeroDecodeCommand(bytes, decoded_header); 122 Helpers.ZeroDecodeCommand(bytes, decoded_header);
126 } 123 }
@@ -129,21 +126,21 @@ namespace OpenSim.Framework
129 { 126 {
130 if (decoded_header[7] == 0xFF) 127 if (decoded_header[7] == 0xFF)
131 { 128 {
132 id = (ushort)((decoded_header[8] << 8) + decoded_header[9]); 129 id = (ushort) ((decoded_header[8] << 8) + decoded_header[9]);
133 freq = PacketFrequency.Low; 130 freq = PacketFrequency.Low;
134 } 131 }
135 else 132 else
136 { 133 {
137 id = (ushort)decoded_header[7]; 134 id = (ushort) decoded_header[7];
138 freq = PacketFrequency.Medium; 135 freq = PacketFrequency.Medium;
139 } 136 }
140 } 137 }
141 else 138 else
142 { 139 {
143 id = (ushort)decoded_header[6]; 140 id = (ushort) decoded_header[6];
144 freq = PacketFrequency.High; 141 freq = PacketFrequency.High;
145 } 142 }
146 143
147 return Packet.GetType(id, freq); 144 return Packet.GetType(id, freq);
148 } 145 }
149 146
@@ -157,7 +154,8 @@ namespace OpenSim.Framework
157 return packet; 154 return packet;
158 } 155 }
159 156
160 public void ReturnPacket(Packet packet) { 157 public void ReturnPacket(Packet packet)
158 {
161 return; // packet pool disabled 159 return; // packet pool disabled
162 160
163 /* // Commented out to remove a compiler warning. :) 161 /* // Commented out to remove a compiler warning. :)
@@ -177,4 +175,4 @@ namespace OpenSim.Framework
177 */ 175 */
178 } 176 }
179 } 177 }
180} 178} \ No newline at end of file
diff --git a/OpenSim/Framework/PrimitiveBaseShape.cs b/OpenSim/Framework/PrimitiveBaseShape.cs
index 4243300..6607c4b 100644
--- a/OpenSim/Framework/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/PrimitiveBaseShape.cs
@@ -202,7 +202,7 @@ namespace OpenSim.Framework
202 202
203 public void SetRadius(float radius) 203 public void SetRadius(float radius)
204 { 204 {
205 Scale.X = Scale.Y = radius*2f; 205 Scale.X = Scale.Y = radius * 2f;
206 } 206 }
207 207
208 // TODO: void returns need to change of course 208 // TODO: void returns need to change of course
@@ -237,4 +237,4 @@ namespace OpenSim.Framework
237 ProfileEnd = LLObject.PackEndCut(profileRange.Y); 237 ProfileEnd = LLObject.PackEndCut(profileRange.Y);
238 } 238 }
239 } 239 }
240} 240} \ No newline at end of file
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index 73971ac..422c939 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -33,6 +33,21 @@ namespace OpenSim.Framework
33{ 33{
34 public class RegionCommsListener : IRegionCommsListener 34 public class RegionCommsListener : IRegionCommsListener
35 { 35 {
36 public string debugRegionName = String.Empty;
37 private AcknowledgeAgentCross handlerAcknowledgeAgentCrossed = null; // OnAcknowledgeAgentCrossed;
38 private AcknowledgePrimCross handlerAcknowledgePrimCrossed = null; // OnAcknowledgePrimCrossed;
39 private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
40 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
41 private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
42 private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
43 private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
44 private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser
45 private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
46 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
47 private RegionUp handlerRegionUp = null; // OnRegionUp;
48
49 #region IRegionCommsListener Members
50
36 public event ExpectUserDelegate OnExpectUser; 51 public event ExpectUserDelegate OnExpectUser;
37 public event ExpectPrimDelegate OnExpectPrim; 52 public event ExpectPrimDelegate OnExpectPrim;
38 public event GenericCall2 OnExpectChildAgent; 53 public event GenericCall2 OnExpectChildAgent;
@@ -45,20 +60,7 @@ namespace OpenSim.Framework
45 public event RegionUp OnRegionUp; 60 public event RegionUp OnRegionUp;
46 public event ChildAgentUpdate OnChildAgentUpdate; 61 public event ChildAgentUpdate OnChildAgentUpdate;
47 62
48 private ExpectUserDelegate handlerExpectUser = null; // OnExpectUser 63 #endregion
49 private ExpectPrimDelegate handlerExpectPrim = null; // OnExpectPrim;
50 private GenericCall2 handlerExpectChildAgent = null; // OnExpectChildAgent;
51 private AgentCrossing handlerAvatarCrossingIntoRegion = null; // OnAvatarCrossingIntoRegion;
52 private PrimCrossing handlerPrimCrossingIntoRegion = null; // OnPrimCrossingIntoRegion;
53 private UpdateNeighbours handlerNeighboursUpdate = null; // OnNeighboursUpdate;
54 private AcknowledgeAgentCross handlerAcknowledgeAgentCrossed = null; // OnAcknowledgeAgentCrossed;
55 private AcknowledgePrimCross handlerAcknowledgePrimCrossed = null; // OnAcknowledgePrimCrossed;
56 private CloseAgentConnection handlerCloseAgentConnection = null; // OnCloseAgentConnection;
57 private RegionUp handlerRegionUp = null; // OnRegionUp;
58 private ChildAgentUpdate handlerChildAgentUpdate = null; // OnChildAgentUpdate;
59
60 public string debugRegionName = String.Empty;
61
62 64
63 /// <summary> 65 /// <summary>
64 /// 66 ///
@@ -164,7 +166,6 @@ namespace OpenSim.Framework
164 { 166 {
165 handlerCloseAgentConnection(regionHandle, agentID); 167 handlerCloseAgentConnection(regionHandle, agentID);
166 return true; 168 return true;
167
168 } 169 }
169 return false; 170 return false;
170 } 171 }
@@ -213,4 +214,4 @@ namespace OpenSim.Framework
213 return false; 214 return false;
214 } 215 }
215 } 216 }
216} 217} \ No newline at end of file
diff --git a/OpenSim/Framework/RegionHandle.cs b/OpenSim/Framework/RegionHandle.cs
index dcb5a43..f55f085 100644
--- a/OpenSim/Framework/RegionHandle.cs
+++ b/OpenSim/Framework/RegionHandle.cs
@@ -146,4 +146,4 @@ namespace OpenSim.Framework
146 return y; 146 return y;
147 } 147 }
148 } 148 }
149} 149} \ No newline at end of file
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 20a2709..88c9ea6 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -37,9 +37,26 @@ namespace OpenSim.Framework
37 [Serializable] 37 [Serializable]
38 public class SimpleRegionInfo 38 public class SimpleRegionInfo
39 { 39 {
40 // private static readonly log4net.ILog m_log 40 // private static readonly log4net.ILog m_log
41 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 41 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
42 42
43 protected bool Allow_Alternate_Ports;
44 public bool m_allow_alternate_ports;
45 protected string m_externalHostName;
46
47 /// <value>
48 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
49 /// </value>
50 protected uint m_httpPort;
51
52 protected IPEndPoint m_internalEndPoint;
53 protected uint? m_regionLocX;
54 protected uint? m_regionLocY;
55 protected uint m_remotingPort;
56 protected string m_serverURI;
57 public LLUUID RegionID = LLUUID.Zero;
58 public string RemotingAddress;
59
43 public SimpleRegionInfo() 60 public SimpleRegionInfo()
44 { 61 {
45 } 62 }
@@ -74,52 +91,27 @@ namespace OpenSim.Framework
74 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 91 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
75 RemotingAddress = ConvertFrom.RemotingAddress; 92 RemotingAddress = ConvertFrom.RemotingAddress;
76 RegionID = LLUUID.Zero; 93 RegionID = LLUUID.Zero;
77 ServerURI = ConvertFrom.ServerURI; 94 ServerURI = ConvertFrom.ServerURI;
78 } 95 }
79 96
80 public LLUUID RegionID = LLUUID.Zero;
81
82 protected uint m_remotingPort;
83
84 public uint RemotingPort 97 public uint RemotingPort
85 { 98 {
86 get { return m_remotingPort; } 99 get { return m_remotingPort; }
87 set { m_remotingPort = value; } 100 set { m_remotingPort = value; }
88 } 101 }
89 102
90 /// <value>
91 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
92 /// </value>
93 protected uint m_httpPort;
94 public uint HttpPort 103 public uint HttpPort
95 { 104 {
96 get { return m_httpPort; } 105 get { return m_httpPort; }
97 set { m_httpPort = value; } 106 set { m_httpPort = value; }
98 } 107 }
99
100 public bool m_allow_alternate_ports;
101
102 protected string m_serverURI;
103
104 public int getInternalEndPointPort()
105 {
106 return m_internalEndPoint.Port;
107 }
108 108
109 public string ServerURI 109 public string ServerURI
110 { 110 {
111 get 111 get { return m_serverURI; }
112 { 112 set { m_serverURI = value; }
113 return m_serverURI;
114 }
115 set
116 {
117 m_serverURI = value;
118 }
119 } 113 }
120 114
121 public string RemotingAddress;
122
123 /// <value> 115 /// <value>
124 /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw. 116 /// This accessor can throw all the exceptions that Dns.GetHostAddresses can throw.
125 /// 117 ///
@@ -139,7 +131,7 @@ namespace OpenSim.Framework
139 131
140 // Reset for next check 132 // Reset for next check
141 ia = null; 133 ia = null;
142 134
143 foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) 135 foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName))
144 { 136 {
145 if (ia == null) 137 if (ia == null)
@@ -158,33 +150,24 @@ namespace OpenSim.Framework
158 set { m_externalHostName = value.ToString(); } 150 set { m_externalHostName = value.ToString(); }
159 } 151 }
160 152
161 protected string m_externalHostName;
162 public string ExternalHostName 153 public string ExternalHostName
163 { 154 {
164 get { return m_externalHostName; } 155 get { return m_externalHostName; }
165 set { m_externalHostName = value; } 156 set { m_externalHostName = value; }
166 } 157 }
167 158
168 protected bool Allow_Alternate_Ports;
169
170 protected IPEndPoint m_internalEndPoint;
171
172 public IPEndPoint InternalEndPoint 159 public IPEndPoint InternalEndPoint
173 { 160 {
174 get { return m_internalEndPoint; } 161 get { return m_internalEndPoint; }
175 set { m_internalEndPoint = value; } 162 set { m_internalEndPoint = value; }
176 } 163 }
177 164
178 protected uint? m_regionLocX;
179
180 public uint RegionLocX 165 public uint RegionLocX
181 { 166 {
182 get { return m_regionLocX.Value; } 167 get { return m_regionLocX.Value; }
183 set { m_regionLocX = value; } 168 set { m_regionLocX = value; }
184 } 169 }
185 170
186 protected uint? m_regionLocY;
187
188 public uint RegionLocY 171 public uint RegionLocY
189 { 172 {
190 get { return m_regionLocY.Value; } 173 get { return m_regionLocY.Value; }
@@ -193,49 +176,39 @@ namespace OpenSim.Framework
193 176
194 public ulong RegionHandle 177 public ulong RegionHandle
195 { 178 {
196 get { return Util.UIntsToLong((RegionLocX * (uint)Constants.RegionSize), (RegionLocY * (uint)Constants.RegionSize)); } 179 get { return Util.UIntsToLong((RegionLocX * (uint) Constants.RegionSize), (RegionLocY * (uint) Constants.RegionSize)); }
180 }
181
182 public int getInternalEndPointPort()
183 {
184 return m_internalEndPoint.Port;
197 } 185 }
198 } 186 }
199 187
200 public class RegionInfo : SimpleRegionInfo 188 public class RegionInfo : SimpleRegionInfo
201 { 189 {
202 // private static readonly log4net.ILog m_log 190 // private static readonly log4net.ILog m_log
203 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 191 // = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
204
205 public string RegionName = String.Empty;
206 192
193 public bool commFailTF = false;
194 public ConfigurationMember configMember;
195 public LLUUID CovenantID = LLUUID.Zero;
207 public string DataStore = String.Empty; 196 public string DataStore = String.Empty;
208 public bool isSandbox = false; 197 public bool isSandbox = false;
209 public bool commFailTF = false; 198 private EstateSettings m_estateSettings;
210 199
211// public bool m_allow_alternate_ports; 200// public bool m_allow_alternate_ports;
212 201
213 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero; 202 public LLUUID MasterAvatarAssignedUUID = LLUUID.Zero;
214 public LLUUID CovenantID = LLUUID.Zero;
215 public string MasterAvatarFirstName = String.Empty; 203 public string MasterAvatarFirstName = String.Empty;
216 public string MasterAvatarLastName = String.Empty; 204 public string MasterAvatarLastName = String.Empty;
217 public string MasterAvatarSandboxPassword = String.Empty; 205 public string MasterAvatarSandboxPassword = String.Empty;
218 public string regionSecret = LLUUID.Random().ToString();
219 public string proxyUrl = "";
220 public LLUUID originRegionID = LLUUID.Zero; 206 public LLUUID originRegionID = LLUUID.Zero;
207 public string proxyUrl = "";
208 public string RegionName = String.Empty;
209 public string regionSecret = LLUUID.Random().ToString();
221 210
222 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 211 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
223 private EstateSettings m_estateSettings;
224
225 public EstateSettings EstateSettings
226 {
227 get
228 {
229 if (m_estateSettings == null)
230 {
231 m_estateSettings = new EstateSettings();
232 }
233
234 return m_estateSettings;
235 }
236 }
237
238 public ConfigurationMember configMember;
239 212
240 public RegionInfo(string description, string filename, bool skipConsoleConfig) 213 public RegionInfo(string description, string filename, bool skipConsoleConfig)
241 { 214 {
@@ -286,15 +259,27 @@ namespace OpenSim.Framework
286 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 259 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
287 RemotingAddress = ConvertFrom.RemotingAddress; 260 RemotingAddress = ConvertFrom.RemotingAddress;
288 RegionID = LLUUID.Zero; 261 RegionID = LLUUID.Zero;
289 ServerURI = ConvertFrom.ServerURI; 262 ServerURI = ConvertFrom.ServerURI;
290 } 263 }
291 264
265 public EstateSettings EstateSettings
266 {
267 get
268 {
269 if (m_estateSettings == null)
270 {
271 m_estateSettings = new EstateSettings();
272 }
273
274 return m_estateSettings;
275 }
276 }
277
292 public void SetEndPoint(string ipaddr, int port) 278 public void SetEndPoint(string ipaddr, int port)
293 { 279 {
294 IPAddress tmpIP = IPAddress.Parse(ipaddr); 280 IPAddress tmpIP = IPAddress.Parse(ipaddr);
295 IPEndPoint tmpEPE= new IPEndPoint(tmpIP, port); 281 IPEndPoint tmpEPE = new IPEndPoint(tmpIP, port);
296 m_internalEndPoint = tmpEPE; 282 m_internalEndPoint = tmpEPE;
297
298 } 283 }
299 284
300 //not in use, should swap to nini though. 285 //not in use, should swap to nini though.
@@ -351,8 +336,9 @@ namespace OpenSim.Framework
351 return true; 336 return true;
352 } 337 }
353 338
354 public void SaveRegionToFile(string description, string filename) { 339 public void SaveRegionToFile(string description, string filename)
355 configMember = new ConfigurationMember(filename, description, loadConfigurationOptionsFromMe, 340 {
341 configMember = new ConfigurationMember(filename, description, loadConfigurationOptionsFromMe,
356 ignoreIncomingConfiguration, false); 342 ignoreIncomingConfiguration, false);
357 configMember.performConfigurationRetrieve(); 343 configMember.performConfigurationRetrieve();
358 } 344 }
@@ -371,13 +357,13 @@ namespace OpenSim.Framework
371 //configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false); 357 //configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false);
372 configMember.addConfigurationOption("internal_ip_address", 358 configMember.addConfigurationOption("internal_ip_address",
373 ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, 359 ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
374 "Internal IP Address for incoming UDP client connections", 360 "Internal IP Address for incoming UDP client connections",
375 m_internalEndPoint.Address.ToString(), 361 m_internalEndPoint.Address.ToString(),
376 true); 362 true);
377 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, 363 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
378 "Internal IP Port for incoming UDP client connections", 364 "Internal IP Port for incoming UDP client connections",
379 m_internalEndPoint.Port.ToString(), true); 365 m_internalEndPoint.Port.ToString(), true);
380 configMember.addConfigurationOption("allow_alternate_ports", 366 configMember.addConfigurationOption("allow_alternate_ports",
381 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 367 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
382 "Allow sim to find alternate UDP ports when ports are in use?", 368 "Allow sim to find alternate UDP ports when ports are in use?",
383 m_allow_alternate_ports.ToString(), true); 369 m_allow_alternate_ports.ToString(), true);
@@ -396,7 +382,7 @@ namespace OpenSim.Framework
396 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 382 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
397 "Last Name of Master Avatar", MasterAvatarLastName, true); 383 "Last Name of Master Avatar", MasterAvatarLastName, true);
398 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 384 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
399 "(Sandbox Mode Only)Password for Master Avatar account", 385 "(Sandbox Mode Only)Password for Master Avatar account",
400 MasterAvatarSandboxPassword, true); 386 MasterAvatarSandboxPassword, true);
401 } 387 }
402 388
@@ -461,7 +447,7 @@ namespace OpenSim.Framework
461 { 447 {
462 case "sim_UUID": 448 case "sim_UUID":
463 RegionID = (LLUUID) configuration_result; 449 RegionID = (LLUUID) configuration_result;
464 originRegionID = (LLUUID)configuration_result; 450 originRegionID = (LLUUID) configuration_result;
465 break; 451 break;
466 case "sim_name": 452 case "sim_name":
467 RegionName = (string) configuration_result; 453 RegionName = (string) configuration_result;
@@ -480,10 +466,10 @@ namespace OpenSim.Framework
480 m_internalEndPoint = new IPEndPoint(address, 0); 466 m_internalEndPoint = new IPEndPoint(address, 0);
481 break; 467 break;
482 case "internal_ip_port": 468 case "internal_ip_port":
483 m_internalEndPoint.Port = (int)configuration_result; 469 m_internalEndPoint.Port = (int) configuration_result;
484 break; 470 break;
485 case "allow_alternate_ports": 471 case "allow_alternate_ports":
486 m_allow_alternate_ports = (bool)configuration_result; 472 m_allow_alternate_ports = (bool) configuration_result;
487 break; 473 break;
488 case "external_host_name": 474 case "external_host_name":
489 if ((string) configuration_result != "SYSTEMIP") 475 if ((string) configuration_result != "SYSTEMIP")
@@ -517,9 +503,9 @@ namespace OpenSim.Framework
517 return true; 503 return true;
518 } 504 }
519 505
520 public void SaveEstatecovenantUUID(LLUUID notecard) 506 public void SaveEstatecovenantUUID(LLUUID notecard)
521 { 507 {
522 configMember.forceSetConfigurationOption("estate_covanant_uuid", notecard.ToString()); 508 configMember.forceSetConfigurationOption("estate_covanant_uuid", notecard.ToString());
523 } 509 }
524 } 510 }
525} 511} \ No newline at end of file
diff --git a/OpenSim/Framework/RegionUpData.cs b/OpenSim/Framework/RegionUpData.cs
index 6162171..40f3164 100644
--- a/OpenSim/Framework/RegionUpData.cs
+++ b/OpenSim/Framework/RegionUpData.cs
@@ -32,10 +32,11 @@ namespace OpenSim.Framework
32 [Serializable] 32 [Serializable]
33 public class RegionUpData 33 public class RegionUpData
34 { 34 {
35 private uint m_X = 0;
36 private uint m_Y = 0;
37 private string m_ipaddr = ""; 35 private string m_ipaddr = "";
38 private int m_port = 0; 36 private int m_port = 0;
37 private uint m_X = 0;
38 private uint m_Y = 0;
39
39 public RegionUpData(uint X, uint Y, string ipaddr, int port) 40 public RegionUpData(uint X, uint Y, string ipaddr, int port)
40 { 41 {
41 m_X = X; 42 m_X = X;
@@ -48,17 +49,20 @@ namespace OpenSim.Framework
48 { 49 {
49 get { return m_X; } 50 get { return m_X; }
50 } 51 }
52
51 public uint Y 53 public uint Y
52 { 54 {
53 get { return m_Y; } 55 get { return m_Y; }
54 } 56 }
57
55 public string IPADDR 58 public string IPADDR
56 { 59 {
57 get { return m_ipaddr; } 60 get { return m_ipaddr; }
58 } 61 }
62
59 public int PORT 63 public int PORT
60 { 64 {
61 get { return m_port; } 65 get { return m_port; }
62 } 66 }
63 } 67 }
64} 68} \ No newline at end of file
diff --git a/OpenSim/Framework/Remoting.cs b/OpenSim/Framework/Remoting.cs
index 5097d9c..7f18221 100644
--- a/OpenSim/Framework/Remoting.cs
+++ b/OpenSim/Framework/Remoting.cs
@@ -108,7 +108,7 @@ namespace OpenSim.Framework
108 byte[] bytes = new byte[64]; 108 byte[] bytes = new byte[64];
109 RNG.GetBytes(bytes); 109 RNG.GetBytes(bytes);
110 110
111 StringBuilder sb = new StringBuilder(bytes.Length*2); 111 StringBuilder sb = new StringBuilder(bytes.Length * 2);
112 foreach (byte b in bytes) 112 foreach (byte b in bytes)
113 { 113 {
114 sb.AppendFormat("{0:x2}", b); 114 sb.AppendFormat("{0:x2}", b);
@@ -131,4 +131,4 @@ namespace OpenSim.Framework
131 return c; 131 return c;
132 } 132 }
133 } 133 }
134} 134} \ No newline at end of file
diff --git a/OpenSim/Framework/SerializableInventory.cs b/OpenSim/Framework/SerializableInventory.cs
index 8193fa7..81f993c 100644
--- a/OpenSim/Framework/SerializableInventory.cs
+++ b/OpenSim/Framework/SerializableInventory.cs
@@ -39,16 +39,20 @@ namespace OpenSim.Framework
39 [XmlRoot(ElementName = "inventory", IsNullable = true)] 39 [XmlRoot(ElementName = "inventory", IsNullable = true)]
40 public class SerializableInventory 40 public class SerializableInventory
41 { 41 {
42 [XmlElement(ElementName = "folder", IsNullable = true)] public SerializableFolder root;
43
44 #region Nested type: SerializableFolder
45
42 [XmlRoot(ElementName = "folder", IsNullable = true)] 46 [XmlRoot(ElementName = "folder", IsNullable = true)]
43 public class SerializableFolder : InventoryFolderBase 47 public class SerializableFolder : InventoryFolderBase
44 { 48 {
45 [XmlArray(ElementName = "folders", IsNullable = true)] [XmlArrayItem(ElementName = "folder", IsNullable = true, Type = typeof (SerializableFolder))] public
46 ArrayList SubFolders;
47
48 [XmlArray(ElementName = "items", IsNullable = true)] [XmlArrayItem(ElementName = "item", IsNullable = true, Type = typeof (InventoryItemBase))] public ArrayList 49 [XmlArray(ElementName = "items", IsNullable = true)] [XmlArrayItem(ElementName = "item", IsNullable = true, Type = typeof (InventoryItemBase))] public ArrayList
49 Items; 50 Items;
51
52 [XmlArray(ElementName = "folders", IsNullable = true)] [XmlArrayItem(ElementName = "folder", IsNullable = true, Type = typeof (SerializableFolder))] public
53 ArrayList SubFolders;
50 } 54 }
51 55
52 [XmlElement(ElementName = "folder", IsNullable = true)] public SerializableFolder root; 56 #endregion
53 } 57 }
54} 58} \ No newline at end of file
diff --git a/OpenSim/Framework/SerializableRegionInfo.cs b/OpenSim/Framework/SerializableRegionInfo.cs
index 2c73da8..97aa8db 100644
--- a/OpenSim/Framework/SerializableRegionInfo.cs
+++ b/OpenSim/Framework/SerializableRegionInfo.cs
@@ -35,6 +35,28 @@ namespace OpenSim.Framework
35 [Serializable] 35 [Serializable]
36 public class SearializableRegionInfo 36 public class SearializableRegionInfo
37 { 37 {
38 public bool m_allow_alternate_ports;
39 protected string m_externalHostName;
40
41 /// <value>
42 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
43 ///
44 /// FIXME: Defaulting to 9000 temporarily (on the basis that this is the http port most region
45 /// servers are running) until the revision in which this change is made propogates around grids.
46 /// </value>
47 protected uint m_httpPort = 9000;
48
49 protected IPEndPoint m_internalEndPoint;
50 protected Guid m_originRegionID = LLUUID.Zero.UUID;
51 protected string m_proxyUrl;
52 protected uint? m_regionLocX;
53 protected uint? m_regionLocY;
54 protected string m_regionName;
55 public uint m_remotingPort;
56 protected string m_serverURI;
57 public Guid RegionID = LLUUID.Zero.UUID;
58 public string RemotingAddress;
59
38 /// <summary> 60 /// <summary>
39 /// This is a serializable version of RegionInfo 61 /// This is a serializable version of RegionInfo
40 /// </summary> 62 /// </summary>
@@ -52,7 +74,7 @@ namespace OpenSim.Framework
52 m_httpPort = ConvertFrom.HttpPort; 74 m_httpPort = ConvertFrom.HttpPort;
53 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports; 75 m_allow_alternate_ports = ConvertFrom.m_allow_alternate_ports;
54 RemotingAddress = ConvertFrom.RemotingAddress; 76 RemotingAddress = ConvertFrom.RemotingAddress;
55 m_proxyUrl = ConvertFrom.proxyUrl; 77 m_proxyUrl = ConvertFrom.proxyUrl;
56 OriginRegionID = ConvertFrom.originRegionID; 78 OriginRegionID = ConvertFrom.originRegionID;
57 RegionName = ConvertFrom.RegionName; 79 RegionName = ConvertFrom.RegionName;
58 ServerURI = ConvertFrom.ServerURI; 80 ServerURI = ConvertFrom.ServerURI;
@@ -77,31 +99,17 @@ namespace OpenSim.Framework
77 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port); 99 m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int) port);
78 } 100 }
79 101
80 public Guid RegionID = LLUUID.Zero.UUID;
81
82 public uint m_remotingPort;
83 public uint RemotingPort 102 public uint RemotingPort
84 { 103 {
85 get { return m_remotingPort; } 104 get { return m_remotingPort; }
86 set { m_remotingPort = value; } 105 set { m_remotingPort = value; }
87 } 106 }
88 107
89 /// <value>
90 /// The port by which http communication occurs with the region (most noticeably, CAPS communication)
91 ///
92 /// FIXME: Defaulting to 9000 temporarily (on the basis that this is the http port most region
93 /// servers are running) until the revision in which this change is made propogates around grids.
94 /// </value>
95 protected uint m_httpPort = 9000;
96 public uint HttpPort 108 public uint HttpPort
97 { 109 {
98 get { return m_httpPort; } 110 get { return m_httpPort; }
99 set { m_httpPort = value; } 111 set { m_httpPort = value; }
100 } 112 }
101
102 public bool m_allow_alternate_ports;
103
104 public string RemotingAddress;
105 113
106 public IPEndPoint ExternalEndPoint 114 public IPEndPoint ExternalEndPoint
107 { 115 {
@@ -138,32 +146,24 @@ namespace OpenSim.Framework
138 set { m_externalHostName = value.ToString(); } 146 set { m_externalHostName = value.ToString(); }
139 } 147 }
140 148
141 protected string m_externalHostName;
142
143 public string ExternalHostName 149 public string ExternalHostName
144 { 150 {
145 get { return m_externalHostName; } 151 get { return m_externalHostName; }
146 set { m_externalHostName = value; } 152 set { m_externalHostName = value; }
147 } 153 }
148 154
149 protected IPEndPoint m_internalEndPoint;
150
151 public IPEndPoint InternalEndPoint 155 public IPEndPoint InternalEndPoint
152 { 156 {
153 get { return m_internalEndPoint; } 157 get { return m_internalEndPoint; }
154 set { m_internalEndPoint = value; } 158 set { m_internalEndPoint = value; }
155 } 159 }
156 160
157 protected uint? m_regionLocX;
158
159 public uint RegionLocX 161 public uint RegionLocX
160 { 162 {
161 get { return m_regionLocX.Value; } 163 get { return m_regionLocX.Value; }
162 set { m_regionLocX = value; } 164 set { m_regionLocX = value; }
163 } 165 }
164 166
165 protected uint? m_regionLocY;
166
167 public uint RegionLocY 167 public uint RegionLocY
168 { 168 {
169 get { return m_regionLocY.Value; } 169 get { return m_regionLocY.Value; }
@@ -172,59 +172,31 @@ namespace OpenSim.Framework
172 172
173 public ulong RegionHandle 173 public ulong RegionHandle
174 { 174 {
175 get { return Util.UIntsToLong((RegionLocX * (uint)Constants.RegionSize), (RegionLocY * (uint)Constants.RegionSize)); } 175 get { return Util.UIntsToLong((RegionLocX * (uint) Constants.RegionSize), (RegionLocY * (uint) Constants.RegionSize)); }
176 } 176 }
177 177
178 protected string m_proxyUrl;
179 public string ProxyUrl 178 public string ProxyUrl
180 { 179 {
181 get 180 get { return m_proxyUrl; }
182 { 181 set { m_proxyUrl = value; }
183 return m_proxyUrl;
184 }
185 set
186 {
187 m_proxyUrl = value;
188 }
189 } 182 }
190 183
191 protected Guid m_originRegionID = LLUUID.Zero.UUID;
192 public LLUUID OriginRegionID 184 public LLUUID OriginRegionID
193 { 185 {
194 get 186 get { return new LLUUID(m_originRegionID); }
195 { 187 set { m_originRegionID = value.UUID; }
196 return new LLUUID(m_originRegionID);
197 }
198 set
199 {
200 m_originRegionID = value.UUID;
201 }
202 } 188 }
203 189
204 protected string m_regionName;
205 public string RegionName 190 public string RegionName
206 { 191 {
207 get 192 get { return m_regionName; }
208 { 193 set { m_regionName = value; }
209 return m_regionName;
210 }
211 set
212 {
213 m_regionName = value;
214 }
215 } 194 }
216 195
217 protected string m_serverURI;
218 public string ServerURI 196 public string ServerURI
219 { 197 {
220 get 198 get { return m_serverURI; }
221 { 199 set { m_serverURI = value; }
222 return m_serverURI;
223 }
224 set
225 {
226 m_serverURI = value;
227 }
228 } 200 }
229 } 201 }
230} 202} \ No newline at end of file
diff --git a/OpenSim/Framework/TaskInventoryItem.cs b/OpenSim/Framework/TaskInventoryItem.cs
index 615644b..d01c4c1 100644
--- a/OpenSim/Framework/TaskInventoryItem.cs
+++ b/OpenSim/Framework/TaskInventoryItem.cs
@@ -35,19 +35,38 @@ using libsecondlife;
35using log4net; 35using log4net;
36 36
37namespace OpenSim.Framework 37namespace OpenSim.Framework
38{ 38{
39 /// <summary> 39 /// <summary>
40 /// A dictionary for task inventory. 40 /// A dictionary for task inventory.
41 /// 41 ///
42 /// This class is not thread safe. Callers must synchronize on Dictionary methods. 42 /// This class is not thread safe. Callers must synchronize on Dictionary methods.
43 /// </summary> 43 /// </summary>
44 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>, 44 public class TaskInventoryDictionary : Dictionary<LLUUID, TaskInventoryItem>,
45 ICloneable, IXmlSerializable 45 ICloneable, IXmlSerializable
46 { 46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 48
49 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof(TaskInventoryItem)); 49 private static XmlSerializer tiiSerializer = new XmlSerializer(typeof (TaskInventoryItem));
50 50
51 #region ICloneable Members
52
53 public Object Clone()
54 {
55 TaskInventoryDictionary clone = new TaskInventoryDictionary();
56
57 lock (this)
58 {
59 foreach (LLUUID uuid in Keys)
60 {
61 clone.Add(uuid, (TaskInventoryItem) this[uuid].Clone());
62 }
63 }
64
65 return clone;
66 }
67
68 #endregion
69
51 // The alternative of simply serializing the list doesn't appear to work on mono, since 70 // The alternative of simply serializing the list doesn't appear to work on mono, since
52 // we get a 71 // we get a
53 // 72 //
@@ -58,43 +77,46 @@ namespace OpenSim.Framework
58 // ... 77 // ...
59// private static XmlSerializer tiiSerializer 78// private static XmlSerializer tiiSerializer
60// = new XmlSerializer(typeof(Dictionary<LLUUID, TaskInventoryItem>.ValueCollection)); 79// = new XmlSerializer(typeof(Dictionary<LLUUID, TaskInventoryItem>.ValueCollection));
61 80
62 // see IXmlSerializable 81 // see IXmlSerializable
82
83 #region IXmlSerializable Members
84
63 public XmlSchema GetSchema() 85 public XmlSchema GetSchema()
64 { 86 {
65 return null; 87 return null;
66 } 88 }
67 89
68 // see IXmlSerializable 90 // see IXmlSerializable
69 public void ReadXml(XmlReader reader) 91 public void ReadXml(XmlReader reader)
70 { 92 {
71 m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node before actions, {0}", reader.Name); 93 m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node before actions, {0}", reader.Name);
72 94
73 if (!reader.IsEmptyElement) 95 if (!reader.IsEmptyElement)
74 { 96 {
75 reader.Read(); 97 reader.Read();
76 while (tiiSerializer.CanDeserialize(reader)) 98 while (tiiSerializer.CanDeserialize(reader))
77 { 99 {
78 TaskInventoryItem item = (TaskInventoryItem)tiiSerializer.Deserialize(reader); 100 TaskInventoryItem item = (TaskInventoryItem) tiiSerializer.Deserialize(reader);
79 Add(item.ItemID, item); 101 Add(item.ItemID, item);
80 102
81 m_log.DebugFormat("[TASK INVENTORY]: Instanted prim item {0}, {1} from xml", item.Name, item.ItemID); 103 m_log.DebugFormat("[TASK INVENTORY]: Instanted prim item {0}, {1} from xml", item.Name, item.ItemID);
82 } 104 }
83 105
84 m_log.DebugFormat("[TASK INVENTORY]: Instantiated {0} prim items in total from xml", Count); 106 m_log.DebugFormat("[TASK INVENTORY]: Instantiated {0} prim items in total from xml", Count);
85 } 107 }
86 else 108 else
87 { 109 {
88 m_log.DebugFormat("[TASK INVENTORY]: Skipping empty element {0}", reader.Name); 110 m_log.DebugFormat("[TASK INVENTORY]: Skipping empty element {0}", reader.Name);
89 } 111 }
90 112
91 // For some .net implementations, this last read is necessary so that we advance beyond the end tag 113 // For some .net implementations, this last read is necessary so that we advance beyond the end tag
92 // of the element wrapping this object so that the rest of the serialization can complete normally. 114 // of the element wrapping this object so that the rest of the serialization can complete normally.
93 reader.Read(); 115 reader.Read();
94 116
95 m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node after actions, {0}", reader.Name); 117 m_log.DebugFormat("[TASK INVENTORY]: ReadXml current node after actions, {0}", reader.Name);
96 } 118 }
97 119
98 // see IXmlSerializable 120 // see IXmlSerializable
99 public void WriteXml(XmlWriter writer) 121 public void WriteXml(XmlWriter writer)
100 { 122 {
@@ -105,27 +127,15 @@ namespace OpenSim.Framework
105 tiiSerializer.Serialize(writer, item); 127 tiiSerializer.Serialize(writer, item);
106 } 128 }
107 } 129 }
108 130
109 //tiiSerializer.Serialize(writer, Values); 131 //tiiSerializer.Serialize(writer, Values);
110 } 132 }
111 133
134 #endregion
135
112 // see ICloneable 136 // see ICloneable
113 public Object Clone()
114 {
115 TaskInventoryDictionary clone = new TaskInventoryDictionary();
116
117 lock (this)
118 {
119 foreach (LLUUID uuid in Keys)
120 {
121 clone.Add(uuid, (TaskInventoryItem)this[uuid].Clone());
122 }
123 }
124
125 return clone;
126 }
127 } 137 }
128 138
129 /// <summary> 139 /// <summary>
130 /// Represents an item in a task inventory 140 /// Represents an item in a task inventory
131 /// </summary> 141 /// </summary>
@@ -135,90 +145,99 @@ namespace OpenSim.Framework
135 /// XXX This should really be factored out into some constants class. 145 /// XXX This should really be factored out into some constants class.
136 /// </summary> 146 /// </summary>
137 private const uint FULL_MASK_PERMISSIONS_GENERAL = 2147483647; 147 private const uint FULL_MASK_PERMISSIONS_GENERAL = 2147483647;
138 148
139 /// <summary> 149 /// <summary>
140 /// Inventory types 150 /// Inventory types
141 /// </summary> 151 /// </summary>
142 public static string[] InvTypes = new string[] 152 public static string[] InvTypes = new string[]
143 { 153 {
144 "texture", 154 "texture",
145 "sound", 155 "sound",
146 "calling_card", 156 "calling_card",
147 "landmark", 157 "landmark",
148 String.Empty, 158 String.Empty,
149 String.Empty, 159 String.Empty,
150 "object", 160 "object",
151 "notecard", 161 "notecard",
152 String.Empty, 162 String.Empty,
153 String.Empty, 163 String.Empty,
154 "lsl_text", 164 "lsl_text",
155 String.Empty, 165 String.Empty,
156 String.Empty, 166 String.Empty,
157 "bodypart", 167 "bodypart",
158 String.Empty, 168 String.Empty,
159 "snapshot", 169 "snapshot",
160 String.Empty, 170 String.Empty,
161 String.Empty, 171 String.Empty,
162 "wearable", 172 "wearable",
163 "animation", 173 "animation",
164 "gesture" 174 "gesture"
165 175 };
166 }; 176
167
168 /// <summary> 177 /// <summary>
169 /// Asset types 178 /// Asset types
170 /// </summary> 179 /// </summary>
171 public static string[] Types = new string[] 180 public static string[] Types = new string[]
172 { 181 {
173 "texture", 182 "texture",
174 "sound", 183 "sound",
175 "callcard", 184 "callcard",
176 "landmark", 185 "landmark",
177 "clothing", // Deprecated 186 "clothing", // Deprecated
178 "clothing", 187 "clothing",
179 "object", 188 "object",
180 "notecard", 189 "notecard",
181 "category", 190 "category",
182 "root", 191 "root",
183 "lsltext", 192 "lsltext",
184 "lslbyte", 193 "lslbyte",
185 "txtr_tga", 194 "txtr_tga",
186 "bodypart", 195 "bodypart",
187 "trash", 196 "trash",
188 "snapshot", 197 "snapshot",
189 "lstndfnd", 198 "lstndfnd",
190 "snd_wav", 199 "snd_wav",
191 "img_tga", 200 "img_tga",
192 "jpeg", 201 "jpeg",
193 "animatn", 202 "animatn",
194 "gesture" 203 "gesture"
195 }; 204 };
196 205
197 public LLUUID ItemID = LLUUID.Zero; 206 public LLUUID AssetID = LLUUID.Zero;
198 public LLUUID ParentID = LLUUID.Zero; //parent folder id
199 207
200 public uint BaseMask = FULL_MASK_PERMISSIONS_GENERAL; 208 public uint BaseMask = FULL_MASK_PERMISSIONS_GENERAL;
201 public uint OwnerMask = FULL_MASK_PERMISSIONS_GENERAL; 209 public uint CreationDate = 0;
202 public uint GroupMask = FULL_MASK_PERMISSIONS_GENERAL;
203 public uint EveryoneMask = FULL_MASK_PERMISSIONS_GENERAL;
204 public uint NextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL;
205 public LLUUID CreatorID = LLUUID.Zero; 210 public LLUUID CreatorID = LLUUID.Zero;
206 public LLUUID OwnerID = LLUUID.Zero; 211 public string Description = String.Empty;
207 public LLUUID LastOwnerID = LLUUID.Zero; 212 public uint EveryoneMask = FULL_MASK_PERMISSIONS_GENERAL;
213 public uint Flags = 0;
208 public LLUUID GroupID = LLUUID.Zero; 214 public LLUUID GroupID = LLUUID.Zero;
215 public uint GroupMask = FULL_MASK_PERMISSIONS_GENERAL;
209 216
210 public LLUUID AssetID = LLUUID.Zero;
211 public int Type = 0;
212 public int InvType = 0; 217 public int InvType = 0;
213 public uint Flags = 0; 218 public LLUUID ItemID = LLUUID.Zero;
219 public LLUUID LastOwnerID = LLUUID.Zero;
214 public string Name = String.Empty; 220 public string Name = String.Empty;
215 public string Description = String.Empty; 221 public uint NextOwnerMask = FULL_MASK_PERMISSIONS_GENERAL;
216 public uint CreationDate = 0; 222 public LLUUID OwnerID = LLUUID.Zero;
223 public uint OwnerMask = FULL_MASK_PERMISSIONS_GENERAL;
224 public LLUUID ParentID = LLUUID.Zero; //parent folder id
225 public LLUUID ParentPartID = LLUUID.Zero;
217 public LLUUID PermsGranter; 226 public LLUUID PermsGranter;
218 public int PermsMask; 227 public int PermsMask;
228 public int Type = 0;
229
230 // See ICloneable
231
232 #region ICloneable Members
233
234 public Object Clone()
235 {
236 return MemberwiseClone();
237 }
238
239 #endregion
219 240
220 public LLUUID ParentPartID = LLUUID.Zero;
221
222 /// <summary> 241 /// <summary>
223 /// Reset the LLUUIDs for this item. 242 /// Reset the LLUUIDs for this item.
224 /// </summary> 243 /// </summary>
@@ -227,12 +246,6 @@ namespace OpenSim.Framework
227 { 246 {
228 ItemID = LLUUID.Random(); 247 ItemID = LLUUID.Random();
229 ParentPartID = partID; 248 ParentPartID = partID;
230 }
231
232 // See ICloneable
233 public Object Clone()
234 {
235 return MemberwiseClone();
236 } 249 }
237 } 250 }
238} 251} \ No newline at end of file
diff --git a/OpenSim/Framework/ThreadTracker.cs b/OpenSim/Framework/ThreadTracker.cs
index 8fe5b82..b87e180 100644
--- a/OpenSim/Framework/ThreadTracker.cs
+++ b/OpenSim/Framework/ThreadTracker.cs
@@ -34,9 +34,9 @@ namespace OpenSim.Framework
34{ 34{
35 public static class ThreadTracker 35 public static class ThreadTracker
36 { 36 {
37 private static readonly long ThreadTimeout = 30 * 10000000;
37 public static List<ThreadTrackerItem> m_Threads; 38 public static List<ThreadTrackerItem> m_Threads;
38 public static Thread ThreadTrackerThread; 39 public static Thread ThreadTrackerThread;
39 private static readonly long ThreadTimeout = 30 * 10000000;
40 40
41 static ThreadTracker() 41 static ThreadTracker()
42 { 42 {
@@ -123,10 +123,14 @@ namespace OpenSim.Framework
123 return threads; 123 return threads;
124 } 124 }
125 125
126 #region Nested type: ThreadTrackerItem
127
126 public class ThreadTrackerItem 128 public class ThreadTrackerItem
127 { 129 {
128 public Thread Thread;
129 public long LastSeenActive; 130 public long LastSeenActive;
131 public Thread Thread;
130 } 132 }
133
134 #endregion
131 } 135 }
132} 136} \ No newline at end of file
diff --git a/OpenSim/Framework/UndoStack.cs b/OpenSim/Framework/UndoStack.cs
index 0b97644..a49a0cc 100644
--- a/OpenSim/Framework/UndoStack.cs
+++ b/OpenSim/Framework/UndoStack.cs
@@ -26,8 +26,6 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Collections.Generic;
30using System.Text;
31 29
32namespace OpenSim.Framework 30namespace OpenSim.Framework
33{ 31{
@@ -38,35 +36,39 @@ namespace OpenSim.Framework
38 [Serializable] 36 [Serializable]
39 public class UndoStack<T> 37 public class UndoStack<T>
40 { 38 {
41
42 private int m_new = 1; 39 private int m_new = 1;
43 private int m_old = 0; 40 private int m_old = 0;
44 private T[] m_Undos; 41 private T[] m_Undos;
45 42
43 public UndoStack(int capacity)
44 {
45 m_Undos = new T[capacity + 1];
46 }
47
46 public bool IsFull 48 public bool IsFull
47 { 49 {
48 get 50 get { return m_new == m_old; }
49 {
50 return m_new == m_old;
51 }
52 } 51 }
53 52
54 53
55 public int Capacity 54 public int Capacity
56 { 55 {
56 get { return m_Undos.Length - 1; }
57 }
58
59 public int Count
60 {
57 get 61 get
58 { 62 {
59 return m_Undos.Length - 1; 63 int count = m_new - m_old - 1;
64 if (count < 0)
65 count += m_Undos.Length;
66 return count;
60 } 67 }
61 } 68 }
62 69
63
64 public UndoStack(int capacity)
65 {
66 m_Undos = new T[capacity + 1];
67 }
68 70
69 public void Push(T item) 71 public void Push(T item)
70 { 72 {
71 if (IsFull) 73 if (IsFull)
72 { 74 {
@@ -93,24 +95,13 @@ namespace OpenSim.Framework
93 throw new InvalidOperationException("Cannot pop from emtpy stack"); 95 throw new InvalidOperationException("Cannot pop from emtpy stack");
94 } 96 }
95 97
96 public int Count
97 {
98 get
99 {
100 int count = m_new - m_old - 1;
101 if (count < 0)
102 count += m_Undos.Length;
103 return count;
104 }
105 }
106
107 98
108 public T Peek() 99 public T Peek()
109 { 100 {
110 return m_Undos[m_new]; 101 return m_Undos[m_new];
111 } 102 }
112 103
113 104
114 public void Clear() 105 public void Clear()
115 { 106 {
116 if (Count > 0) 107 if (Count > 0)
@@ -123,6 +114,5 @@ namespace OpenSim.Framework
123 m_old = 0; 114 m_old = 0;
124 } 115 }
125 } 116 }
126
127 } 117 }
128} \ No newline at end of file 118} \ No newline at end of file
diff --git a/OpenSim/Framework/UserAgentData.cs b/OpenSim/Framework/UserAgentData.cs
index e4dd658..de09ce2 100644
--- a/OpenSim/Framework/UserAgentData.cs
+++ b/OpenSim/Framework/UserAgentData.cs
@@ -36,41 +36,34 @@ namespace OpenSim.Framework
36 public class UserAgentData 36 public class UserAgentData
37 { 37 {
38 /// <summary> 38 /// <summary>
39 /// The UUID of the users avatar (not the agent!)
40 /// </summary>
41 private LLUUID UUID;
42
43 /// <summary>
44 /// The IP address of the user 39 /// The IP address of the user
45 /// </summary> 40 /// </summary>
46 private string agentIP = String.Empty; 41 private string agentIP = String.Empty;
47 42
48 /// <summary> 43 /// <summary>
49 /// The port of the user 44 /// Is the user online?
50
51 /// </summary> 45 /// </summary>
52 private uint agentPort; 46 private bool agentOnline;
53 47
54 /// <summary> 48 /// <summary>
55 /// Is the user online? 49 /// The port of the user
56 /// </summary> 50 /// </summary>
57 private bool agentOnline; 51 private uint agentPort;
58 52
59 /// <summary> 53 /// <summary>
60 /// The session ID for the user (also the agent ID) 54 /// Region handle of the current region the user is in
61 /// </summary> 55 /// </summary>
62 private LLUUID sessionID; 56 private ulong currentHandle;
63 57
64 /// <summary> 58 /// <summary>
65 /// The "secure" session ID for the user 59 /// The position of the user within the region
66 /// </summary> 60 /// </summary>
67 /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> 61 private LLVector3 currentPos;
68 private LLUUID secureSessionID;
69 62
70 /// <summary> 63 /// <summary>
71 /// The region the user logged into initially 64 /// Current region the user is logged into
72 /// </summary> 65 /// </summary>
73 private LLUUID regionID; 66 private LLUUID currentRegion;
74 67
75 /// <summary> 68 /// <summary>
76 /// A unix timestamp from when the user logged in 69 /// A unix timestamp from when the user logged in
@@ -83,139 +76,114 @@ namespace OpenSim.Framework
83 private int logoutTime; 76 private int logoutTime;
84 77
85 /// <summary> 78 /// <summary>
86 /// Current region the user is logged into 79 /// The region the user logged into initially
87 /// </summary> 80 /// </summary>
88 private LLUUID currentRegion; 81 private LLUUID regionID;
89 82
90 /// <summary> 83 /// <summary>
91 /// Region handle of the current region the user is in 84 /// The "secure" session ID for the user
92 /// </summary> 85 /// </summary>
93 private ulong currentHandle; 86 /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks>
87 private LLUUID secureSessionID;
94 88
95 /// <summary> 89 /// <summary>
96 /// The position of the user within the region 90 /// The session ID for the user (also the agent ID)
97 /// </summary> 91 /// </summary>
98 private LLVector3 currentPos; 92 private LLUUID sessionID;
99 93
100 public LLUUID ProfileID { 94 /// <summary>
101 get { 95 /// The UUID of the users avatar (not the agent!)
102 return UUID; 96 /// </summary>
103 } 97 private LLUUID UUID;
104 set { 98
105 UUID = value; 99 public LLUUID ProfileID
106 } 100 {
101 get { return UUID; }
102 set { UUID = value; }
107 } 103 }
108 104
109 public string AgentIP { 105 public string AgentIP
110 get { 106 {
111 return agentIP; 107 get { return agentIP; }
112 } 108 set { agentIP = value; }
113 set {
114 agentIP = value;
115 }
116 } 109 }
117 110
118 public uint AgentPort { 111 public uint AgentPort
119 get { 112 {
120 return agentPort; 113 get { return agentPort; }
121 } 114 set { agentPort = value; }
122 set {
123 agentPort = value;
124 }
125 } 115 }
126 116
127 public bool AgentOnline { 117 public bool AgentOnline
128 get { 118 {
129 return agentOnline; 119 get { return agentOnline; }
130 } 120 set { agentOnline = value; }
131 set {
132 agentOnline = value;
133 }
134 } 121 }
135 122
136 public LLUUID SessionID { 123 public LLUUID SessionID
137 get { 124 {
138 return sessionID; 125 get { return sessionID; }
139 } 126 set { sessionID = value; }
140 set {
141 sessionID = value;
142 }
143 } 127 }
144 128
145 public LLUUID SecureSessionID { 129 public LLUUID SecureSessionID
146 get { 130 {
147 return secureSessionID; 131 get { return secureSessionID; }
148 } 132 set { secureSessionID = value; }
149 set {
150 secureSessionID = value;
151 }
152 } 133 }
153 134
154 public LLUUID InitialRegion { 135 public LLUUID InitialRegion
155 get { 136 {
156 return regionID; 137 get { return regionID; }
157 } 138 set { regionID = value; }
158 set {
159 regionID = value;
160 }
161 } 139 }
162 140
163 public int LoginTime { 141 public int LoginTime
164 get { 142 {
165 return loginTime; 143 get { return loginTime; }
166 } 144 set { loginTime = value; }
167 set {
168 loginTime = value;
169 }
170 } 145 }
171 146
172 public int LogoutTime { 147 public int LogoutTime
173 get { 148 {
174 return logoutTime; 149 get { return logoutTime; }
175 } 150 set { logoutTime = value; }
176 set {
177 logoutTime = value;
178 }
179 } 151 }
180 152
181 public LLUUID Region { 153 public LLUUID Region
182 get { 154 {
183 return currentRegion; 155 get { return currentRegion; }
184 } 156 set { currentRegion = value; }
185 set {
186 currentRegion = value;
187 }
188 } 157 }
189 158
190 public ulong Handle { 159 public ulong Handle
191 get { 160 {
192 return currentHandle; 161 get { return currentHandle; }
193 } 162 set { currentHandle = value; }
194 set {
195 currentHandle = value;
196 }
197 } 163 }
198 164
199 public LLVector3 Position { 165 public LLVector3 Position
200 get { 166 {
201 return currentPos; 167 get { return currentPos; }
202 } 168 set { currentPos = value; }
203 set {
204 currentPos = value;
205 }
206 } 169 }
207 170
208 public float PositionX { 171 public float PositionX
172 {
209 get { return currentPos.X; } 173 get { return currentPos.X; }
210 set { currentPos.X = value; } 174 set { currentPos.X = value; }
211 } 175 }
212 public float PositionY { 176
177 public float PositionY
178 {
213 get { return currentPos.Y; } 179 get { return currentPos.Y; }
214 set { currentPos.Y = value; } 180 set { currentPos.Y = value; }
215 } 181 }
216 public float PositionZ { 182
183 public float PositionZ
184 {
217 get { return currentPos.Z; } 185 get { return currentPos.Z; }
218 set { currentPos.Z = value; } 186 set { currentPos.Z = value; }
219 } 187 }
220 } 188 }
221} 189} \ No newline at end of file
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 8ae8f7e..c176bbf 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -34,28 +34,24 @@ namespace OpenSim.Framework
34 /// </summary> 34 /// </summary>
35 public class UserConfig 35 public class UserConfig
36 { 36 {
37 public string DefaultStartupMsg = String.Empty;
38 public string GridServerURL = String.Empty;
39 public string GridSendKey = String.Empty;
40 public string GridRecvKey = String.Empty;
41
42 public string InventoryUrl = String.Empty;
43
44 public string DatabaseProvider = String.Empty;
45
46 public static uint DefaultHttpPort = 8002; 37 public static uint DefaultHttpPort = 8002;
47 public static bool DefaultHttpSSL = false; 38 public static bool DefaultHttpSSL = false;
48 public uint HttpPort = DefaultHttpPort; 39 private ConfigurationMember configMember;
49 public bool HttpSSL = DefaultHttpSSL; 40 public string DatabaseProvider = String.Empty;
41 public string DefaultStartupMsg = String.Empty;
50 public uint DefaultX = 1000; 42 public uint DefaultX = 1000;
51 public uint DefaultY = 1000; 43 public uint DefaultY = 1000;
52 44 public string GridRecvKey = String.Empty;
53 private ConfigurationMember configMember; 45 public string GridSendKey = String.Empty;
46 public string GridServerURL = String.Empty;
47 public uint HttpPort = DefaultHttpPort;
48 public bool HttpSSL = DefaultHttpSSL;
49 public string InventoryUrl = String.Empty;
54 50
55 public UserConfig(string description, string filename) 51 public UserConfig(string description, string filename)
56 { 52 {
57 configMember = 53 configMember =
58 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration,true); 54 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, true);
59 configMember.performConfigurationRetrieve(); 55 configMember.performConfigurationRetrieve();
60 } 56 }
61 57
@@ -131,4 +127,4 @@ namespace OpenSim.Framework
131 return true; 127 return true;
132 } 128 }
133 } 129 }
134} 130} \ No newline at end of file
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index 254e903..b704682 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -36,39 +36,21 @@ namespace OpenSim.Framework
36 public class UserProfileData 36 public class UserProfileData
37 { 37 {
38 /// <summary> 38 /// <summary>
39 /// The ID value for this user 39 /// A UNIX Timestamp (seconds since epoch) for the users creation
40 /// </summary> 40 /// </summary>
41 private LLUUID _id; 41 private int _created;
42 42
43 /// <summary> 43 /// <summary>
44 /// The last used Web_login_key 44 /// The users last registered agent (filled in on the user server)
45 /// </summary> 45 /// </summary>
46 private LLUUID _webLoginKey; 46 private UserAgentData _currentAgent;
47
47 /// <summary> 48 /// <summary>
48 /// The first component of a users account name 49 /// The first component of a users account name
49 /// </summary> 50 /// </summary>
50 private string _firstname; 51 private string _firstname;
51 52
52 /// <summary> 53 /// <summary>
53 /// The second component of a users account name
54 /// </summary>
55 private string _surname;
56
57 /// <summary>
58 /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
59 /// </summary>
60 /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
61 private string _passwordHash;
62
63 /// <summary>
64 /// The salt used for the users hash, should be 32 bytes or longer
65 /// </summary>
66 private string _passwordSalt;
67
68 private uint _homeRegionX;
69 private uint _homeRegionY;
70
71 /// <summary>
72 /// The coordinates inside the region of the home location 54 /// The coordinates inside the region of the home location
73 /// </summary> 55 /// </summary>
74 private LLVector3 _homeLocation; 56 private LLVector3 _homeLocation;
@@ -78,42 +60,44 @@ namespace OpenSim.Framework
78 /// </summary> 60 /// </summary>
79 private LLVector3 _homeLookAt; 61 private LLVector3 _homeLookAt;
80 62
63 private uint _homeRegionX;
64 private uint _homeRegionY;
65
81 /// <summary> 66 /// <summary>
82 /// A UNIX Timestamp (seconds since epoch) for the users creation 67 /// The ID value for this user
83 /// </summary> 68 /// </summary>
84 private int _created; 69 private LLUUID _id;
85 70
86 /// <summary> 71 /// <summary>
87 /// A UNIX Timestamp for the users last login date / time 72 /// A UNIX Timestamp for the users last login date / time
88 /// </summary> 73 /// </summary>
89 private int _lastLogin; 74 private int _lastLogin;
90 75
91 private LLUUID _rootInventoryFolderID;
92
93 /// <summary> 76 /// <summary>
94 /// A URI to the users inventory server, used for foreigners and large grids 77 /// A salted hash containing the users password, in the format md5(md5(password) + ":" + salt)
95 /// </summary> 78 /// </summary>
96 private string _userInventoryURI = String.Empty; 79 /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
80 private string _passwordHash;
97 81
98 /// <summary> 82 /// <summary>
99 /// A URI to the users asset server, used for foreigners and large grids. 83 /// The salt used for the users hash, should be 32 bytes or longer
100 /// </summary> 84 /// </summary>
101 private string _userAssetURI = String.Empty; 85 private string _passwordSalt;
102 86
103 /// <summary> 87 /// <summary>
104 /// A uint mask containing the "I can do" fields of the users profile 88 /// The about text listed in a users profile.
105 /// </summary> 89 /// </summary>
106 private uint _profileCanDoMask; 90 private string _profileAboutText = String.Empty;
107 91
108 /// <summary> 92 /// <summary>
109 /// A uint mask containing the "I want to do" part of the users profile 93 /// A uint mask containing the "I can do" fields of the users profile
110 /// </summary> 94 /// </summary>
111 private uint _profileWantDoMask; // Profile window "I want to" mask 95 private uint _profileCanDoMask;
112 96
113 /// <summary> 97 /// <summary>
114 /// The about text listed in a users profile. 98 /// The profile image for the users first life tab
115 /// </summary> 99 /// </summary>
116 private string _profileAboutText = String.Empty; 100 private LLUUID _profileFirstImage;
117 101
118 /// <summary> 102 /// <summary>
119 /// The first life about text listed in a users profile 103 /// The first life about text listed in a users profile
@@ -126,21 +110,38 @@ namespace OpenSim.Framework
126 private LLUUID _profileImage; 110 private LLUUID _profileImage;
127 111
128 /// <summary> 112 /// <summary>
129 /// The profile image for the users first life tab 113 /// A uint mask containing the "I want to do" part of the users profile
130 /// </summary> 114 /// </summary>
131 private LLUUID _profileFirstImage; 115 private uint _profileWantDoMask; // Profile window "I want to" mask
116
117 private LLUUID _rootInventoryFolderID;
132 118
133 /// <summary> 119 /// <summary>
134 /// The users last registered agent (filled in on the user server) 120 /// The second component of a users account name
135 /// </summary> 121 /// </summary>
136 private UserAgentData _currentAgent; 122 private string _surname;
123
124 /// <summary>
125 /// A URI to the users asset server, used for foreigners and large grids.
126 /// </summary>
127 private string _userAssetURI = String.Empty;
128
129 /// <summary>
130 /// A URI to the users inventory server, used for foreigners and large grids
131 /// </summary>
132 private string _userInventoryURI = String.Empty;
133
134 /// <summary>
135 /// The last used Web_login_key
136 /// </summary>
137 private LLUUID _webLoginKey;
137 138
138 /// <summary> 139 /// <summary>
139 /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into 140 /// The regionhandle of the users preffered home region. If multiple sims occupy the same spot, the grid may decide which region the user logs into
140 /// </summary> 141 /// </summary>
141 public ulong HomeRegion 142 public ulong HomeRegion
142 { 143 {
143 get { return Helpers.UIntsToLong((_homeRegionX * (uint)Constants.RegionSize), (_homeRegionY * (uint)Constants.RegionSize)); } 144 get { return Helpers.UIntsToLong((_homeRegionX * (uint) Constants.RegionSize), (_homeRegionY * (uint) Constants.RegionSize)); }
144 set 145 set
145 { 146 {
146 _homeRegionX = (uint) (value >> 40); 147 _homeRegionX = (uint) (value >> 40);
@@ -149,232 +150,175 @@ namespace OpenSim.Framework
149 } 150 }
150 151
151 // Property wrappers 152 // Property wrappers
152 public LLUUID ID { 153 public LLUUID ID
153 get { 154 {
154 return _id; 155 get { return _id; }
155 } 156 set { _id = value; }
156 set {
157 _id = value;
158 }
159 } 157 }
160 158
161 public LLUUID WebLoginKey { 159 public LLUUID WebLoginKey
162 get { 160 {
163 return _webLoginKey; 161 get { return _webLoginKey; }
164 } 162 set { _webLoginKey = value; }
165 set {
166 _webLoginKey = value;
167 }
168 } 163 }
169 164
170 public string FirstName { 165 public string FirstName
171 get { 166 {
172 return _firstname; 167 get { return _firstname; }
173 } 168 set { _firstname = value; }
174 set {
175 _firstname = value;
176 }
177 } 169 }
178 170
179 public string SurName { 171 public string SurName
180 get { 172 {
181 return _surname; 173 get { return _surname; }
182 } 174 set { _surname = value; }
183 set {
184 _surname = value;
185 }
186 } 175 }
187 176
188 public string PasswordHash { 177 public string PasswordHash
189 get { 178 {
190 return _passwordHash; 179 get { return _passwordHash; }
191 } 180 set { _passwordHash = value; }
192 set {
193 _passwordHash = value;
194 }
195 } 181 }
196 182
197 public string PasswordSalt { 183 public string PasswordSalt
198 get { 184 {
199 return _passwordSalt; 185 get { return _passwordSalt; }
200 } 186 set { _passwordSalt = value; }
201 set {
202 _passwordSalt = value;
203 }
204 } 187 }
205 188
206 public uint HomeRegionX { 189 public uint HomeRegionX
207 get { 190 {
208 return _homeRegionX; 191 get { return _homeRegionX; }
209 } 192 set { _homeRegionX = value; }
210 set {
211 _homeRegionX = value;
212 }
213 } 193 }
214 194
215 public uint HomeRegionY { 195 public uint HomeRegionY
216 get { 196 {
217 return _homeRegionY; 197 get { return _homeRegionY; }
218 } 198 set { _homeRegionY = value; }
219 set {
220 _homeRegionY = value;
221 }
222 } 199 }
223 200
224 public LLVector3 HomeLocation { 201 public LLVector3 HomeLocation
225 get { 202 {
226 return _homeLocation; 203 get { return _homeLocation; }
227 } 204 set { _homeLocation = value; }
228 set {
229 _homeLocation = value;
230 }
231 } 205 }
232 206
233 // for handy serialization 207 // for handy serialization
234 public float HomeLocationX { 208 public float HomeLocationX
209 {
235 get { return _homeLocation.X; } 210 get { return _homeLocation.X; }
236 set { _homeLocation.X = value; } 211 set { _homeLocation.X = value; }
237 } 212 }
238 public float HomeLocationY { 213
214 public float HomeLocationY
215 {
239 get { return _homeLocation.Y; } 216 get { return _homeLocation.Y; }
240 set { _homeLocation.Y = value; } 217 set { _homeLocation.Y = value; }
241 } 218 }
242 public float HomeLocationZ { 219
220 public float HomeLocationZ
221 {
243 get { return _homeLocation.Z; } 222 get { return _homeLocation.Z; }
244 set { _homeLocation.Z = value; } 223 set { _homeLocation.Z = value; }
245 } 224 }
246 225
247 226
248 public LLVector3 HomeLookAt { 227 public LLVector3 HomeLookAt
249 get { 228 {
250 return _homeLookAt; 229 get { return _homeLookAt; }
251 } 230 set { _homeLookAt = value; }
252 set {
253 _homeLookAt = value;
254 }
255 } 231 }
256 232
257 // for handy serialization 233 // for handy serialization
258 public float HomeLookAtX { 234 public float HomeLookAtX
235 {
259 get { return _homeLookAt.X; } 236 get { return _homeLookAt.X; }
260 set { _homeLookAt.X = value; } 237 set { _homeLookAt.X = value; }
261 } 238 }
262 public float HomeLookAtY { 239
240 public float HomeLookAtY
241 {
263 get { return _homeLookAt.Y; } 242 get { return _homeLookAt.Y; }
264 set { _homeLookAt.Y = value; } 243 set { _homeLookAt.Y = value; }
265 } 244 }
266 public float HomeLookAtZ { 245
246 public float HomeLookAtZ
247 {
267 get { return _homeLookAt.Z; } 248 get { return _homeLookAt.Z; }
268 set { _homeLookAt.Z = value; } 249 set { _homeLookAt.Z = value; }
269 } 250 }
270 251
271 public int Created { 252 public int Created
272 get { 253 {
273 return _created; 254 get { return _created; }
274 } 255 set { _created = value; }
275 set {
276 _created = value;
277 }
278 } 256 }
279 257
280 public int LastLogin { 258 public int LastLogin
281 get { 259 {
282 return _lastLogin; 260 get { return _lastLogin; }
283 } 261 set { _lastLogin = value; }
284 set {
285 _lastLogin = value;
286 }
287 } 262 }
288 263
289 public LLUUID RootInventoryFolderID { 264 public LLUUID RootInventoryFolderID
290 get { 265 {
291 return _rootInventoryFolderID; 266 get { return _rootInventoryFolderID; }
292 } 267 set { _rootInventoryFolderID = value; }
293 set {
294 _rootInventoryFolderID = value;
295 }
296 } 268 }
297 269
298 public string UserInventoryURI { 270 public string UserInventoryURI
299 get { 271 {
300 return _userInventoryURI; 272 get { return _userInventoryURI; }
301 } 273 set { _userInventoryURI = value; }
302 set {
303 _userInventoryURI = value;
304 }
305 } 274 }
306 275
307 public string UserAssetURI { 276 public string UserAssetURI
308 get { 277 {
309 return _userAssetURI; 278 get { return _userAssetURI; }
310 } 279 set { _userAssetURI = value; }
311 set {
312 _userAssetURI = value;
313 }
314 } 280 }
315 281
316 public uint CanDoMask { 282 public uint CanDoMask
317 get { 283 {
318 return _profileCanDoMask; 284 get { return _profileCanDoMask; }
319 } 285 set { _profileCanDoMask = value; }
320 set {
321 _profileCanDoMask = value;
322 }
323 } 286 }
324 287
325 public uint WantDoMask { 288 public uint WantDoMask
326 get { 289 {
327 return _profileWantDoMask; 290 get { return _profileWantDoMask; }
328 } 291 set { _profileWantDoMask = value; }
329 set {
330 _profileWantDoMask = value;
331 }
332 } 292 }
333 293
334 public string AboutText { 294 public string AboutText
335 get { 295 {
336 return _profileAboutText; 296 get { return _profileAboutText; }
337 } 297 set { _profileAboutText = value; }
338 set {
339 _profileAboutText = value;
340 }
341 } 298 }
342 299
343 public string FirstLifeAboutText { 300 public string FirstLifeAboutText
344 get { 301 {
345 return _profileFirstText; 302 get { return _profileFirstText; }
346 } 303 set { _profileFirstText = value; }
347 set {
348 _profileFirstText = value;
349 }
350 } 304 }
351 305
352 public LLUUID Image { 306 public LLUUID Image
353 get { 307 {
354 return _profileImage; 308 get { return _profileImage; }
355 } 309 set { _profileImage = value; }
356 set {
357 _profileImage = value;
358 }
359 } 310 }
360 311
361 public LLUUID FirstLifeImage { 312 public LLUUID FirstLifeImage
362 get { 313 {
363 return _profileFirstImage; 314 get { return _profileFirstImage; }
364 } 315 set { _profileFirstImage = value; }
365 set {
366 _profileFirstImage = value;
367 }
368 } 316 }
369 317
370 public UserAgentData CurrentAgent { 318 public UserAgentData CurrentAgent
371 get { 319 {
372 return _currentAgent; 320 get { return _currentAgent; }
373 } 321 set { _currentAgent = value; }
374 set {
375 _currentAgent = value;
376 }
377 } 322 }
378
379 } 323 }
380} 324} \ No newline at end of file
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 8114957..0943626 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -45,18 +45,17 @@ namespace OpenSim.Framework
45{ 45{
46 public class Util 46 public class Util
47 { 47 {
48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 48 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
49
50 private static Random randomClass = new Random();
51 private static uint nextXferID = 5000;
52 private static object XferLock = new object();
53 49
54 // Get a list of invalid path characters (OS dependent) 50 private static uint nextXferID = 5000;
55 private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]"; 51 private static Random randomClass = new Random();
56 // Get a list of invalid file characters (OS dependent) 52 // Get a list of invalid file characters (OS dependent)
57 private static string regexInvalidFileChars = "[" + new String(Path.GetInvalidFileNameChars()) + "]"; 53 private static string regexInvalidFileChars = "[" + new String(Path.GetInvalidFileNameChars()) + "]";
54 private static string regexInvalidPathChars = "[" + new String(Path.GetInvalidPathChars()) + "]";
55 private static object XferLock = new object();
58 56
59 #region Vector Equasions 57 #region Vector Equasions
58
60 /// <summary> 59 /// <summary>
61 /// Get the distance between two 3d vectors 60 /// Get the distance between two 3d vectors
62 /// </summary> 61 /// </summary>
@@ -92,7 +91,7 @@ namespace OpenSim.Framework
92 if (IsZeroVector(a)) 91 if (IsZeroVector(a))
93 throw new ArgumentException("Vector paramater cannot be a zero vector."); 92 throw new ArgumentException("Vector paramater cannot be a zero vector.");
94 93
95 float Mag = (float)GetMagnitude(a); 94 float Mag = (float) GetMagnitude(a);
96 return new LLVector3(a.X / Mag, a.Y / Mag, a.Z / Mag); 95 return new LLVector3(a.X / Mag, a.Y / Mag, a.Z / Mag);
97 } 96 }
98 97
@@ -112,9 +111,8 @@ namespace OpenSim.Framework
112 111
113 # endregion 112 # endregion
114 113
115 public static ulong UIntsToLong(uint X, uint Y) 114 public Util()
116 { 115 {
117 return Helpers.UIntsToLong(X, Y);
118 } 116 }
119 117
120 public static Random RandomClass 118 public static Random RandomClass
@@ -122,6 +120,11 @@ namespace OpenSim.Framework
122 get { return randomClass; } 120 get { return randomClass; }
123 } 121 }
124 122
123 public static ulong UIntsToLong(uint X, uint Y)
124 {
125 return Helpers.UIntsToLong(X, Y);
126 }
127
125 public static uint GetNextXferID() 128 public static uint GetNextXferID()
126 { 129 {
127 uint id = 0; 130 uint id = 0;
@@ -133,10 +136,6 @@ namespace OpenSim.Framework
133 return id; 136 return id;
134 } 137 }
135 138
136 public Util()
137 {
138 }
139
140 public static string GetFileName(string file) 139 public static string GetFileName(string file)
141 { 140 {
142 // Return just the filename on UNIX platforms 141 // Return just the filename on UNIX platforms
@@ -199,7 +198,7 @@ namespace OpenSim.Framework
199 public static int ToUnixTime(DateTime stamp) 198 public static int ToUnixTime(DateTime stamp)
200 { 199 {
201 TimeSpan t = (stamp.ToUniversalTime() - Convert.ToDateTime("1/1/1970 8:00:00 AM")); 200 TimeSpan t = (stamp.ToUniversalTime() - Convert.ToDateTime("1/1/1970 8:00:00 AM"));
202 return (int)t.TotalSeconds; 201 return (int) t.TotalSeconds;
203 } 202 }
204 203
205 public static DateTime ToDateTime(ulong seconds) 204 public static DateTime ToDateTime(ulong seconds)
@@ -309,7 +308,7 @@ namespace OpenSim.Framework
309 for (int j = 0; j < 16 && (i + j) < bytes.Length; j++) 308 for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
310 { 309 {
311 if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E) 310 if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
312 output.Append((char)bytes[i + j]); 311 output.Append((char) bytes[i + j]);
313 else 312 else
314 output.Append("."); 313 output.Append(".");
315 } 314 }
@@ -332,7 +331,7 @@ namespace OpenSim.Framework
332 return ipa; 331 return ipa;
333 332
334 IPAddress[] hosts = null; 333 IPAddress[] hosts = null;
335 334
336 // Not an IP, lookup required 335 // Not an IP, lookup required
337 try 336 try
338 { 337 {
@@ -341,7 +340,7 @@ namespace OpenSim.Framework
341 catch (Exception e) 340 catch (Exception e)
342 { 341 {
343 m_log.ErrorFormat("[UTIL]: An error occurred while resolving {0}, {1}", dnsAddress, e); 342 m_log.ErrorFormat("[UTIL]: An error occurred while resolving {0}, {1}", dnsAddress, e);
344 343
345 // Still going to throw the exception on for now, since this was what was happening in the first place 344 // Still going to throw the exception on for now, since this was what was happening in the first place
346 throw e; 345 throw e;
347 } 346 }
@@ -397,7 +396,8 @@ namespace OpenSim.Framework
397 /// <returns>safe filename</returns> 396 /// <returns>safe filename</returns>
398 public static string safeFileName(string filename) 397 public static string safeFileName(string filename)
399 { 398 {
400 return Regex.Replace(filename, @regexInvalidFileChars, string.Empty); ; 399 return Regex.Replace(filename, @regexInvalidFileChars, string.Empty);
400 ;
401 } 401 }
402 402
403 // 403 //
@@ -454,10 +454,10 @@ namespace OpenSim.Framework
454 454
455 public static void AddDataRowToConfig(IConfigSource config, DataRow row) 455 public static void AddDataRowToConfig(IConfigSource config, DataRow row)
456 { 456 {
457 config.Configs.Add((string)row[0]); 457 config.Configs.Add((string) row[0]);
458 for (int i = 0; i < row.Table.Columns.Count; i++) 458 for (int i = 0; i < row.Table.Columns.Count; i++)
459 { 459 {
460 config.Configs[(string)row[0]].Set(row.Table.Columns[i].ColumnName, row[i]); 460 config.Configs[(string) row[0]].Set(row.Table.Columns[i].ColumnName, row[i]);
461 } 461 }
462 } 462 }
463 463
@@ -594,19 +594,19 @@ namespace OpenSim.Framework
594 returnstring[2] = "127"; 594 returnstring[2] = "127";
595 returnstring[3] = "0"; 595 returnstring[3] = "0";
596 // This is the crappy way of doing it. 596 // This is the crappy way of doing it.
597 597
598 if (startLocationRequest.Contains(":") && startLocationRequest.Contains("&")) 598 if (startLocationRequest.Contains(":") && startLocationRequest.Contains("&"))
599 { 599 {
600 //System.Console.WriteLine("StartLocationRequest Contains proper elements"); 600 //System.Console.WriteLine("StartLocationRequest Contains proper elements");
601 601
602 string[] splitstr = startLocationRequest.Split(':');//,2,StringSplitOptions.RemoveEmptyEntries); 602 string[] splitstr = startLocationRequest.Split(':'); //,2,StringSplitOptions.RemoveEmptyEntries);
603 603
604 //System.Console.WriteLine("Found " + splitstr.GetLength(0) + " elements in 1st split result"); 604 //System.Console.WriteLine("Found " + splitstr.GetLength(0) + " elements in 1st split result");
605 605
606 if (splitstr.GetLength(0) == 2) 606 if (splitstr.GetLength(0) == 2)
607 { 607 {
608 string[] splitstr2 = splitstr[1].Split('&');//, 4, StringSplitOptions.RemoveEmptyEntries); 608 string[] splitstr2 = splitstr[1].Split('&'); //, 4, StringSplitOptions.RemoveEmptyEntries);
609 609
610 //System.Console.WriteLine("Found " + splitstr2.GetLength(0) + " elements in 2nd split result"); 610 //System.Console.WriteLine("Found " + splitstr2.GetLength(0) + " elements in 2nd split result");
611 611
612 int len = Math.Min(splitstr2.GetLength(0), 4); 612 int len = Math.Min(splitstr2.GetLength(0), 4);
@@ -622,17 +622,16 @@ namespace OpenSim.Framework
622 } 622 }
623 return returnstring; 623 return returnstring;
624 } 624 }
625 625
626 static public XmlRpcResponse XmlRpcCommand(string url, string methodName, params object[] args) 626 public static XmlRpcResponse XmlRpcCommand(string url, string methodName, params object[] args)
627 { 627 {
628 return SendXmlRpcCommand(url, methodName, args); 628 return SendXmlRpcCommand(url, methodName, args);
629 } 629 }
630 630
631 static public XmlRpcResponse SendXmlRpcCommand(string url, string methodName, object[] args) 631 public static XmlRpcResponse SendXmlRpcCommand(string url, string methodName, object[] args)
632 { 632 {
633 XmlRpcRequest client = new XmlRpcRequest(methodName, args); 633 XmlRpcRequest client = new XmlRpcRequest(methodName, args);
634 return client.Send(url, 6000); 634 return client.Send(url, 6000);
635 } 635 }
636
637 } 636 }
638} 637} \ No newline at end of file
diff --git a/OpenSim/Framework/sLLVector3.cs b/OpenSim/Framework/sLLVector3.cs
index dca94b5..c0bafb2 100644
--- a/OpenSim/Framework/sLLVector3.cs
+++ b/OpenSim/Framework/sLLVector3.cs
@@ -33,6 +33,10 @@ namespace OpenSim.Framework
33 [Serializable] 33 [Serializable]
34 public class sLLVector3 34 public class sLLVector3
35 { 35 {
36 public float x = 0;
37 public float y = 0;
38 public float z = 0;
39
36 public sLLVector3() 40 public sLLVector3()
37 { 41 {
38 } 42 }
@@ -43,9 +47,5 @@ namespace OpenSim.Framework
43 y = v.Y; 47 y = v.Y;
44 z = v.Z; 48 z = v.Z;
45 } 49 }
46
47 public float x=0;
48 public float y=0;
49 public float z=0;
50 } 50 }
51} 51} \ No newline at end of file
generated by cgit v1.1 at 2024-11-09 06:28:30 +0000