aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/General')
-rw-r--r--OpenSim/Framework/General/ACL.cs22
-rw-r--r--OpenSim/Framework/General/AgentCircuitManager.cs35
-rw-r--r--OpenSim/Framework/General/AgentCiruitData.cs11
-rw-r--r--OpenSim/Framework/General/AgentInventory.cs71
-rw-r--r--OpenSim/Framework/General/AgentWearable.cs5
-rw-r--r--OpenSim/Framework/General/AssetBase.cs3
-rw-r--r--OpenSim/Framework/General/AssetConfig.cs26
-rw-r--r--OpenSim/Framework/General/AssetLandmark.cs16
-rw-r--r--OpenSim/Framework/General/AssetStorage.cs29
-rw-r--r--OpenSim/Framework/General/AuthenticateResponse.cs6
-rw-r--r--OpenSim/Framework/General/BlockingQueue.cs2
-rw-r--r--OpenSim/Framework/General/ClientManager.cs22
-rw-r--r--OpenSim/Framework/General/ConfigurationMember.cs110
-rw-r--r--OpenSim/Framework/General/ConfigurationOption.cs10
-rw-r--r--OpenSim/Framework/General/Culture.cs16
-rw-r--r--OpenSim/Framework/General/EstateSettings.cs428
-rw-r--r--OpenSim/Framework/General/GridConfig.cs73
-rw-r--r--OpenSim/Framework/General/IAssetProvider.cs8
-rw-r--r--OpenSim/Framework/General/IAssetServer.cs4
-rw-r--r--OpenSim/Framework/General/IClientAPI.cs179
-rw-r--r--OpenSim/Framework/General/IGenericConfig.cs2
-rw-r--r--OpenSim/Framework/General/IPlugin.cs6
-rw-r--r--OpenSim/Framework/General/IRegionCommsListener.cs7
-rw-r--r--OpenSim/Framework/General/IScene.cs10
-rw-r--r--OpenSim/Framework/General/IUserData.cs3
-rw-r--r--OpenSim/Framework/General/IUserService.cs1
-rw-r--r--OpenSim/Framework/General/InventoryItemBase.cs19
-rw-r--r--OpenSim/Framework/General/LandData.cs169
-rw-r--r--OpenSim/Framework/General/Login.cs4
-rw-r--r--OpenSim/Framework/General/MapBlockData.cs3
-rw-r--r--OpenSim/Framework/General/NeighbourInfo.cs2
-rw-r--r--OpenSim/Framework/General/NetworkServersInfo.cs22
-rw-r--r--OpenSim/Framework/General/PrimitiveBaseShape.cs42
-rw-r--r--OpenSim/Framework/General/Properties/AssemblyInfo.cs31
-rw-r--r--OpenSim/Framework/General/RegionCommsListener.cs16
-rw-r--r--OpenSim/Framework/General/RegionHandle.cs33
-rw-r--r--OpenSim/Framework/General/RegionInfo.cs187
-rw-r--r--OpenSim/Framework/General/Remoting.cs9
-rw-r--r--OpenSim/Framework/General/UUID.cs6
-rw-r--r--OpenSim/Framework/General/UserConfig.cs43
-rw-r--r--OpenSim/Framework/General/UserProfileData.cs31
-rw-r--r--OpenSim/Framework/General/Util.cs61
42 files changed, 920 insertions, 863 deletions
diff --git a/OpenSim/Framework/General/ACL.cs b/OpenSim/Framework/General/ACL.cs
index 348f0ae..0e9df19 100644
--- a/OpenSim/Framework/General/ACL.cs
+++ b/OpenSim/Framework/General/ACL.cs
@@ -27,7 +27,6 @@
27*/ 27*/
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text;
31 30
32namespace OpenSim.Framework 31namespace OpenSim.Framework
33{ 32{
@@ -37,15 +36,15 @@ namespace OpenSim.Framework
37 // permissions rather than just the first. Deny permissions will 36 // permissions rather than just the first. Deny permissions will
38 // override all others. 37 // override all others.
39 38
40
41 #region ACL Core Class 39 #region ACL Core Class
40
42 /// <summary> 41 /// <summary>
43 /// Access Control List Engine 42 /// Access Control List Engine
44 /// </summary> 43 /// </summary>
45 public class ACL 44 public class ACL
46 { 45 {
47 Dictionary<string, Role> Roles = new Dictionary<string, Role>(); 46 private Dictionary<string, Role> Roles = new Dictionary<string, Role>();
48 Dictionary<string, Resource> Resources = new Dictionary<string, Resource>(); 47 private Dictionary<string, Resource> Resources = new Dictionary<string, Resource>();
49 48
50 public ACL AddRole(Role role) 49 public ACL AddRole(Role role)
51 { 50 {
@@ -114,9 +113,11 @@ namespace OpenSim.Framework
114 return this; 113 return this;
115 } 114 }
116 } 115 }
116
117 #endregion 117 #endregion
118 118
119 #region Exceptions 119 #region Exceptions
120
120 /// <summary> 121 /// <summary>
121 /// Thrown when an ACL attempts to add a duplicate role. 122 /// Thrown when an ACL attempts to add a duplicate role.
122 /// </summary> 123 /// </summary>
@@ -139,6 +140,7 @@ namespace OpenSim.Framework
139 return "This ACL already contains a role called '" + m_role.Name + "'."; 140 return "This ACL already contains a role called '" + m_role.Name + "'.";
140 } 141 }
141 } 142 }
143
142 #endregion 144 #endregion
143 145
144 #region Roles and Resources 146 #region Roles and Resources
@@ -146,7 +148,12 @@ namespace OpenSim.Framework
146 /// <summary> 148 /// <summary>
147 /// Does this Role have permission to access a specified Resource? 149 /// Does this Role have permission to access a specified Resource?
148 /// </summary> 150 /// </summary>
149 public enum Permission { Deny, None, Allow }; 151 public enum Permission
152 {
153 Deny,
154 None,
155 Allow
156 } ;
150 157
151 /// <summary> 158 /// <summary>
152 /// A role class, for use with Users or Groups 159 /// A role class, for use with Users or Groups
@@ -227,7 +234,7 @@ namespace OpenSim.Framework
227 234
228 #region Tests 235 #region Tests
229 236
230 class ACLTester 237 internal class ACLTester
231 { 238 {
232 public ACLTester() 239 public ACLTester()
233 { 240 {
@@ -249,9 +256,8 @@ namespace OpenSim.Framework
249 acl.GrantPermission("Guests", "CanBuild"); 256 acl.GrantPermission("Guests", "CanBuild");
250 257
251 acl.HasPermission("JoeGuest", "CanBuild"); 258 acl.HasPermission("JoeGuest", "CanBuild");
252
253 } 259 }
254 } 260 }
255 261
256 #endregion 262 #endregion
257} 263} \ No newline at end of file
diff --git a/OpenSim/Framework/General/AgentCircuitManager.cs b/OpenSim/Framework/General/AgentCircuitManager.cs
index 578cc67..3658feb 100644
--- a/OpenSim/Framework/General/AgentCircuitManager.cs
+++ b/OpenSim/Framework/General/AgentCircuitManager.cs
@@ -27,8 +27,6 @@
27*/ 27*/
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework.Interfaces;
31using OpenSim.Framework;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
34{ 32{
@@ -38,15 +36,14 @@ namespace OpenSim.Framework
38 36
39 public AgentCircuitManager() 37 public AgentCircuitManager()
40 { 38 {
41
42 } 39 }
43 40
44 public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode) 41 public virtual AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)
45 { 42 {
46 AgentCircuitData validcircuit = null; 43 AgentCircuitData validcircuit = null;
47 if (this.AgentCircuits.ContainsKey(circuitcode)) 44 if (AgentCircuits.ContainsKey(circuitcode))
48 { 45 {
49 validcircuit = this.AgentCircuits[circuitcode]; 46 validcircuit = AgentCircuits[circuitcode];
50 } 47 }
51 AuthenticateResponse user = new AuthenticateResponse(); 48 AuthenticateResponse user = new AuthenticateResponse();
52 if (validcircuit == null) 49 if (validcircuit == null)
@@ -79,50 +76,50 @@ namespace OpenSim.Framework
79 76
80 public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData) 77 public virtual void AddNewCircuit(uint circuitCode, AgentCircuitData agentData)
81 { 78 {
82 if (this.AgentCircuits.ContainsKey(circuitCode)) 79 if (AgentCircuits.ContainsKey(circuitCode))
83 { 80 {
84 this.AgentCircuits[circuitCode] = agentData; 81 AgentCircuits[circuitCode] = agentData;
85 } 82 }
86 else 83 else
87 { 84 {
88 this.AgentCircuits.Add(circuitCode, agentData); 85 AgentCircuits.Add(circuitCode, agentData);
89 } 86 }
90 } 87 }
91 88
92 public LLVector3 GetPosition(uint circuitCode) 89 public LLVector3 GetPosition(uint circuitCode)
93 { 90 {
94 LLVector3 vec = new LLVector3(); 91 LLVector3 vec = new LLVector3();
95 if (this.AgentCircuits.ContainsKey(circuitCode)) 92 if (AgentCircuits.ContainsKey(circuitCode))
96 { 93 {
97 vec = this.AgentCircuits[circuitCode].startpos; 94 vec = AgentCircuits[circuitCode].startpos;
98 } 95 }
99 return vec; 96 return vec;
100 } 97 }
101 98
102 public void UpdateAgentData(AgentCircuitData agentData) 99 public void UpdateAgentData(AgentCircuitData agentData)
103 { 100 {
104 if (this.AgentCircuits.ContainsKey((uint)agentData.circuitcode)) 101 if (AgentCircuits.ContainsKey((uint) agentData.circuitcode))
105 { 102 {
106 this.AgentCircuits[(uint)agentData.circuitcode].firstname = agentData.firstname; 103 AgentCircuits[(uint) agentData.circuitcode].firstname = agentData.firstname;
107 this.AgentCircuits[(uint)agentData.circuitcode].lastname = agentData.lastname; 104 AgentCircuits[(uint) agentData.circuitcode].lastname = agentData.lastname;
108 this.AgentCircuits[(uint)agentData.circuitcode].startpos = agentData.startpos; 105 AgentCircuits[(uint) agentData.circuitcode].startpos = agentData.startpos;
109 // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z); 106 // Console.WriteLine("update user start pos is " + agentData.startpos.X + " , " + agentData.startpos.Y + " , " + agentData.startpos.Z);
110 } 107 }
111 } 108 }
112 109
113 public void UpdateAgentChildStatus(uint circuitcode, bool childstatus) 110 public void UpdateAgentChildStatus(uint circuitcode, bool childstatus)
114 { 111 {
115 if (this.AgentCircuits.ContainsKey(circuitcode)) 112 if (AgentCircuits.ContainsKey(circuitcode))
116 { 113 {
117 this.AgentCircuits[circuitcode].child = childstatus; 114 AgentCircuits[circuitcode].child = childstatus;
118 } 115 }
119 } 116 }
120 117
121 public bool GetAgentChildStatus(uint circuitcode) 118 public bool GetAgentChildStatus(uint circuitcode)
122 { 119 {
123 if (this.AgentCircuits.ContainsKey(circuitcode)) 120 if (AgentCircuits.ContainsKey(circuitcode))
124 { 121 {
125 return this.AgentCircuits[circuitcode].child; 122 return AgentCircuits[circuitcode].child;
126 } 123 }
127 return false; 124 return false;
128 } 125 }
diff --git a/OpenSim/Framework/General/AgentCiruitData.cs b/OpenSim/Framework/General/AgentCiruitData.cs
index 0924d36..95cac60 100644
--- a/OpenSim/Framework/General/AgentCiruitData.cs
+++ b/OpenSim/Framework/General/AgentCiruitData.cs
@@ -25,15 +25,18 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using libsecondlife;
29using System; 28using System;
29using libsecondlife;
30 30
31namespace OpenSim.Framework 31namespace OpenSim.Framework
32{ 32{
33 [Serializable] 33 [Serializable]
34 public class AgentCircuitData 34 public class AgentCircuitData
35 { 35 {
36 public AgentCircuitData() { } 36 public AgentCircuitData()
37 {
38 }
39
37 public LLUUID AgentID; 40 public LLUUID AgentID;
38 public LLUUID SessionID; 41 public LLUUID SessionID;
39 public LLUUID SecureSessionID; 42 public LLUUID SecureSessionID;
@@ -44,6 +47,6 @@ namespace OpenSim.Framework
44 public bool child; 47 public bool child;
45 public LLUUID InventoryFolder; 48 public LLUUID InventoryFolder;
46 public LLUUID BaseFolder; 49 public LLUUID BaseFolder;
47 public string CapsPath = ""; 50 public string CapsPath = "";
48 } 51 }
49} 52} \ No newline at end of file
diff --git a/OpenSim/Framework/General/AgentInventory.cs b/OpenSim/Framework/General/AgentInventory.cs
index cf110cb..7a1174a 100644
--- a/OpenSim/Framework/General/AgentInventory.cs
+++ b/OpenSim/Framework/General/AgentInventory.cs
@@ -28,8 +28,6 @@
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30using libsecondlife.Packets; 30using libsecondlife.Packets;
31using OpenSim.Framework;
32
33 31
34namespace OpenSim.Framework 32namespace OpenSim.Framework
35{ 33{
@@ -39,7 +37,7 @@ namespace OpenSim.Framework
39 public Dictionary<LLUUID, InventoryFolder> InventoryFolders; 37 public Dictionary<LLUUID, InventoryFolder> InventoryFolders;
40 public Dictionary<LLUUID, InventoryItem> InventoryItems; 38 public Dictionary<LLUUID, InventoryItem> InventoryItems;
41 public InventoryFolder InventoryRoot; 39 public InventoryFolder InventoryRoot;
42 public int LastCached; //maybe used by opensim app, time this was last stored/compared to user server 40 public int LastCached; //maybe used by opensim app, time this was last stored/compared to user server
43 public LLUUID AgentID; 41 public LLUUID AgentID;
44 public AvatarWearable[] Wearables; 42 public AvatarWearable[] Wearables;
45 43
@@ -47,12 +45,12 @@ namespace OpenSim.Framework
47 { 45 {
48 InventoryFolders = new Dictionary<LLUUID, InventoryFolder>(); 46 InventoryFolders = new Dictionary<LLUUID, InventoryFolder>();
49 InventoryItems = new Dictionary<LLUUID, InventoryItem>(); 47 InventoryItems = new Dictionary<LLUUID, InventoryItem>();
50 this.Initialise(); 48 Initialise();
51 } 49 }
52 50
53 public virtual void Initialise() 51 public virtual void Initialise()
54 { 52 {
55 Wearables = new AvatarWearable[13]; 53 Wearables = new AvatarWearable[13];
56 for (int i = 0; i < 13; i++) 54 for (int i = 0; i < 13; i++)
57 { 55 {
58 Wearables[i] = new AvatarWearable(); 56 Wearables[i] = new AvatarWearable();
@@ -63,27 +61,27 @@ namespace OpenSim.Framework
63 { 61 {
64 InventoryFolder Folder = new InventoryFolder(); 62 InventoryFolder Folder = new InventoryFolder();
65 Folder.FolderID = folderID; 63 Folder.FolderID = folderID;
66 Folder.OwnerID = this.AgentID; 64 Folder.OwnerID = AgentID;
67 Folder.DefaultType = type; 65 Folder.DefaultType = type;
68 this.InventoryFolders.Add(Folder.FolderID, Folder); 66 InventoryFolders.Add(Folder.FolderID, Folder);
69 return (true); 67 return (true);
70 } 68 }
71 69
72 public void CreateRootFolder(LLUUID newAgentID, bool createTextures) 70 public void CreateRootFolder(LLUUID newAgentID, bool createTextures)
73 { 71 {
74 this.AgentID = newAgentID; 72 AgentID = newAgentID;
75 InventoryRoot = new InventoryFolder(); 73 InventoryRoot = new InventoryFolder();
76 InventoryRoot.FolderID = LLUUID.Random(); 74 InventoryRoot.FolderID = LLUUID.Random();
77 InventoryRoot.ParentID = new LLUUID(); 75 InventoryRoot.ParentID = new LLUUID();
78 InventoryRoot.Version = 1; 76 InventoryRoot.Version = 1;
79 InventoryRoot.DefaultType = 8; 77 InventoryRoot.DefaultType = 8;
80 InventoryRoot.OwnerID = this.AgentID; 78 InventoryRoot.OwnerID = AgentID;
81 InventoryRoot.FolderName = "My Inventory"; 79 InventoryRoot.FolderName = "My Inventory";
82 InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot); 80 InventoryFolders.Add(InventoryRoot.FolderID, InventoryRoot);
83 InventoryRoot.OwnerID = this.AgentID; 81 InventoryRoot.OwnerID = AgentID;
84 if (createTextures) 82 if (createTextures)
85 { 83 {
86 this.CreateNewFolder(LLUUID.Random(), 0, "Textures", InventoryRoot.FolderID); 84 CreateNewFolder(LLUUID.Random(), 0, "Textures", InventoryRoot.FolderID);
87 } 85 }
88 } 86 }
89 87
@@ -91,32 +89,32 @@ namespace OpenSim.Framework
91 { 89 {
92 InventoryFolder Folder = new InventoryFolder(); 90 InventoryFolder Folder = new InventoryFolder();
93 Folder.FolderID = folderID; 91 Folder.FolderID = folderID;
94 Folder.OwnerID = this.AgentID; 92 Folder.OwnerID = AgentID;
95 Folder.DefaultType = type; 93 Folder.DefaultType = type;
96 Folder.FolderName = folderName; 94 Folder.FolderName = folderName;
97 this.InventoryFolders.Add(Folder.FolderID, Folder); 95 InventoryFolders.Add(Folder.FolderID, Folder);
98 return (true); 96 return (true);
99 } 97 }
100 98
101 public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parentID) 99 public bool CreateNewFolder(LLUUID folderID, ushort type, string folderName, LLUUID parentID)
102 { 100 {
103 if (!this.InventoryFolders.ContainsKey(folderID)) 101 if (!InventoryFolders.ContainsKey(folderID))
104 { 102 {
105 System.Console.WriteLine("creating new folder called " + folderName + " in agents inventory"); 103 System.Console.WriteLine("creating new folder called " + folderName + " in agents inventory");
106 InventoryFolder Folder = new InventoryFolder(); 104 InventoryFolder Folder = new InventoryFolder();
107 Folder.FolderID = folderID; 105 Folder.FolderID = folderID;
108 Folder.OwnerID = this.AgentID; 106 Folder.OwnerID = AgentID;
109 Folder.DefaultType = type; 107 Folder.DefaultType = type;
110 Folder.FolderName = folderName; 108 Folder.FolderName = folderName;
111 Folder.ParentID = parentID; 109 Folder.ParentID = parentID;
112 this.InventoryFolders.Add(Folder.FolderID, Folder); 110 InventoryFolders.Add(Folder.FolderID, Folder);
113 } 111 }
114 return (true); 112 return (true);
115 } 113 }
116 114
117 public bool HasFolder(LLUUID folderID) 115 public bool HasFolder(LLUUID folderID)
118 { 116 {
119 if (this.InventoryFolders.ContainsKey(folderID)) 117 if (InventoryFolders.ContainsKey(folderID))
120 { 118 {
121 return true; 119 return true;
122 } 120 }
@@ -125,7 +123,7 @@ namespace OpenSim.Framework
125 123
126 public LLUUID GetFolderID(string folderName) 124 public LLUUID GetFolderID(string folderName)
127 { 125 {
128 foreach (InventoryFolder inv in this.InventoryFolders.Values) 126 foreach (InventoryFolder inv in InventoryFolders.Values)
129 { 127 {
130 if (inv.FolderName == folderName) 128 if (inv.FolderName == folderName)
131 { 129 {
@@ -137,11 +135,12 @@ namespace OpenSim.Framework
137 135
138 public bool UpdateItemAsset(LLUUID itemID, AssetBase asset) 136 public bool UpdateItemAsset(LLUUID itemID, AssetBase asset)
139 { 137 {
140 if(this.InventoryItems.ContainsKey(itemID)) 138 if (InventoryItems.ContainsKey(itemID))
141 { 139 {
142 InventoryItem Item = this.InventoryItems[itemID]; 140 InventoryItem Item = InventoryItems[itemID];
143 Item.AssetID = asset.FullID; 141 Item.AssetID = asset.FullID;
144 System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() + " so it now is set to asset " + asset.FullID.ToStringHyphenated()); 142 System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated() +
143 " so it now is set to asset " + asset.FullID.ToStringHyphenated());
145 //TODO need to update the rest of the info 144 //TODO need to update the rest of the info
146 } 145 }
147 return true; 146 return true;
@@ -150,10 +149,10 @@ namespace OpenSim.Framework
150 public bool UpdateItemDetails(LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet) 149 public bool UpdateItemDetails(LLUUID itemID, UpdateInventoryItemPacket.InventoryDataBlock packet)
151 { 150 {
152 System.Console.WriteLine("updating inventory item details"); 151 System.Console.WriteLine("updating inventory item details");
153 if (this.InventoryItems.ContainsKey(itemID)) 152 if (InventoryItems.ContainsKey(itemID))
154 { 153 {
155 System.Console.WriteLine("changing name to "+ Util.FieldToString(packet.Name)); 154 System.Console.WriteLine("changing name to " + Util.FieldToString(packet.Name));
156 InventoryItem Item = this.InventoryItems[itemID]; 155 InventoryItem Item = InventoryItems[itemID];
157 Item.Name = Util.FieldToString(packet.Name); 156 Item.Name = Util.FieldToString(packet.Name);
158 System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated()); 157 System.Console.WriteLine("updated inventory item " + itemID.ToStringHyphenated());
159 //TODO need to update the rest of the info 158 //TODO need to update the rest of the info
@@ -163,7 +162,7 @@ namespace OpenSim.Framework
163 162
164 public LLUUID AddToInventory(LLUUID folderID, AssetBase asset) 163 public LLUUID AddToInventory(LLUUID folderID, AssetBase asset)
165 { 164 {
166 if (this.InventoryFolders.ContainsKey(folderID)) 165 if (InventoryFolders.ContainsKey(folderID))
167 { 166 {
168 LLUUID NewItemID = LLUUID.Random(); 167 LLUUID NewItemID = LLUUID.Random();
169 168
@@ -176,7 +175,7 @@ namespace OpenSim.Framework
176 Item.Name = asset.Name; 175 Item.Name = asset.Name;
177 Item.Description = asset.Description; 176 Item.Description = asset.Description;
178 Item.InvType = asset.InvType; 177 Item.InvType = asset.InvType;
179 this.InventoryItems.Add(Item.ItemID, Item); 178 InventoryItems.Add(Item.ItemID, Item);
180 InventoryFolder Folder = InventoryFolders[Item.FolderID]; 179 InventoryFolder Folder = InventoryFolders[Item.FolderID];
181 Folder.Items.Add(Item); 180 Folder.Items.Add(Item);
182 return (Item.ItemID); 181 return (Item.ItemID);
@@ -190,10 +189,10 @@ namespace OpenSim.Framework
190 public bool DeleteFromInventory(LLUUID itemID) 189 public bool DeleteFromInventory(LLUUID itemID)
191 { 190 {
192 bool res = false; 191 bool res = false;
193 if (this.InventoryItems.ContainsKey(itemID)) 192 if (InventoryItems.ContainsKey(itemID))
194 { 193 {
195 InventoryItem item = this.InventoryItems[itemID]; 194 InventoryItem item = InventoryItems[itemID];
196 this.InventoryItems.Remove(itemID); 195 InventoryItems.Remove(itemID);
197 foreach (InventoryFolder fold in InventoryFolders.Values) 196 foreach (InventoryFolder fold in InventoryFolders.Values)
198 { 197 {
199 if (fold.Items.Contains(item)) 198 if (fold.Items.Contains(item))
@@ -203,7 +202,6 @@ namespace OpenSim.Framework
203 } 202 }
204 } 203 }
205 res = true; 204 res = true;
206
207 } 205 }
208 return res; 206 return res;
209 } 207 }
@@ -225,7 +223,6 @@ namespace OpenSim.Framework
225 Items = new List<InventoryItem>(); 223 Items = new List<InventoryItem>();
226 //Subfolders = new List<InventoryFolder>(); 224 //Subfolders = new List<InventoryFolder>();
227 } 225 }
228
229 } 226 }
230 227
231 public class InventoryItem 228 public class InventoryItem
@@ -237,12 +234,12 @@ namespace OpenSim.Framework
237 public LLUUID CreatorID; 234 public LLUUID CreatorID;
238 public sbyte InvType; 235 public sbyte InvType;
239 public sbyte Type; 236 public sbyte Type;
240 public string Name =""; 237 public string Name = "";
241 public string Description; 238 public string Description;
242 239
243 public InventoryItem() 240 public InventoryItem()
244 { 241 {
245 this.CreatorID = LLUUID.Zero; 242 CreatorID = LLUUID.Zero;
246 } 243 }
247 244
248 public string ExportString() 245 public string ExportString()
@@ -251,11 +248,11 @@ namespace OpenSim.Framework
251 string result = ""; 248 string result = "";
252 result += "\tinv_object\t0\n\t{\n"; 249 result += "\tinv_object\t0\n\t{\n";
253 result += "\t\tobj_id\t%s\n"; 250 result += "\t\tobj_id\t%s\n";
254 result += "\t\tparent_id\t"+ ItemID.ToString() +"\n"; 251 result += "\t\tparent_id\t" + ItemID.ToString() + "\n";
255 result += "\t\ttype\t"+ typ +"\n"; 252 result += "\t\ttype\t" + typ + "\n";
256 result += "\t\tname\t" + Name+"|\n"; 253 result += "\t\tname\t" + Name + "|\n";
257 result += "\t}\n"; 254 result += "\t}\n";
258 return result; 255 return result;
259 } 256 }
260 } 257 }
261} 258} \ No newline at end of file
diff --git a/OpenSim/Framework/General/AgentWearable.cs b/OpenSim/Framework/General/AgentWearable.cs
index af8a630..c2d4db3 100644
--- a/OpenSim/Framework/General/AgentWearable.cs
+++ b/OpenSim/Framework/General/AgentWearable.cs
@@ -36,10 +36,9 @@ namespace OpenSim.Framework
36 36
37 public AvatarWearable() 37 public AvatarWearable()
38 { 38 {
39
40 } 39 }
41 40
42 public AvatarWearable( LLUUID itemId, LLUUID assetId ) 41 public AvatarWearable(LLUUID itemId, LLUUID assetId)
43 { 42 {
44 AssetID = assetId; 43 AssetID = assetId;
45 ItemID = itemId; 44 ItemID = itemId;
@@ -69,4 +68,4 @@ namespace OpenSim.Framework
69 } 68 }
70 } 69 }
71 } 70 }
72} 71} \ No newline at end of file
diff --git a/OpenSim/Framework/General/AssetBase.cs b/OpenSim/Framework/General/AssetBase.cs
index 9c69eb8..f0367f0 100644
--- a/OpenSim/Framework/General/AssetBase.cs
+++ b/OpenSim/Framework/General/AssetBase.cs
@@ -44,7 +44,6 @@ namespace OpenSim.Framework
44 44
45 public AssetBase() 45 public AssetBase()
46 { 46 {
47
48 } 47 }
49 48
50 public AssetBase(LLUUID assetId, string name) 49 public AssetBase(LLUUID assetId, string name)
@@ -53,4 +52,4 @@ namespace OpenSim.Framework
53 Name = name; 52 Name = name;
54 } 53 }
55 } 54 }
56} 55} \ No newline at end of file
diff --git a/OpenSim/Framework/General/AssetConfig.cs b/OpenSim/Framework/General/AssetConfig.cs
index 457369d..81cf899 100644
--- a/OpenSim/Framework/General/AssetConfig.cs
+++ b/OpenSim/Framework/General/AssetConfig.cs
@@ -26,10 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32
33namespace OpenSim.Framework 29namespace OpenSim.Framework
34{ 30{
35 /// <summary> 31 /// <summary>
@@ -48,18 +44,22 @@ namespace OpenSim.Framework
48 44
49 public AssetConfig(string description, string filename) 45 public AssetConfig(string description, string filename)
50 { 46 {
51 configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); 47 configMember =
48 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
52 configMember.performConfigurationRetrieve(); 49 configMember.performConfigurationRetrieve();
53 } 50 }
54 51
55 public void loadConfigurationOptions() 52 public void loadConfigurationOptions()
56 { 53 {
57 configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false); 54 configMember.addConfigurationOption("default_startup_message",
58 55 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
59 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 56 "Default Startup Message", "Welcome to OGS", false);
60 57
61 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false); 58 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
59 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
62 60
61 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
62 "Http Listener port", DefaultHttpPort.ToString(), false);
63 } 63 }
64 64
65 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 65 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -67,17 +67,17 @@ namespace OpenSim.Framework
67 switch (configuration_key) 67 switch (configuration_key)
68 { 68 {
69 case "default_startup_message": 69 case "default_startup_message":
70 this.DefaultStartupMsg = (string)configuration_result; 70 DefaultStartupMsg = (string) configuration_result;
71 break; 71 break;
72 case "database_provider": 72 case "database_provider":
73 this.DatabaseProvider = (string)configuration_result; 73 DatabaseProvider = (string) configuration_result;
74 break; 74 break;
75 case "http_port": 75 case "http_port":
76 HttpPort = (uint)configuration_result; 76 HttpPort = (uint) configuration_result;
77 break; 77 break;
78 } 78 }
79 79
80 return true; 80 return true;
81 } 81 }
82 } 82 }
83} 83} \ No newline at end of file
diff --git a/OpenSim/Framework/General/AssetLandmark.cs b/OpenSim/Framework/General/AssetLandmark.cs
index 9f05531..a62a85b 100644
--- a/OpenSim/Framework/General/AssetLandmark.cs
+++ b/OpenSim/Framework/General/AssetLandmark.cs
@@ -38,22 +38,22 @@ namespace OpenSim.Framework
38 38
39 public AssetLandmark(AssetBase a) 39 public AssetLandmark(AssetBase a)
40 { 40 {
41 this.Data = a.Data; 41 Data = a.Data;
42 this.FullID = a.FullID; 42 FullID = a.FullID;
43 this.Type = a.Type; 43 Type = a.Type;
44 this.InvType = a.InvType; 44 InvType = a.InvType;
45 this.Name = a.Name; 45 Name = a.Name;
46 this.Description = a.Description; 46 Description = a.Description;
47 InternData(); 47 InternData();
48 } 48 }
49 49
50 private void InternData() 50 private void InternData()
51 { 51 {
52 string temp = Encoding.UTF8.GetString(Data).Trim(); 52 string temp = Encoding.UTF8.GetString(Data).Trim();
53 string[] parts = temp.Split('\n'); 53 string[] parts = temp.Split('\n');
54 int.TryParse(parts[0].Substring(17, 1), out Version); 54 int.TryParse(parts[0].Substring(17, 1), out Version);
55 LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID); 55 LLUUID.TryParse(parts[1].Substring(10, 36), out RegionID);
56 LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position); 56 LLVector3.TryParse(parts[2].Substring(11, parts[2].Length - 11), out Position);
57 } 57 }
58 } 58 }
59} 59} \ No newline at end of file
diff --git a/OpenSim/Framework/General/AssetStorage.cs b/OpenSim/Framework/General/AssetStorage.cs
index e3193ed..b39ceeb 100644
--- a/OpenSim/Framework/General/AssetStorage.cs
+++ b/OpenSim/Framework/General/AssetStorage.cs
@@ -29,19 +29,20 @@ using libsecondlife;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 public class AssetStorage 32 public class AssetStorage
33 { 33 {
34 public AssetStorage()
35 {
36 }
34 37
35 public AssetStorage() { 38 public AssetStorage(LLUUID assetUUID)
36 } 39 {
40 UUID = assetUUID;
41 }
37 42
38 public AssetStorage(LLUUID assetUUID) { 43 public byte[] Data;
39 UUID=assetUUID; 44 public sbyte Type;
40 } 45 public string Name;
41 46 public LLUUID UUID;
42 public byte[] Data; 47 }
43 public sbyte Type; 48} \ No newline at end of file
44 public string Name;
45 public LLUUID UUID;
46 }
47}
diff --git a/OpenSim/Framework/General/AuthenticateResponse.cs b/OpenSim/Framework/General/AuthenticateResponse.cs
index 25bb0dd..0bf356e 100644
--- a/OpenSim/Framework/General/AuthenticateResponse.cs
+++ b/OpenSim/Framework/General/AuthenticateResponse.cs
@@ -25,8 +25,6 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using OpenSim.Framework;
29
30namespace OpenSim.Framework 28namespace OpenSim.Framework
31{ 29{
32 public class AuthenticateResponse 30 public class AuthenticateResponse
@@ -36,8 +34,6 @@ namespace OpenSim.Framework
36 34
37 public AuthenticateResponse() 35 public AuthenticateResponse()
38 { 36 {
39
40 } 37 }
41
42 } 38 }
43} 39} \ No newline at end of file
diff --git a/OpenSim/Framework/General/BlockingQueue.cs b/OpenSim/Framework/General/BlockingQueue.cs
index 2d59db4..006fbc8 100644
--- a/OpenSim/Framework/General/BlockingQueue.cs
+++ b/OpenSim/Framework/General/BlockingQueue.cs
@@ -55,4 +55,4 @@ namespace OpenSim.Framework
55 } 55 }
56 } 56 }
57 } 57 }
58} 58} \ No newline at end of file
diff --git a/OpenSim/Framework/General/ClientManager.cs b/OpenSim/Framework/General/ClientManager.cs
index c3b3d94..e34c051 100644
--- a/OpenSim/Framework/General/ClientManager.cs
+++ b/OpenSim/Framework/General/ClientManager.cs
@@ -26,16 +26,14 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic; 29using System.Collections.Generic;
31using System.Text;
32using libsecondlife.Packets;
33using OpenSim.Framework.Interfaces;
34using libsecondlife; 30using libsecondlife;
31using libsecondlife.Packets;
35 32
36namespace OpenSim.Framework 33namespace OpenSim.Framework
37{ 34{
38 public delegate void ForEachClientDelegate(IClientAPI client); 35 public delegate void ForEachClientDelegate(IClientAPI client);
36
39 public class ClientManager 37 public class ClientManager
40 { 38 {
41 private Dictionary<uint, IClientAPI> m_clients; 39 private Dictionary<uint, IClientAPI> m_clients;
@@ -63,7 +61,7 @@ namespace OpenSim.Framework
63 m_clients.Add(id, client); 61 m_clients.Add(id, client);
64 } 62 }
65 63
66 public void InPacket(uint circuitCode, libsecondlife.Packets.Packet packet) 64 public void InPacket(uint circuitCode, Packet packet)
67 { 65 {
68 IClientAPI client; 66 IClientAPI client;
69 67
@@ -83,10 +81,10 @@ namespace OpenSim.Framework
83 } 81 }
84 } 82 }
85 83
86 public void CloseAllCircuits( LLUUID agentId ) 84 public void CloseAllCircuits(LLUUID agentId)
87 { 85 {
88 uint[] circuits = GetAllCircuits(agentId); 86 uint[] circuits = GetAllCircuits(agentId);
89 foreach (uint circuit in circuits ) 87 foreach (uint circuit in circuits)
90 { 88 {
91 IClientAPI client; 89 IClientAPI client;
92 if (m_clients.TryGetValue(circuit, out client)) 90 if (m_clients.TryGetValue(circuit, out client))
@@ -94,7 +92,7 @@ namespace OpenSim.Framework
94 Remove(circuit); 92 Remove(circuit);
95 client.Close(); 93 client.Close();
96 } 94 }
97 } 95 }
98 } 96 }
99 97
100 private uint[] GetAllCircuits(LLUUID agentId) 98 private uint[] GetAllCircuits(LLUUID agentId)
@@ -103,16 +101,16 @@ namespace OpenSim.Framework
103 101
104 foreach (KeyValuePair<uint, IClientAPI> pair in m_clients) 102 foreach (KeyValuePair<uint, IClientAPI> pair in m_clients)
105 { 103 {
106 if( pair.Value.AgentId == agentId ) 104 if (pair.Value.AgentId == agentId)
107 { 105 {
108 circuits.Add( pair.Key ); 106 circuits.Add(pair.Key);
109 } 107 }
110 } 108 }
111 109
112 return circuits.ToArray(); 110 return circuits.ToArray();
113 } 111 }
114 112
115 113
116 public void ViewerEffectHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock) 114 public void ViewerEffectHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock)
117 { 115 {
118 ViewerEffectPacket packet = new ViewerEffectPacket(); 116 ViewerEffectPacket packet = new ViewerEffectPacket();
@@ -134,4 +132,4 @@ namespace OpenSim.Framework
134 return m_clients.TryGetValue(circuitId, out user); 132 return m_clients.TryGetValue(circuitId, out user);
135 } 133 }
136 } 134 }
137} 135} \ No newline at end of file
diff --git a/OpenSim/Framework/General/ConfigurationMember.cs b/OpenSim/Framework/General/ConfigurationMember.cs
index c71982a..5883d73 100644
--- a/OpenSim/Framework/General/ConfigurationMember.cs
+++ b/OpenSim/Framework/General/ConfigurationMember.cs
@@ -27,22 +27,19 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Reflection;
31using System.Collections;
32using System.Collections.Generic; 30using System.Collections.Generic;
33using System.Text; 31using System.Globalization;
34using System.Net; 32using System.Net;
35 33using System.Reflection;
36using libsecondlife; 34using libsecondlife;
37
38using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
39using System.Globalization;
40 36
41namespace OpenSim.Framework 37namespace OpenSim.Framework
42{ 38{
43 public class ConfigurationMember 39 public class ConfigurationMember
44 { 40 {
45 public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result); 41 public delegate bool ConfigurationOptionResult(string configuration_key, object configuration_result);
42
46 public delegate void ConfigurationOptionsLoad(); 43 public delegate void ConfigurationOptionsLoad();
47 44
48 private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>(); 45 private List<ConfigurationOption> configurationOptions = new List<ConfigurationOption>();
@@ -53,22 +50,26 @@ namespace OpenSim.Framework
53 private ConfigurationOptionResult resultFunction; 50 private ConfigurationOptionResult resultFunction;
54 51
55 private IGenericConfig configurationPlugin = null; 52 private IGenericConfig configurationPlugin = null;
53
56 /// <summary> 54 /// <summary>
57 /// This is the default configuration DLL loaded 55 /// This is the default configuration DLL loaded
58 /// </summary> 56 /// </summary>
59 private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll"; 57 private string configurationPluginFilename = "OpenSim.Framework.Configuration.XML.dll";
60 public ConfigurationMember(string configuration_filename, string configuration_description, ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function) 58
59 public ConfigurationMember(string configuration_filename, string configuration_description,
60 ConfigurationOptionsLoad load_function, ConfigurationOptionResult result_function)
61 { 61 {
62 this.configurationFilename = configuration_filename; 62 configurationFilename = configuration_filename;
63 this.configurationDescription = configuration_description; 63 configurationDescription = configuration_description;
64 this.loadFunction = load_function; 64 loadFunction = load_function;
65 this.resultFunction = result_function; 65 resultFunction = result_function;
66 } 66 }
67 67
68 public void setConfigurationFilename(string filename) 68 public void setConfigurationFilename(string filename)
69 { 69 {
70 configurationFilename = filename; 70 configurationFilename = filename;
71 } 71 }
72
72 public void setConfigurationDescription(string desc) 73 public void setConfigurationDescription(string desc)
73 { 74 {
74 configurationDescription = desc; 75 configurationDescription = desc;
@@ -83,7 +84,11 @@ namespace OpenSim.Framework
83 { 84 {
84 configurationPluginFilename = dll_filename; 85 configurationPluginFilename = dll_filename;
85 } 86 }
86 public void addConfigurationOption(string configuration_key, ConfigurationOption.ConfigurationTypes configuration_type, string configuration_question, string configuration_default, bool use_default_no_prompt) 87
88 public void addConfigurationOption(string configuration_key,
89 ConfigurationOption.ConfigurationTypes configuration_type,
90 string configuration_question, string configuration_default,
91 bool use_default_no_prompt)
87 { 92 {
88 ConfigurationOption configOption = new ConfigurationOption(); 93 ConfigurationOption configOption = new ConfigurationOption();
89 configOption.configurationKey = configuration_key; 94 configOption.configurationKey = configuration_key;
@@ -92,7 +97,8 @@ namespace OpenSim.Framework
92 configOption.configurationType = configuration_type; 97 configOption.configurationType = configuration_type;
93 configOption.configurationUseDefaultNoPrompt = use_default_no_prompt; 98 configOption.configurationUseDefaultNoPrompt = use_default_no_prompt;
94 99
95 if ((configuration_key != "" && configuration_question != "") || (configuration_key != "" && use_default_no_prompt)) 100 if ((configuration_key != "" && configuration_question != "") ||
101 (configuration_key != "" && use_default_no_prompt))
96 { 102 {
97 if (!configurationOptions.Contains(configOption)) 103 if (!configurationOptions.Contains(configOption))
98 { 104 {
@@ -101,32 +107,37 @@ namespace OpenSim.Framework
101 } 107 }
102 else 108 else
103 { 109 {
104 MainLog.Instance.Notice("Required fields for adding a configuration option is invalid. Will not add this option (" + configuration_key + ")"); 110 MainLog.Instance.Notice(
111 "Required fields for adding a configuration option is invalid. Will not add this option (" +
112 configuration_key + ")");
105 } 113 }
106 } 114 }
107 115
108 public void performConfigurationRetrieve() 116 public void performConfigurationRetrieve()
109 { 117 {
110 configurationPlugin = this.LoadConfigDll(configurationPluginFilename); 118 configurationPlugin = LoadConfigDll(configurationPluginFilename);
111 configurationOptions.Clear(); 119 configurationOptions.Clear();
112 if(loadFunction == null) 120 if (loadFunction == null)
113 { 121 {
114 MainLog.Instance.Error("Load Function for '" + this.configurationDescription + "' is null. Refusing to run configuration."); 122 MainLog.Instance.Error("Load Function for '" + configurationDescription +
123 "' is null. Refusing to run configuration.");
115 return; 124 return;
116 } 125 }
117 126
118 if(resultFunction == null) 127 if (resultFunction == null)
119 { 128 {
120 MainLog.Instance.Error("Result Function for '" + this.configurationDescription + "' is null. Refusing to run configuration."); 129 MainLog.Instance.Error("Result Function for '" + configurationDescription +
130 "' is null. Refusing to run configuration.");
121 return; 131 return;
122 } 132 }
123 133
124 MainLog.Instance.Verbose("Calling Configuration Load Function..."); 134 MainLog.Instance.Verbose("Calling Configuration Load Function...");
125 this.loadFunction(); 135 loadFunction();
126 136
127 if(configurationOptions.Count <= 0) 137 if (configurationOptions.Count <= 0)
128 { 138 {
129 MainLog.Instance.Error("No configuration options were specified for '" + this.configurationOptions + "'. Refusing to continue configuration."); 139 MainLog.Instance.Error("No configuration options were specified for '" + configurationOptions +
140 "'. Refusing to continue configuration.");
130 return; 141 return;
131 } 142 }
132 143
@@ -157,7 +168,6 @@ namespace OpenSim.Framework
157 bool ignoreNextFromConfig = false; 168 bool ignoreNextFromConfig = false;
158 while (convertSuccess == false) 169 while (convertSuccess == false)
159 { 170 {
160
161 string console_result = ""; 171 string console_result = "";
162 string attribute = null; 172 string attribute = null;
163 if (useFile) 173 if (useFile)
@@ -180,16 +190,20 @@ namespace OpenSim.Framework
180 } 190 }
181 else 191 else
182 { 192 {
183
184 if (configurationDescription.Trim() != "") 193 if (configurationDescription.Trim() != "")
185 { 194 {
186 console_result = MainLog.Instance.CmdPrompt(configurationDescription + ": " + configOption.configurationQuestion, configOption.configurationDefault); 195 console_result =
196 MainLog.Instance.CmdPrompt(
197 configurationDescription + ": " + configOption.configurationQuestion,
198 configOption.configurationDefault);
187 } 199 }
188 else 200 else
189 { 201 {
190 console_result = MainLog.Instance.CmdPrompt(configOption.configurationQuestion, configOption.configurationDefault); 202 console_result =
203 MainLog.Instance.CmdPrompt(configOption.configurationQuestion,
204 configOption.configurationDefault);
191 } 205 }
192 } 206 }
193 } 207 }
194 else 208 else
195 { 209 {
@@ -252,7 +266,6 @@ namespace OpenSim.Framework
252 { 266 {
253 convertSuccess = true; 267 convertSuccess = true;
254 return_result = intResult; 268 return_result = intResult;
255
256 } 269 }
257 errorMessage = "a signed 32 bit integer (int)"; 270 errorMessage = "a signed 32 bit integer (int)";
258 break; 271 break;
@@ -307,7 +320,6 @@ namespace OpenSim.Framework
307 { 320 {
308 convertSuccess = true; 321 convertSuccess = true;
309 return_result = uintResult; 322 return_result = uintResult;
310
311 } 323 }
312 errorMessage = "an unsigned 32 bit integer (uint)"; 324 errorMessage = "an unsigned 32 bit integer (uint)";
313 break; 325 break;
@@ -322,7 +334,9 @@ namespace OpenSim.Framework
322 break; 334 break;
323 case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT: 335 case ConfigurationOption.ConfigurationTypes.TYPE_FLOAT:
324 float floatResult; 336 float floatResult;
325 if (float.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out floatResult)) 337 if (
338 float.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo,
339 out floatResult))
326 { 340 {
327 convertSuccess = true; 341 convertSuccess = true;
328 return_result = floatResult; 342 return_result = floatResult;
@@ -331,7 +345,9 @@ namespace OpenSim.Framework
331 break; 345 break;
332 case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE: 346 case ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE:
333 double doubleResult; 347 double doubleResult;
334 if (Double.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo, out doubleResult)) 348 if (
349 Double.TryParse(console_result, NumberStyles.AllowDecimalPoint, Culture.NumberFormatInfo,
350 out doubleResult))
335 { 351 {
336 convertSuccess = true; 352 convertSuccess = true;
337 return_result = doubleResult; 353 return_result = doubleResult;
@@ -348,9 +364,10 @@ namespace OpenSim.Framework
348 } 364 }
349 365
350 366
351 if (!this.resultFunction(configOption.configurationKey, return_result)) 367 if (!resultFunction(configOption.configurationKey, return_result))
352 { 368 {
353 Console.MainLog.Instance.Notice("The handler for the last configuration option denied that input, please try again."); 369 MainLog.Instance.Notice(
370 "The handler for the last configuration option denied that input, please try again.");
354 convertSuccess = false; 371 convertSuccess = false;
355 ignoreNextFromConfig = true; 372 ignoreNextFromConfig = true;
356 } 373 }
@@ -359,19 +376,27 @@ namespace OpenSim.Framework
359 { 376 {
360 if (configOption.configurationUseDefaultNoPrompt) 377 if (configOption.configurationUseDefaultNoPrompt)
361 { 378 {
362 MainLog.Instance.Error("CONFIG", string.Format("[{3}]:[{1}] is not valid default for parameter [{0}].\nThe configuration result must be parsable to {2}.\n", configOption.configurationKey, console_result, errorMessage, configurationFilename)); 379 MainLog.Instance.Error("CONFIG",
380 string.Format(
381 "[{3}]:[{1}] is not valid default for parameter [{0}].\nThe configuration result must be parsable to {2}.\n",
382 configOption.configurationKey, console_result, errorMessage,
383 configurationFilename));
363 convertSuccess = true; 384 convertSuccess = true;
364 } 385 }
365 else 386 else
366 { 387 {
367 MainLog.Instance.Warn("CONFIG", string.Format("[{3}]:[{1}] is not a valid value [{0}].\nThe configuration result must be parsable to {2}.\n", configOption.configurationKey, console_result, errorMessage, configurationFilename)); 388 MainLog.Instance.Warn("CONFIG",
389 string.Format(
390 "[{3}]:[{1}] is not a valid value [{0}].\nThe configuration result must be parsable to {2}.\n",
391 configOption.configurationKey, console_result, errorMessage,
392 configurationFilename));
368 ignoreNextFromConfig = true; 393 ignoreNextFromConfig = true;
369 } 394 }
370 } 395 }
371 } 396 }
372 } 397 }
373 398
374 if(useFile) 399 if (useFile)
375 { 400 {
376 configurationPlugin.Commit(); 401 configurationPlugin.Commit();
377 configurationPlugin.Close(); 402 configurationPlugin.Close();
@@ -393,7 +418,8 @@ namespace OpenSim.Framework
393 418
394 if (typeInterface != null) 419 if (typeInterface != null)
395 { 420 {
396 plug = (IGenericConfig)Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString())); 421 plug =
422 (IGenericConfig) Activator.CreateInstance(pluginAssembly.GetType(pluginType.ToString()));
397 } 423 }
398 } 424 }
399 } 425 }
@@ -405,10 +431,10 @@ namespace OpenSim.Framework
405 431
406 public void forceSetConfigurationOption(string configuration_key, string configuration_value) 432 public void forceSetConfigurationOption(string configuration_key, string configuration_value)
407 { 433 {
408 this.configurationPlugin.LoadData(); 434 configurationPlugin.LoadData();
409 this.configurationPlugin.SetAttribute(configuration_key, configuration_value); 435 configurationPlugin.SetAttribute(configuration_key, configuration_value);
410 this.configurationPlugin.Commit(); 436 configurationPlugin.Commit();
411 this.configurationPlugin.Close(); 437 configurationPlugin.Close();
412 } 438 }
413 } 439 }
414} 440} \ No newline at end of file
diff --git a/OpenSim/Framework/General/ConfigurationOption.cs b/OpenSim/Framework/General/ConfigurationOption.cs
index 792e697..5a8fd08 100644
--- a/OpenSim/Framework/General/ConfigurationOption.cs
+++ b/OpenSim/Framework/General/ConfigurationOption.cs
@@ -26,10 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32
33namespace OpenSim.Framework 29namespace OpenSim.Framework
34{ 30{
35 public class ConfigurationOption 31 public class ConfigurationOption
@@ -40,7 +36,7 @@ namespace OpenSim.Framework
40 TYPE_STRING_NOT_EMPTY, 36 TYPE_STRING_NOT_EMPTY,
41 TYPE_UINT16, 37 TYPE_UINT16,
42 TYPE_UINT32, 38 TYPE_UINT32,
43 TYPE_UINT64, 39 TYPE_UINT64,
44 TYPE_INT16, 40 TYPE_INT16,
45 TYPE_INT32, 41 TYPE_INT32,
46 TYPE_INT64, 42 TYPE_INT64,
@@ -52,7 +48,7 @@ namespace OpenSim.Framework
52 TYPE_LLVECTOR3, 48 TYPE_LLVECTOR3,
53 TYPE_FLOAT, 49 TYPE_FLOAT,
54 TYPE_DOUBLE 50 TYPE_DOUBLE
55 }; 51 } ;
56 52
57 public string configurationKey = ""; 53 public string configurationKey = "";
58 public string configurationQuestion = ""; 54 public string configurationQuestion = "";
@@ -61,4 +57,4 @@ namespace OpenSim.Framework
61 public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING; 57 public ConfigurationTypes configurationType = ConfigurationTypes.TYPE_STRING;
62 public bool configurationUseDefaultNoPrompt = false; 58 public bool configurationUseDefaultNoPrompt = false;
63 } 59 }
64} 60} \ No newline at end of file
diff --git a/OpenSim/Framework/General/Culture.cs b/OpenSim/Framework/General/Culture.cs
index 54eae7c..f8cadfe 100644
--- a/OpenSim/Framework/General/Culture.cs
+++ b/OpenSim/Framework/General/Culture.cs
@@ -27,31 +27,23 @@
27*/ 27*/
28 28
29using System; 29using System;
30using System.Collections.Generic;
31using System.Globalization; 30using System.Globalization;
32using System.Text;
33using System.Threading; 31using System.Threading;
34 32
35namespace OpenSim.Framework 33namespace OpenSim.Framework
36{ 34{
37 public class Culture 35 public class Culture
38 { 36 {
39 private static readonly CultureInfo m_cultureInfo = new System.Globalization.CultureInfo("en-US", true); 37 private static readonly CultureInfo m_cultureInfo = new CultureInfo("en-US", true);
40 38
41 public static NumberFormatInfo NumberFormatInfo 39 public static NumberFormatInfo NumberFormatInfo
42 { 40 {
43 get 41 get { return m_cultureInfo.NumberFormat; }
44 {
45 return m_cultureInfo.NumberFormat;
46 }
47 } 42 }
48 43
49 public static IFormatProvider FormatProvider 44 public static IFormatProvider FormatProvider
50 { 45 {
51 get 46 get { return m_cultureInfo; }
52 {
53 return m_cultureInfo;
54 }
55 } 47 }
56 48
57 public static void SetCurrentCulture() 49 public static void SetCurrentCulture()
@@ -59,4 +51,4 @@ namespace OpenSim.Framework
59 Thread.CurrentThread.CurrentCulture = m_cultureInfo; 51 Thread.CurrentThread.CurrentCulture = m_cultureInfo;
60 } 52 }
61 } 53 }
62} 54} \ No newline at end of file
diff --git a/OpenSim/Framework/General/EstateSettings.cs b/OpenSim/Framework/General/EstateSettings.cs
index 3e99424..c70b6ca 100644
--- a/OpenSim/Framework/General/EstateSettings.cs
+++ b/OpenSim/Framework/General/EstateSettings.cs
@@ -25,24 +25,20 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
28using System.IO; 29using System.IO;
29using libsecondlife; 30using libsecondlife;
30using OpenSim.Framework;
31using System.Globalization;
32 31
33namespace OpenSim.Framework 32namespace OpenSim.Framework
34{ 33{
35 public class EstateSettings 34 public class EstateSettings
36 { 35 {
37
38 //Settings to this island 36 //Settings to this island
39 private float m_billableFactor; 37 private float m_billableFactor;
38
40 public float billableFactor 39 public float billableFactor
41 { 40 {
42 get 41 get { return m_billableFactor; }
43 {
44 return m_billableFactor;
45 }
46 set 42 set
47 { 43 {
48 m_billableFactor = value; 44 m_billableFactor = value;
@@ -52,12 +48,10 @@ namespace OpenSim.Framework
52 48
53 49
54 private uint m_estateID; 50 private uint m_estateID;
51
55 public uint estateID 52 public uint estateID
56 { 53 {
57 get 54 get { return m_estateID; }
58 {
59 return m_estateID;
60 }
61 set 55 set
62 { 56 {
63 m_estateID = value; 57 m_estateID = value;
@@ -67,12 +61,10 @@ namespace OpenSim.Framework
67 61
68 62
69 private uint m_parentEstateID; 63 private uint m_parentEstateID;
64
70 public uint parentEstateID 65 public uint parentEstateID
71 { 66 {
72 get 67 get { return m_parentEstateID; }
73 {
74 return m_parentEstateID;
75 }
76 set 68 set
77 { 69 {
78 m_parentEstateID = value; 70 m_parentEstateID = value;
@@ -81,12 +73,10 @@ namespace OpenSim.Framework
81 } 73 }
82 74
83 private byte m_maxAgents; 75 private byte m_maxAgents;
76
84 public byte maxAgents 77 public byte maxAgents
85 { 78 {
86 get 79 get { return m_maxAgents; }
87 {
88 return m_maxAgents;
89 }
90 set 80 set
91 { 81 {
92 m_maxAgents = value; 82 m_maxAgents = value;
@@ -95,12 +85,10 @@ namespace OpenSim.Framework
95 } 85 }
96 86
97 private float m_objectBonusFactor; 87 private float m_objectBonusFactor;
88
98 public float objectBonusFactor 89 public float objectBonusFactor
99 { 90 {
100 get 91 get { return m_objectBonusFactor; }
101 {
102 return m_objectBonusFactor;
103 }
104 set 92 set
105 { 93 {
106 m_objectBonusFactor = value; 94 m_objectBonusFactor = value;
@@ -109,12 +97,10 @@ namespace OpenSim.Framework
109 } 97 }
110 98
111 private int m_redirectGridX; 99 private int m_redirectGridX;
100
112 public int redirectGridX 101 public int redirectGridX
113 { 102 {
114 get 103 get { return m_redirectGridX; }
115 {
116 return m_redirectGridX;
117 }
118 set 104 set
119 { 105 {
120 m_redirectGridX = value; 106 m_redirectGridX = value;
@@ -123,12 +109,10 @@ namespace OpenSim.Framework
123 } 109 }
124 110
125 private int m_redirectGridY; 111 private int m_redirectGridY;
112
126 public int redirectGridY 113 public int redirectGridY
127 { 114 {
128 get 115 get { return m_redirectGridY; }
129 {
130 return m_redirectGridY;
131 }
132 set 116 set
133 { 117 {
134 m_redirectGridY = value; 118 m_redirectGridY = value;
@@ -137,12 +121,10 @@ namespace OpenSim.Framework
137 } 121 }
138 122
139 private Simulator.RegionFlags m_regionFlags; 123 private Simulator.RegionFlags m_regionFlags;
124
140 public Simulator.RegionFlags regionFlags 125 public Simulator.RegionFlags regionFlags
141 { 126 {
142 get 127 get { return m_regionFlags; }
143 {
144 return m_regionFlags;
145 }
146 set 128 set
147 { 129 {
148 m_regionFlags = value; 130 m_regionFlags = value;
@@ -152,12 +134,10 @@ namespace OpenSim.Framework
152 134
153 135
154 private Simulator.SimAccess m_simAccess; 136 private Simulator.SimAccess m_simAccess;
137
155 public Simulator.SimAccess simAccess 138 public Simulator.SimAccess simAccess
156 { 139 {
157 get 140 get { return m_simAccess; }
158 {
159 return m_simAccess;
160 }
161 set 141 set
162 { 142 {
163 m_simAccess = value; 143 m_simAccess = value;
@@ -166,12 +146,10 @@ namespace OpenSim.Framework
166 } 146 }
167 147
168 private float m_sunHour; 148 private float m_sunHour;
149
169 public float sunHour 150 public float sunHour
170 { 151 {
171 get 152 get { return m_sunHour; }
172 {
173 return m_sunHour;
174 }
175 set 153 set
176 { 154 {
177 m_sunHour = value; 155 m_sunHour = value;
@@ -180,12 +158,10 @@ namespace OpenSim.Framework
180 } 158 }
181 159
182 private float m_terrainRaiseLimit; 160 private float m_terrainRaiseLimit;
161
183 public float terrainRaiseLimit 162 public float terrainRaiseLimit
184 { 163 {
185 get 164 get { return m_terrainRaiseLimit; }
186 {
187 return m_terrainRaiseLimit;
188 }
189 set 165 set
190 { 166 {
191 m_terrainRaiseLimit = value; 167 m_terrainRaiseLimit = value;
@@ -194,12 +170,10 @@ namespace OpenSim.Framework
194 } 170 }
195 171
196 private float m_terrainLowerLimit; 172 private float m_terrainLowerLimit;
173
197 public float terrainLowerLimit 174 public float terrainLowerLimit
198 { 175 {
199 get 176 get { return m_terrainLowerLimit; }
200 {
201 return m_terrainLowerLimit;
202 }
203 set 177 set
204 { 178 {
205 m_terrainLowerLimit = value; 179 m_terrainLowerLimit = value;
@@ -208,12 +182,10 @@ namespace OpenSim.Framework
208 } 182 }
209 183
210 private bool m_useFixedSun; 184 private bool m_useFixedSun;
185
211 public bool useFixedSun 186 public bool useFixedSun
212 { 187 {
213 get 188 get { return m_useFixedSun; }
214 {
215 return m_useFixedSun;
216 }
217 set 189 set
218 { 190 {
219 m_useFixedSun = value; 191 m_useFixedSun = value;
@@ -223,12 +195,10 @@ namespace OpenSim.Framework
223 195
224 196
225 private int m_pricePerMeter; 197 private int m_pricePerMeter;
198
226 public int pricePerMeter 199 public int pricePerMeter
227 { 200 {
228 get 201 get { return m_pricePerMeter; }
229 {
230 return m_pricePerMeter;
231 }
232 set 202 set
233 { 203 {
234 m_pricePerMeter = value; 204 m_pricePerMeter = value;
@@ -238,12 +208,10 @@ namespace OpenSim.Framework
238 208
239 209
240 private ushort m_regionWaterHeight; 210 private ushort m_regionWaterHeight;
211
241 public ushort regionWaterHeight 212 public ushort regionWaterHeight
242 { 213 {
243 get 214 get { return m_regionWaterHeight; }
244 {
245 return m_regionWaterHeight;
246 }
247 set 215 set
248 { 216 {
249 m_regionWaterHeight = value; 217 m_regionWaterHeight = value;
@@ -253,12 +221,10 @@ namespace OpenSim.Framework
253 221
254 222
255 private bool m_regionAllowTerraform; 223 private bool m_regionAllowTerraform;
224
256 public bool regionAllowTerraform 225 public bool regionAllowTerraform
257 { 226 {
258 get 227 get { return m_regionAllowTerraform; }
259 {
260 return m_regionAllowTerraform;
261 }
262 set 228 set
263 { 229 {
264 m_regionAllowTerraform = value; 230 m_regionAllowTerraform = value;
@@ -266,16 +232,14 @@ namespace OpenSim.Framework
266 } 232 }
267 } 233 }
268 234
269 235
270 // Region Information 236 // Region Information
271 // Low resolution 'base' textures. No longer used. 237 // Low resolution 'base' textures. No longer used.
272 private LLUUID m_terrainBase0; 238 private LLUUID m_terrainBase0;
239
273 public LLUUID terrainBase0 240 public LLUUID terrainBase0
274 { 241 {
275 get 242 get { return m_terrainBase0; }
276 {
277 return m_terrainBase0;
278 }
279 set 243 set
280 { 244 {
281 m_terrainBase0 = value; 245 m_terrainBase0 = value;
@@ -284,12 +248,10 @@ namespace OpenSim.Framework
284 } 248 }
285 249
286 private LLUUID m_terrainBase1; 250 private LLUUID m_terrainBase1;
251
287 public LLUUID terrainBase1 252 public LLUUID terrainBase1
288 { 253 {
289 get 254 get { return m_terrainBase1; }
290 {
291 return m_terrainBase1;
292 }
293 set 255 set
294 { 256 {
295 m_terrainBase1 = value; 257 m_terrainBase1 = value;
@@ -298,12 +260,10 @@ namespace OpenSim.Framework
298 } 260 }
299 261
300 private LLUUID m_terrainBase2; 262 private LLUUID m_terrainBase2;
263
301 public LLUUID terrainBase2 264 public LLUUID terrainBase2
302 { 265 {
303 get 266 get { return m_terrainBase2; }
304 {
305 return m_terrainBase2;
306 }
307 set 267 set
308 { 268 {
309 m_terrainBase2 = value; 269 m_terrainBase2 = value;
@@ -312,12 +272,10 @@ namespace OpenSim.Framework
312 } 272 }
313 273
314 private LLUUID m_terrainBase3; 274 private LLUUID m_terrainBase3;
275
315 public LLUUID terrainBase3 276 public LLUUID terrainBase3
316 { 277 {
317 get 278 get { return m_terrainBase3; }
318 {
319 return m_terrainBase3;
320 }
321 set 279 set
322 { 280 {
323 m_terrainBase3 = value; 281 m_terrainBase3 = value;
@@ -328,53 +286,46 @@ namespace OpenSim.Framework
328 286
329 // Higher resolution terrain textures 287 // Higher resolution terrain textures
330 private LLUUID m_terrainDetail0; 288 private LLUUID m_terrainDetail0;
289
331 public LLUUID terrainDetail0 290 public LLUUID terrainDetail0
332 { 291 {
333 get 292 get { return m_terrainDetail0; }
334 {
335 return m_terrainDetail0;
336 }
337 set 293 set
338 { 294 {
339
340 m_terrainDetail0 = value; 295 m_terrainDetail0 = value;
341 configMember.forceSetConfigurationOption("terrain_detail_0", m_terrainDetail0.ToString()); 296 configMember.forceSetConfigurationOption("terrain_detail_0", m_terrainDetail0.ToString());
342 } 297 }
343 } 298 }
344 299
345 private LLUUID m_terrainDetail1; 300 private LLUUID m_terrainDetail1;
301
346 public LLUUID terrainDetail1 302 public LLUUID terrainDetail1
347 { 303 {
348 get 304 get { return m_terrainDetail1; }
349 {
350 return m_terrainDetail1;
351 }
352 set 305 set
353 { 306 {
354 m_terrainDetail1 = value; 307 m_terrainDetail1 = value;
355 configMember.forceSetConfigurationOption("terrain_detail_1", m_terrainDetail1.ToString()); 308 configMember.forceSetConfigurationOption("terrain_detail_1", m_terrainDetail1.ToString());
356 } 309 }
357 } 310 }
311
358 private LLUUID m_terrainDetail2; 312 private LLUUID m_terrainDetail2;
313
359 public LLUUID terrainDetail2 314 public LLUUID terrainDetail2
360 { 315 {
361 get 316 get { return m_terrainDetail2; }
362 {
363 return m_terrainDetail2;
364 }
365 set 317 set
366 { 318 {
367 m_terrainDetail2 = value; 319 m_terrainDetail2 = value;
368 configMember.forceSetConfigurationOption("terrain_detail_2", m_terrainDetail2.ToString()); 320 configMember.forceSetConfigurationOption("terrain_detail_2", m_terrainDetail2.ToString());
369 } 321 }
370 } 322 }
323
371 private LLUUID m_terrainDetail3; 324 private LLUUID m_terrainDetail3;
325
372 public LLUUID terrainDetail3 326 public LLUUID terrainDetail3
373 { 327 {
374 get 328 get { return m_terrainDetail3; }
375 {
376 return m_terrainDetail3;
377 }
378 set 329 set
379 { 330 {
380 m_terrainDetail3 = value; 331 m_terrainDetail3 = value;
@@ -384,12 +335,10 @@ namespace OpenSim.Framework
384 335
385 // First quad - each point is bilinearly interpolated at each meter of terrain 336 // First quad - each point is bilinearly interpolated at each meter of terrain
386 private float m_terrainStartHeight0; 337 private float m_terrainStartHeight0;
338
387 public float terrainStartHeight0 339 public float terrainStartHeight0
388 { 340 {
389 get 341 get { return m_terrainStartHeight0; }
390 {
391 return m_terrainStartHeight0;
392 }
393 set 342 set
394 { 343 {
395 m_terrainStartHeight0 = value; 344 m_terrainStartHeight0 = value;
@@ -399,12 +348,10 @@ namespace OpenSim.Framework
399 348
400 349
401 private float m_terrainStartHeight1; 350 private float m_terrainStartHeight1;
351
402 public float terrainStartHeight1 352 public float terrainStartHeight1
403 { 353 {
404 get 354 get { return m_terrainStartHeight1; }
405 {
406 return m_terrainStartHeight1;
407 }
408 set 355 set
409 { 356 {
410 m_terrainStartHeight1 = value; 357 m_terrainStartHeight1 = value;
@@ -413,12 +360,10 @@ namespace OpenSim.Framework
413 } 360 }
414 361
415 private float m_terrainStartHeight2; 362 private float m_terrainStartHeight2;
363
416 public float terrainStartHeight2 364 public float terrainStartHeight2
417 { 365 {
418 get 366 get { return m_terrainStartHeight2; }
419 {
420 return m_terrainStartHeight2;
421 }
422 set 367 set
423 { 368 {
424 m_terrainStartHeight2 = value; 369 m_terrainStartHeight2 = value;
@@ -427,28 +372,25 @@ namespace OpenSim.Framework
427 } 372 }
428 373
429 private float m_terrainStartHeight3; 374 private float m_terrainStartHeight3;
375
430 public float terrainStartHeight3 376 public float terrainStartHeight3
431 { 377 {
432 get 378 get { return m_terrainStartHeight3; }
433 {
434 return m_terrainStartHeight3;
435 }
436 set 379 set
437 { 380 {
438 m_terrainStartHeight3 = value; 381 m_terrainStartHeight3 = value;
439 configMember.forceSetConfigurationOption("terrain_start_height_3", m_terrainStartHeight3.ToString()); 382 configMember.forceSetConfigurationOption("terrain_start_height_3", m_terrainStartHeight3.ToString());
440 } 383 }
441 } 384 }
385
442 // Second quad - also bilinearly interpolated. 386 // Second quad - also bilinearly interpolated.
443 // Terrain texturing is done that: 387 // Terrain texturing is done that:
444 // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y] 388 // 0..3 (0 = base0, 3 = base3) = (terrain[x,y] - start[x,y]) / range[x,y]
445 private float m_terrainHeightRange0; 389 private float m_terrainHeightRange0;
390
446 public float terrainHeightRange0 391 public float terrainHeightRange0
447 { 392 {
448 get 393 get { return m_terrainHeightRange0; }
449 {
450 return m_terrainHeightRange0;
451 }
452 set 394 set
453 { 395 {
454 m_terrainHeightRange0 = value; 396 m_terrainHeightRange0 = value;
@@ -457,12 +399,10 @@ namespace OpenSim.Framework
457 } 399 }
458 400
459 private float m_terrainHeightRange1; 401 private float m_terrainHeightRange1;
402
460 public float terrainHeightRange1 403 public float terrainHeightRange1
461 { 404 {
462 get 405 get { return m_terrainHeightRange1; }
463 {
464 return m_terrainHeightRange1;
465 }
466 set 406 set
467 { 407 {
468 m_terrainHeightRange1 = value; 408 m_terrainHeightRange1 = value;
@@ -471,12 +411,10 @@ namespace OpenSim.Framework
471 } 411 }
472 412
473 private float m_terrainHeightRange2; 413 private float m_terrainHeightRange2;
414
474 public float terrainHeightRange2 415 public float terrainHeightRange2
475 { 416 {
476 get 417 get { return m_terrainHeightRange2; }
477 {
478 return m_terrainHeightRange2;
479 }
480 set 418 set
481 { 419 {
482 m_terrainHeightRange2 = value; 420 m_terrainHeightRange2 = value;
@@ -485,26 +423,23 @@ namespace OpenSim.Framework
485 } 423 }
486 424
487 private float m_terrainHeightRange3; 425 private float m_terrainHeightRange3;
426
488 public float terrainHeightRange3 427 public float terrainHeightRange3
489 { 428 {
490 get 429 get { return m_terrainHeightRange3; }
491 {
492 return m_terrainHeightRange3;
493 }
494 set 430 set
495 { 431 {
496 m_terrainHeightRange3 = value; 432 m_terrainHeightRange3 = value;
497 configMember.forceSetConfigurationOption("terrain_height_range_3", m_terrainHeightRange3.ToString()); 433 configMember.forceSetConfigurationOption("terrain_height_range_3", m_terrainHeightRange3.ToString());
498 } 434 }
499 } 435 }
436
500 // Terrain Default (Must be in F32 Format!) 437 // Terrain Default (Must be in F32 Format!)
501 private string m_terrainFile; 438 private string m_terrainFile;
439
502 public string terrainFile 440 public string terrainFile
503 { 441 {
504 get 442 get { return m_terrainFile; }
505 {
506 return m_terrainFile;
507 }
508 set 443 set
509 { 444 {
510 m_terrainFile = value; 445 m_terrainFile = value;
@@ -513,12 +448,10 @@ namespace OpenSim.Framework
513 } 448 }
514 449
515 private double m_terrainMultiplier; 450 private double m_terrainMultiplier;
451
516 public double terrainMultiplier 452 public double terrainMultiplier
517 { 453 {
518 get 454 get { return m_terrainMultiplier; }
519 {
520 return m_terrainMultiplier;
521 }
522 set 455 set
523 { 456 {
524 m_terrainMultiplier = value; 457 m_terrainMultiplier = value;
@@ -527,12 +460,10 @@ namespace OpenSim.Framework
527 } 460 }
528 461
529 private float m_waterHeight; 462 private float m_waterHeight;
463
530 public float waterHeight 464 public float waterHeight
531 { 465 {
532 get 466 get { return m_waterHeight; }
533 {
534 return m_waterHeight;
535 }
536 set 467 set
537 { 468 {
538 m_waterHeight = value; 469 m_waterHeight = value;
@@ -541,73 +472,112 @@ namespace OpenSim.Framework
541 } 472 }
542 473
543 private LLUUID m_terrainImageID; 474 private LLUUID m_terrainImageID;
475
544 public LLUUID terrainImageID 476 public LLUUID terrainImageID
545 { 477 {
546 get 478 get { return m_terrainImageID; }
547 {
548 return m_terrainImageID;
549 }
550 set 479 set
551 { 480 {
552 m_terrainImageID = value; 481 m_terrainImageID = value;
553 configMember.forceSetConfigurationOption("terrain_image_id", m_terrainImageID.ToString()); 482 configMember.forceSetConfigurationOption("terrain_image_id", m_terrainImageID.ToString());
554 } 483 }
555 } 484 }
485
556 private ConfigurationMember configMember; 486 private ConfigurationMember configMember;
487
557 public EstateSettings() 488 public EstateSettings()
558 { 489 {
559 // Temporary hack to prevent multiple loadings. 490 // Temporary hack to prevent multiple loadings.
560 if (configMember == null) 491 if (configMember == null)
561 { 492 {
562 configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", this.loadConfigurationOptions, this.handleIncomingConfiguration); 493 configMember =
494 new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS",
495 loadConfigurationOptions, handleIncomingConfiguration);
563 configMember.performConfigurationRetrieve(); 496 configMember.performConfigurationRetrieve();
564 } 497 }
565 } 498 }
566 499
567 public void loadConfigurationOptions() 500 public void loadConfigurationOptions()
568 { 501 {
569 configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "","0.0",true); 502 configMember.addConfigurationOption("billable_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "",
570 configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "","0",true); 503 "0.0", true);
571 configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", true); 504 configMember.addConfigurationOption("estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0",
572 configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "40", true); 505 true);
573 506 configMember.addConfigurationOption("parent_estate_id", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
574 configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "1.0", true); 507 "", "0", true);
575 configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", "0", true); 508 configMember.addConfigurationOption("max_agents", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "40",
576 configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "", "0", true); 509 true);
577 configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "0", true); 510
578 configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21", true); 511 configMember.addConfigurationOption("object_bonus_factor", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
579 configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", true); 512 "", "1.0", true);
580 configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", true); 513 configMember.addConfigurationOption("redirect_grid_x", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "",
581 configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0", true); 514 "0", true);
582 configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "false", true); 515 configMember.addConfigurationOption("redirect_grid_y", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "",
583 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "", "1", true); 516 "0", true);
584 configMember.addConfigurationOption("region_water_height", ConfigurationOption.ConfigurationTypes.TYPE_UINT16, "", "20", true); 517 configMember.addConfigurationOption("region_flags", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "",
585 configMember.addConfigurationOption("region_allow_terraform", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "true", true); 518 "0", true);
586 519 configMember.addConfigurationOption("sim_access", ConfigurationOption.ConfigurationTypes.TYPE_BYTE, "", "21",
587 configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "b8d3965a-ad78-bf43-699b-bff8eca6c975", true); 520 true);
588 configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "abb783e6-3e93-26c0-248a-247666855da3", true); 521 configMember.addConfigurationOption("sun_hour", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "0",
589 configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "179cdabd-398a-9b6b-1391-4dc333ba321f", true); 522 true);
590 configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "beb169c7-11ea-fff2-efe5-0f24dc881df2", true); 523 configMember.addConfigurationOption("terrain_raise_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
591 524 "", "0", true);
592 configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); 525 configMember.addConfigurationOption("terrain_lower_limit", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
593 configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); 526 "", "0", true);
594 configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); 527 configMember.addConfigurationOption("use_fixed_sun", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "",
595 configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); 528 "false", true);
596 529 configMember.addConfigurationOption("price_per_meter", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
597 configMember.addConfigurationOption("terrain_start_height_0", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); 530 "", "1", true);
598 configMember.addConfigurationOption("terrain_start_height_1", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); 531 configMember.addConfigurationOption("region_water_height",
599 configMember.addConfigurationOption("terrain_start_height_2", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); 532 ConfigurationOption.ConfigurationTypes.TYPE_UINT16, "", "20", true);
600 configMember.addConfigurationOption("terrain_start_height_3", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true); 533 configMember.addConfigurationOption("region_allow_terraform",
601 534 ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, "", "true", true);
602 configMember.addConfigurationOption("terrain_height_range_0", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); 535
603 configMember.addConfigurationOption("terrain_height_range_1", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); 536 configMember.addConfigurationOption("terrain_base_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "",
604 configMember.addConfigurationOption("terrain_height_range_2", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); 537 "b8d3965a-ad78-bf43-699b-bff8eca6c975", true);
605 configMember.addConfigurationOption("terrain_height_range_3", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); 538 configMember.addConfigurationOption("terrain_base_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "",
606 539 "abb783e6-3e93-26c0-248a-247666855da3", true);
607 configMember.addConfigurationOption("terrain_file", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "", "default.r32", true); 540 configMember.addConfigurationOption("terrain_base_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "",
608 configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true); 541 "179cdabd-398a-9b6b-1391-4dc333ba321f", true);
609 configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "", "20.0", true); 542 configMember.addConfigurationOption("terrain_base_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "",
610 configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "", "00000000-0000-0000-0000-000000000000", true); 543 "beb169c7-11ea-fff2-efe5-0f24dc881df2", true);
544
545 configMember.addConfigurationOption("terrain_detail_0", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
546 "", "00000000-0000-0000-0000-000000000000", true);
547 configMember.addConfigurationOption("terrain_detail_1", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
548 "", "00000000-0000-0000-0000-000000000000", true);
549 configMember.addConfigurationOption("terrain_detail_2", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
550 "", "00000000-0000-0000-0000-000000000000", true);
551 configMember.addConfigurationOption("terrain_detail_3", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
552 "", "00000000-0000-0000-0000-000000000000", true);
553
554 configMember.addConfigurationOption("terrain_start_height_0",
555 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true);
556 configMember.addConfigurationOption("terrain_start_height_1",
557 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true);
558 configMember.addConfigurationOption("terrain_start_height_2",
559 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true);
560 configMember.addConfigurationOption("terrain_start_height_3",
561 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "10.0", true);
562
563 configMember.addConfigurationOption("terrain_height_range_0",
564 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true);
565 configMember.addConfigurationOption("terrain_height_range_1",
566 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true);
567 configMember.addConfigurationOption("terrain_height_range_2",
568 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true);
569 configMember.addConfigurationOption("terrain_height_range_3",
570 ConfigurationOption.ConfigurationTypes.TYPE_FLOAT, "", "60.0", true);
571
572 configMember.addConfigurationOption("terrain_file",
573 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "",
574 "default.r32", true);
575 configMember.addConfigurationOption("terrain_multiplier", ConfigurationOption.ConfigurationTypes.TYPE_FLOAT,
576 "", "60.0", true);
577 configMember.addConfigurationOption("water_height", ConfigurationOption.ConfigurationTypes.TYPE_DOUBLE, "",
578 "20.0", true);
579 configMember.addConfigurationOption("terrain_image_id", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
580 "", "00000000-0000-0000-0000-000000000000", true);
611 } 581 }
612 582
613 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 583 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -615,123 +585,123 @@ namespace OpenSim.Framework
615 switch (configuration_key) 585 switch (configuration_key)
616 { 586 {
617 case "billable_factor": 587 case "billable_factor":
618 this.m_billableFactor = (float)configuration_result; 588 m_billableFactor = (float) configuration_result;
619 break; 589 break;
620 case "estate_id": 590 case "estate_id":
621 this.m_estateID = (uint)configuration_result; 591 m_estateID = (uint) configuration_result;
622 break; 592 break;
623 case "parent_estate_id": 593 case "parent_estate_id":
624 this.m_parentEstateID = (uint)configuration_result; 594 m_parentEstateID = (uint) configuration_result;
625 break; 595 break;
626 case "max_agents": 596 case "max_agents":
627 this.m_maxAgents = (byte)configuration_result; 597 m_maxAgents = (byte) configuration_result;
628 break; 598 break;
629 599
630 case "object_bonus_factor": 600 case "object_bonus_factor":
631 this.m_objectBonusFactor = (float)configuration_result; 601 m_objectBonusFactor = (float) configuration_result;
632 break; 602 break;
633 case "redirect_grid_x": 603 case "redirect_grid_x":
634 this.m_redirectGridX = (int)configuration_result; 604 m_redirectGridX = (int) configuration_result;
635 break; 605 break;
636 case "redirect_grid_y": 606 case "redirect_grid_y":
637 this.m_redirectGridY = (int)configuration_result; 607 m_redirectGridY = (int) configuration_result;
638 break; 608 break;
639 case "region_flags": 609 case "region_flags":
640 this.m_regionFlags = (Simulator.RegionFlags)((uint)configuration_result); 610 m_regionFlags = (Simulator.RegionFlags) ((uint) configuration_result);
641 break; 611 break;
642 case "sim_access": 612 case "sim_access":
643 this.m_simAccess = (Simulator.SimAccess)((byte)configuration_result); 613 m_simAccess = (Simulator.SimAccess) ((byte) configuration_result);
644 break; 614 break;
645 case "sun_hour": 615 case "sun_hour":
646 this.m_sunHour = (float)configuration_result; 616 m_sunHour = (float) configuration_result;
647 break; 617 break;
648 case "terrain_raise_limit": 618 case "terrain_raise_limit":
649 this.m_terrainRaiseLimit = (float)configuration_result; 619 m_terrainRaiseLimit = (float) configuration_result;
650 break; 620 break;
651 case "terrain_lower_limit": 621 case "terrain_lower_limit":
652 this.m_terrainLowerLimit = (float)configuration_result; 622 m_terrainLowerLimit = (float) configuration_result;
653 break; 623 break;
654 case "use_fixed_sun": 624 case "use_fixed_sun":
655 this.m_useFixedSun = (bool)configuration_result; 625 m_useFixedSun = (bool) configuration_result;
656 break; 626 break;
657 case "price_per_meter": 627 case "price_per_meter":
658 this.m_pricePerMeter = System.Convert.ToInt32(configuration_result); 628 m_pricePerMeter = Convert.ToInt32(configuration_result);
659 break; 629 break;
660 case "region_water_height": 630 case "region_water_height":
661 this.m_regionWaterHeight = (ushort)configuration_result; 631 m_regionWaterHeight = (ushort) configuration_result;
662 break; 632 break;
663 case "region_allow_terraform": 633 case "region_allow_terraform":
664 this.m_regionAllowTerraform = (bool)configuration_result; 634 m_regionAllowTerraform = (bool) configuration_result;
665 break; 635 break;
666 636
667 case "terrain_base_0": 637 case "terrain_base_0":
668 this.m_terrainBase0 = (LLUUID)configuration_result; 638 m_terrainBase0 = (LLUUID) configuration_result;
669 break; 639 break;
670 case "terrain_base_1": 640 case "terrain_base_1":
671 this.m_terrainBase1 = (LLUUID)configuration_result; 641 m_terrainBase1 = (LLUUID) configuration_result;
672 break; 642 break;
673 case "terrain_base_2": 643 case "terrain_base_2":
674 this.m_terrainBase2 = (LLUUID)configuration_result; 644 m_terrainBase2 = (LLUUID) configuration_result;
675 break; 645 break;
676 case "terrain_base_3": 646 case "terrain_base_3":
677 this.m_terrainBase3 = (LLUUID)configuration_result; 647 m_terrainBase3 = (LLUUID) configuration_result;
678 break; 648 break;
679 649
680 case "terrain_detail_0": 650 case "terrain_detail_0":
681 this.m_terrainDetail0 = (LLUUID)configuration_result; 651 m_terrainDetail0 = (LLUUID) configuration_result;
682 break; 652 break;
683 case "terrain_detail_1": 653 case "terrain_detail_1":
684 this.m_terrainDetail1 = (LLUUID)configuration_result; 654 m_terrainDetail1 = (LLUUID) configuration_result;
685 break; 655 break;
686 case "terrain_detail_2": 656 case "terrain_detail_2":
687 this.m_terrainDetail2 = (LLUUID)configuration_result; 657 m_terrainDetail2 = (LLUUID) configuration_result;
688 break; 658 break;
689 case "terrain_detail_3": 659 case "terrain_detail_3":
690 this.m_terrainDetail3 = (LLUUID)configuration_result; 660 m_terrainDetail3 = (LLUUID) configuration_result;
691 break; 661 break;
692 662
693 case "terrain_start_height_0": 663 case "terrain_start_height_0":
694 this.m_terrainStartHeight0 = (float)configuration_result; 664 m_terrainStartHeight0 = (float) configuration_result;
695 break; 665 break;
696 case "terrain_start_height_1": 666 case "terrain_start_height_1":
697 this.m_terrainStartHeight1 = (float)configuration_result; 667 m_terrainStartHeight1 = (float) configuration_result;
698 break; 668 break;
699 case "terrain_start_height_2": 669 case "terrain_start_height_2":
700 this.m_terrainStartHeight2 = (float)configuration_result; 670 m_terrainStartHeight2 = (float) configuration_result;
701 break; 671 break;
702 case "terrain_start_height_3": 672 case "terrain_start_height_3":
703 this.m_terrainStartHeight3 = (float)configuration_result; 673 m_terrainStartHeight3 = (float) configuration_result;
704 break; 674 break;
705 675
706 case "terrain_height_range_0": 676 case "terrain_height_range_0":
707 this.m_terrainHeightRange0 = (float)configuration_result; 677 m_terrainHeightRange0 = (float) configuration_result;
708 break; 678 break;
709 case "terrain_height_range_1": 679 case "terrain_height_range_1":
710 this.m_terrainHeightRange1 = (float)configuration_result; 680 m_terrainHeightRange1 = (float) configuration_result;
711 break; 681 break;
712 case "terrain_height_range_2": 682 case "terrain_height_range_2":
713 this.m_terrainHeightRange2 = (float)configuration_result; 683 m_terrainHeightRange2 = (float) configuration_result;
714 break; 684 break;
715 case "terrain_height_range_3": 685 case "terrain_height_range_3":
716 this.m_terrainHeightRange3 = (float)configuration_result; 686 m_terrainHeightRange3 = (float) configuration_result;
717 break; 687 break;
718 688
719 case "terrain_file": 689 case "terrain_file":
720 this.m_terrainFile = (string)configuration_result; 690 m_terrainFile = (string) configuration_result;
721 break; 691 break;
722 case "terrain_multiplier": 692 case "terrain_multiplier":
723 this.m_terrainMultiplier = System.Convert.ToDouble(configuration_result); 693 m_terrainMultiplier = Convert.ToDouble(configuration_result);
724 break; 694 break;
725 case "water_height": 695 case "water_height":
726 double tmpVal = (double) configuration_result; 696 double tmpVal = (double) configuration_result;
727 this.m_waterHeight = (float) tmpVal; 697 m_waterHeight = (float) tmpVal;
728 break; 698 break;
729 case "terrain_image_id": 699 case "terrain_image_id":
730 this.m_terrainImageID = (LLUUID)configuration_result; 700 m_terrainImageID = (LLUUID) configuration_result;
731 break; 701 break;
732 } 702 }
733 703
734 return true; 704 return true;
735 } 705 }
736 } 706 }
737} 707} \ No newline at end of file
diff --git a/OpenSim/Framework/General/GridConfig.cs b/OpenSim/Framework/General/GridConfig.cs
index 64ce3b1..66d6c3a 100644
--- a/OpenSim/Framework/General/GridConfig.cs
+++ b/OpenSim/Framework/General/GridConfig.cs
@@ -26,10 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32
33namespace OpenSim.Framework 29namespace OpenSim.Framework
34{ 30{
35 public class GridConfig 31 public class GridConfig
@@ -50,30 +46,49 @@ namespace OpenSim.Framework
50 46
51 public static uint DefaultHttpPort = 8001; 47 public static uint DefaultHttpPort = 8001;
52 public uint HttpPort = DefaultHttpPort; 48 public uint HttpPort = DefaultHttpPort;
53 49
54 private ConfigurationMember configMember; 50 private ConfigurationMember configMember;
51
55 public GridConfig(string description, string filename) 52 public GridConfig(string description, string filename)
56 { 53 {
57 configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); 54 configMember =
55 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
58 configMember.performConfigurationRetrieve(); 56 configMember.performConfigurationRetrieve();
59 } 57 }
60 58
61 public void loadConfigurationOptions() 59 public void loadConfigurationOptions()
62 { 60 {
63 configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false); 61 configMember.addConfigurationOption("grid_owner",
64 configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/", false); 62 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
65 configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false); 63 "OGS Grid Owner", "OGS development team", false);
66 configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false); 64 configMember.addConfigurationOption("default_asset_server",
65 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
66 "Default Asset Server URI",
67 "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/",
68 false);
69 configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
70 "Key to send to asset server", "null", false);
71 configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
72 "Key to expect from asset server", "null", false);
67 73
68 configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false); 74 configMember.addConfigurationOption("default_user_server",
69 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false); 75 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
70 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false); 76 "Default User Server URI",
77 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString() + "/", false);
78 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
79 "Key to send to user server", "null", false);
80 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
81 "Key to expect from user server", "null", false);
71 82
72 configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false); 83 configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
73 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false); 84 "Key to send to a simulator", "null", false);
74 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false); 85 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
86 "Key to expect from a simulator", "null", false);
87 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
88 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
75 89
76 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false); 90 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
91 "Http Listener port", DefaultHttpPort.ToString(), false);
77 } 92 }
78 93
79 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 94 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -81,41 +96,41 @@ namespace OpenSim.Framework
81 switch (configuration_key) 96 switch (configuration_key)
82 { 97 {
83 case "grid_owner": 98 case "grid_owner":
84 this.GridOwner = (string)configuration_result; 99 GridOwner = (string) configuration_result;
85 break; 100 break;
86 case "default_asset_server": 101 case "default_asset_server":
87 this.DefaultAssetServer = (string)configuration_result; 102 DefaultAssetServer = (string) configuration_result;
88 break; 103 break;
89 case "asset_send_key": 104 case "asset_send_key":
90 this.AssetSendKey = (string)configuration_result; 105 AssetSendKey = (string) configuration_result;
91 break; 106 break;
92 case "asset_recv_key": 107 case "asset_recv_key":
93 this.AssetRecvKey = (string)configuration_result; 108 AssetRecvKey = (string) configuration_result;
94 break; 109 break;
95 case "default_user_server": 110 case "default_user_server":
96 this.DefaultUserServer = (string)configuration_result; 111 DefaultUserServer = (string) configuration_result;
97 break; 112 break;
98 case "user_send_key": 113 case "user_send_key":
99 this.UserSendKey = (string)configuration_result; 114 UserSendKey = (string) configuration_result;
100 break; 115 break;
101 case "user_recv_key": 116 case "user_recv_key":
102 this.UserRecvKey = (string)configuration_result; 117 UserRecvKey = (string) configuration_result;
103 break; 118 break;
104 case "sim_send_key": 119 case "sim_send_key":
105 this.SimSendKey = (string)configuration_result; 120 SimSendKey = (string) configuration_result;
106 break; 121 break;
107 case "sim_recv_key": 122 case "sim_recv_key":
108 this.SimRecvKey = (string)configuration_result; 123 SimRecvKey = (string) configuration_result;
109 break; 124 break;
110 case "database_provider": 125 case "database_provider":
111 this.DatabaseProvider = (string)configuration_result; 126 DatabaseProvider = (string) configuration_result;
112 break; 127 break;
113 case "http_port": 128 case "http_port":
114 HttpPort = (uint)configuration_result; 129 HttpPort = (uint) configuration_result;
115 break; 130 break;
116 } 131 }
117 132
118 return true; 133 return true;
119 } 134 }
120 } 135 }
121} 136} \ No newline at end of file
diff --git a/OpenSim/Framework/General/IAssetProvider.cs b/OpenSim/Framework/General/IAssetProvider.cs
index 42dbf1f..f452822 100644
--- a/OpenSim/Framework/General/IAssetProvider.cs
+++ b/OpenSim/Framework/General/IAssetProvider.cs
@@ -26,15 +26,11 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32using OpenSim.Framework;
33using libsecondlife; 29using libsecondlife;
34 30
35namespace OpenSim.Framework 31namespace OpenSim.Framework
36{ 32{
37 public interface IAssetProvider : IPlugin 33 public interface IAssetProvider : IPlugin
38 { 34 {
39 AssetBase FetchAsset(LLUUID uuid); 35 AssetBase FetchAsset(LLUUID uuid);
40 void CreateAsset(AssetBase asset); 36 void CreateAsset(AssetBase asset);
@@ -42,4 +38,4 @@ namespace OpenSim.Framework
42 bool ExistsAsset(LLUUID uuid); 38 bool ExistsAsset(LLUUID uuid);
43 void CommitAssets(); // force a sync to the database 39 void CommitAssets(); // force a sync to the database
44 } 40 }
45} 41} \ No newline at end of file
diff --git a/OpenSim/Framework/General/IAssetServer.cs b/OpenSim/Framework/General/IAssetServer.cs
index ae86c8c..f4cb533 100644
--- a/OpenSim/Framework/General/IAssetServer.cs
+++ b/OpenSim/Framework/General/IAssetServer.cs
@@ -28,14 +28,12 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife; 30using libsecondlife;
31using OpenSim.Framework;
32 31
33namespace OpenSim.Framework 32namespace OpenSim.Framework
34{ 33{
35 /// <summary> 34 /// <summary>
36 /// Description of IAssetServer. 35 /// Description of IAssetServer.
37 /// </summary> 36 /// </summary>
38
39 public interface IAssetServer 37 public interface IAssetServer
40 { 38 {
41 void SetReceiver(IAssetReceiver receiver); 39 void SetReceiver(IAssetReceiver receiver);
@@ -68,4 +66,4 @@ namespace OpenSim.Framework
68 public LLUUID AssetID; 66 public LLUUID AssetID;
69 public bool IsTexture; 67 public bool IsTexture;
70 } 68 }
71} 69} \ No newline at end of file
diff --git a/OpenSim/Framework/General/IClientAPI.cs b/OpenSim/Framework/General/IClientAPI.cs
index 8c81eae..c7ec514 100644
--- a/OpenSim/Framework/General/IClientAPI.cs
+++ b/OpenSim/Framework/General/IClientAPI.cs
@@ -30,31 +30,28 @@ using System.Collections.Generic;
30using System.Net; 30using System.Net;
31using libsecondlife; 31using libsecondlife;
32using libsecondlife.Packets; 32using libsecondlife.Packets;
33using OpenSim.Framework;
34 33
35namespace OpenSim.Framework 34namespace OpenSim.Framework
36{ 35{
37 // Base Args Interface 36 // Base Args Interface
38 public interface IEventArgs 37 public interface IEventArgs
39 { 38 {
40 IScene Scene 39 IScene Scene { get; set; }
41 {
42 get;
43 set;
44 }
45 40
46 IClientAPI Sender 41 IClientAPI Sender { get; set; }
47 {
48 get;
49 set;
50 }
51 } 42 }
52 43
53 public delegate void ViewerEffectEventHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock); 44 public delegate void ViewerEffectEventHandler(IClientAPI sender, ViewerEffectPacket.EffectBlock[] effectBlock);
54 45
55 public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e); 46 public delegate void ChatFromViewer(Object sender, ChatFromViewerArgs e);
56 47
57 public enum ChatTypeEnum { Whisper = 0, Say = 1, Shout = 2, Broadcast = 0xFF }; 48 public enum ChatTypeEnum
49 {
50 Whisper = 0,
51 Say = 1,
52 Shout = 2,
53 Broadcast = 0xFF
54 } ;
58 55
59 /// <summary> 56 /// <summary>
60 /// ChatFromViewer Arguments 57 /// ChatFromViewer Arguments
@@ -163,68 +160,127 @@ namespace OpenSim.Framework
163 160
164 public delegate void TextureRequest(Object sender, TextureRequestArgs e); 161 public delegate void TextureRequest(Object sender, TextureRequestArgs e);
165 162
166 public delegate void ImprovedInstantMessage(LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp, string fromAgentName, string message, byte dialog); // Cut down from full list 163 public delegate void ImprovedInstantMessage(
164 LLUUID fromAgentID, LLUUID fromAgentSession, LLUUID toAgentID, LLUUID imSessionID, uint timestamp,
165 string fromAgentName, string message, byte dialog); // Cut down from full list
167 public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos); 166 public delegate void RezObject(IClientAPI remoteClient, LLUUID itemID, LLVector3 pos);
168 public delegate void ModifyTerrain(float height, float seconds, byte size, byte action, float north, float west, IClientAPI remoteClient); 167
168 public delegate void ModifyTerrain(
169 float height, float seconds, byte size, byte action, float north, float west, IClientAPI remoteClient);
170
169 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam); 171 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
172
170 public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID, int seq); 173 public delegate void StartAnim(IClientAPI remoteClient, LLUUID animID, int seq);
174
171 public delegate void LinkObjects(uint parent, List<uint> children); 175 public delegate void LinkObjects(uint parent, List<uint> children);
176
172 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY); 177 public delegate void RequestMapBlocks(IClientAPI remoteClient, int minX, int minY, int maxX, int maxY);
173 public delegate void TeleportLocationRequest(IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags); 178
179 public delegate void TeleportLocationRequest(
180 IClientAPI remoteClient, ulong regionHandle, LLVector3 position, LLVector3 lookAt, uint flags);
181
174 public delegate void DisconnectUser(); 182 public delegate void DisconnectUser();
183
175 public delegate void RequestAvatarProperties(IClientAPI remoteClient, LLUUID avatarID); 184 public delegate void RequestAvatarProperties(IClientAPI remoteClient, LLUUID avatarID);
176 185
177 public delegate void GenericCall(IClientAPI remoteClient); 186 public delegate void GenericCall(IClientAPI remoteClient);
187
178 public delegate void GenericCall2(); 188 public delegate void GenericCall2();
179 public delegate void GenericCall3(Packet packet); // really don't want to be passing packets in these events, so this is very temporary. 189
190 public delegate void GenericCall3(Packet packet);
191
192 // really don't want to be passing packets in these events, so this is very temporary.
180 public delegate void GenericCall4(Packet packet, IClientAPI remoteClient); 193 public delegate void GenericCall4(Packet packet, IClientAPI remoteClient);
194
181 public delegate void GenericCall5(IClientAPI remoteClient, bool status); 195 public delegate void GenericCall5(IClientAPI remoteClient, bool status);
196
182 public delegate void GenericCall6(LLUUID uid); 197 public delegate void GenericCall6(LLUUID uid);
198
183 public delegate void GenericCall7(uint localID, string message); 199 public delegate void GenericCall7(uint localID, string message);
184 200
185 public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock); 201 public delegate void UpdateShape(uint localID, ObjectShapePacket.ObjectDataBlock shapeBlock);
202
186 public delegate void ObjectExtraParams(uint localID, ushort type, bool inUse, byte[] data); 203 public delegate void ObjectExtraParams(uint localID, ushort type, bool inUse, byte[] data);
204
187 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient); 205 public delegate void ObjectSelect(uint localID, IClientAPI remoteClient);
206
188 public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient); 207 public delegate void ObjectDeselect(uint localID, IClientAPI remoteClient);
208
189 public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient); 209 public delegate void UpdatePrimFlags(uint localID, Packet packet, IClientAPI remoteClient);
210
190 public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient); 211 public delegate void UpdatePrimTexture(uint localID, byte[] texture, IClientAPI remoteClient);
212
191 public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient); 213 public delegate void UpdateVector(uint localID, LLVector3 pos, IClientAPI remoteClient);
214
192 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); 215 public delegate void UpdatePrimRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);
216
193 public delegate void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient); 217 public delegate void UpdatePrimSingleRotation(uint localID, LLQuaternion rot, IClientAPI remoteClient);
194 public delegate void UpdatePrimGroupRotation(uint localID,LLVector3 pos, LLQuaternion rot, IClientAPI remoteClient); 218
219 public delegate void UpdatePrimGroupRotation(uint localID, LLVector3 pos, LLQuaternion rot, IClientAPI remoteClient);
220
195 public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags); 221 public delegate void ObjectDuplicate(uint localID, LLVector3 offset, uint dupeFlags);
222
196 public delegate void StatusChange(bool status); 223 public delegate void StatusChange(bool status);
224
197 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status); 225 public delegate void NewAvatar(IClientAPI remoteClient, LLUUID agentID, bool status);
226
198 public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation); 227 public delegate void UpdateAgent(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation);
228
199 public delegate void AgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID); 229 public delegate void AgentRequestSit(IClientAPI remoteClient, LLUUID agentID, LLUUID targetID);
230
200 public delegate void AgentSit(IClientAPI remoteClient, LLUUID agentID); 231 public delegate void AgentSit(IClientAPI remoteClient, LLUUID agentID);
232
201 public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient); 233 public delegate void MoveObject(LLUUID objectID, LLVector3 offset, LLVector3 grapPos, IClientAPI remoteClient);
202 234
203 public delegate void ParcelPropertiesRequest(int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client); 235 public delegate void ParcelPropertiesRequest(
236 int start_x, int start_y, int end_x, int end_y, int sequence_id, bool snap_selection, IClientAPI remote_client);
237
204 public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client); 238 public delegate void ParcelDivideRequest(int west, int south, int east, int north, IClientAPI remote_client);
239
205 public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client); 240 public delegate void ParcelJoinRequest(int west, int south, int east, int north, IClientAPI remote_client);
241
206 public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client); 242 public delegate void ParcelPropertiesUpdateRequest(ParcelPropertiesUpdatePacket packet, IClientAPI remote_client);
243
207 public delegate void ParcelSelectObjects(int land_local_id, int request_type, IClientAPI remote_client); 244 public delegate void ParcelSelectObjects(int land_local_id, int request_type, IClientAPI remote_client);
245
208 public delegate void ParcelObjectOwnerRequest(int local_id, IClientAPI remote_client); 246 public delegate void ParcelObjectOwnerRequest(int local_id, IClientAPI remote_client);
247
209 public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client); 248 public delegate void EstateOwnerMessageRequest(EstateOwnerMessagePacket packet, IClientAPI remote_client);
210 249
211 public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client); 250 public delegate void UUIDNameRequest(LLUUID id, IClientAPI remote_client);
212 251
213 public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape); 252 public delegate void AddNewPrim(LLUUID ownerID, LLVector3 pos, PrimitiveBaseShape shape);
214 253
215 public delegate void CreateInventoryFolder(IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID); 254 public delegate void CreateInventoryFolder(
216 public delegate void CreateNewInventoryItem(IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name, sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask); 255 IClientAPI remoteClient, LLUUID folderID, ushort folderType, string folderName, LLUUID parentID);
217 public delegate void FetchInventoryDescendents(IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder); 256
257 public delegate void CreateNewInventoryItem(
258 IClientAPI remoteClient, LLUUID transActionID, LLUUID folderID, uint callbackID, string description, string name,
259 sbyte invType, sbyte type, byte wearableType, uint nextOwnerMask);
260
261 public delegate void FetchInventoryDescendents(
262 IClientAPI remoteClient, LLUUID folderID, LLUUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder);
263
218 public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID); 264 public delegate void FetchInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID ownerID);
265
219 public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID); 266 public delegate void RequestTaskInventory(IClientAPI remoteClient, uint localID);
220 public delegate void UpdateInventoryItemTransaction(IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID); 267
268 public delegate void UpdateInventoryItemTransaction(
269 IClientAPI remoteClient, LLUUID transactionID, LLUUID assetID, LLUUID itemID);
270
221 public delegate void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID); 271 public delegate void RezScript(IClientAPI remoteClient, LLUUID itemID, uint localID);
272
222 public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID); 273 public delegate void UpdateTaskInventory(IClientAPI remoteClient, LLUUID itemID, LLUUID folderID, uint localID);
274
223 public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID); 275 public delegate void RemoveTaskInventory(IClientAPI remoteClient, LLUUID itemID, uint localID);
224 276
225 public delegate void UDPAssetUploadRequest(IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal); 277 public delegate void UDPAssetUploadRequest(
278 IClientAPI remoteClient, LLUUID assetID, LLUUID transaction, sbyte type, byte[] data, bool storeLocal);
279
226 public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data); 280 public delegate void XferReceive(IClientAPI remoteClient, ulong xferID, uint packetID, byte[] data);
281
227 public delegate void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName); 282 public delegate void RequestXfer(IClientAPI remoteClient, ulong xferID, string fileName);
283
228 public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID); 284 public delegate void ConfirmXfer(IClientAPI remoteClient, ulong xferID, uint packetID);
229 285
230 public interface IClientAPI 286 public interface IClientAPI
@@ -298,37 +354,17 @@ namespace OpenSim.Framework
298 event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest; 354 event ParcelObjectOwnerRequest OnParcelObjectOwnerRequest;
299 event EstateOwnerMessageRequest OnEstateOwnerMessage; 355 event EstateOwnerMessageRequest OnEstateOwnerMessage;
300 356
301 LLVector3 StartPos 357 LLVector3 StartPos { get; set; }
302 {
303 get;
304 set;
305 }
306 358
307 LLUUID AgentId 359 LLUUID AgentId { get; }
308 {
309 get;
310 }
311 360
312 LLUUID SessionId 361 LLUUID SessionId { get; }
313 {
314 get;
315 }
316 362
317 string FirstName 363 string FirstName { get; }
318 {
319 get;
320 }
321 364
322 string LastName 365 string LastName { get; }
323 {
324 get;
325 }
326 366
327 uint CircuitCode 367 uint CircuitCode { get; set; }
328 {
329 get;
330 set;
331 }
332 368
333 void OutPacket(Packet newPack); 369 void OutPacket(Packet newPack);
334 void SendWearables(AvatarWearable[] wearables); 370 void SendWearables(AvatarWearable[] wearables);
@@ -339,28 +375,46 @@ namespace OpenSim.Framework
339 void SendRegionHandshake(RegionInfo regionInfo); 375 void SendRegionHandshake(RegionInfo regionInfo);
340 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 376 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
341 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 377 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
342 void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent, LLUUID imSessionID, string fromName, byte dialog, uint timeStamp); 378
379 void SendInstantMessage(LLUUID fromAgent, LLUUID fromAgentSession, string message, LLUUID toAgent,
380 LLUUID imSessionID, string fromName, byte dialog, uint timeStamp);
381
343 void SendLayerData(float[] map); 382 void SendLayerData(float[] map);
344 void SendLayerData(int px, int py, float[] map); 383 void SendLayerData(int px, int py, float[] map);
345 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); 384 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
346 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint ); 385 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
347 AgentCircuitData RequestClientInfo(); 386 AgentCircuitData RequestClientInfo();
348 void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint, string capsURL ); 387
388 void CrossRegion(ulong newRegionHandle, LLVector3 pos, LLVector3 lookAt, IPEndPoint newRegionExternalEndPoint,
389 string capsURL);
390
349 void SendMapBlock(List<MapBlockData> mapBlocks); 391 void SendMapBlock(List<MapBlockData> mapBlocks);
350 void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags); 392 void SendLocalTeleport(LLVector3 position, LLVector3 lookAt, uint flags);
351 void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID, uint flags, string capsURL); 393
394 void SendRegionTeleport(ulong regionHandle, byte simAccess, IPEndPoint regionExternalEndPoint, uint locationID,
395 uint flags, string capsURL);
396
352 void SendTeleportCancel(); 397 void SendTeleportCancel();
353 void SendTeleportLocationStart(); 398 void SendTeleportLocationStart();
354 void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance); 399 void SendMoneyBalance(LLUUID transaction, bool success, byte[] description, int balance);
355 400
356 void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos, byte[] textureEntry, uint parentID); 401 void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID,
357 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity, LLQuaternion rotation); 402 LLVector3 Pos, byte[] textureEntry, uint parentID);
403
404 void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position,
405 LLVector3 velocity, LLQuaternion rotation);
406
358 void SendCoarseLocationUpdate(List<LLVector3> CoarseLocations); 407 void SendCoarseLocationUpdate(List<LLVector3> CoarseLocations);
359 408
360 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); 409 void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint);
361 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape, LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text, uint parentID, byte[] particleSystem, LLQuaternion rotation); 410
362 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLQuaternion rotation); 411 void SendPrimitiveToClient(ulong regionHandle, ushort timeDilation, uint localID, PrimitiveBaseShape primShape,
363 412 LLVector3 pos, uint flags, LLUUID objectID, LLUUID ownerID, string text,
413 uint parentID, byte[] particleSystem, LLQuaternion rotation);
414
415 void SendPrimTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position,
416 LLQuaternion rotation);
417
364 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items); 418 void SendInventoryFolderDetails(LLUUID ownerID, LLUUID folderID, List<InventoryItemBase> items);
365 void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item); 419 void SendInventoryItemDetails(LLUUID ownerID, InventoryItemBase item);
366 void SendInventoryItemUpdate(InventoryItemBase Item); 420 void SendInventoryItemUpdate(InventoryItemBase Item);
@@ -375,10 +429,13 @@ namespace OpenSim.Framework
375 void SendAlertMessage(string message); 429 void SendAlertMessage(string message);
376 void SendAgentAlertMessage(string message, bool modal); 430 void SendAgentAlertMessage(string message, bool modal);
377 void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url); 431 void SendLoadURL(string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url);
378 bool AddMoney( int debit ); 432 bool AddMoney(int debit);
379 433
380 void SendViewerTime(int phase); 434 void SendViewerTime(int phase);
381 void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout, uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID); 435
436 void SendAvatarProperties(LLUUID avatarID, string aboutText, string bornOn, string charterMember, string flAbout,
437 uint flags, LLUUID flImageID, LLUUID imageID, string profileURL, LLUUID partnerID);
438
382 void SetDebug(int newDebug); 439 void SetDebug(int newDebug);
383 void InPacket(Packet NewPack); 440 void InPacket(Packet NewPack);
384 void Close(); 441 void Close();
@@ -387,4 +444,4 @@ namespace OpenSim.Framework
387 event Action<IClientAPI> OnConnectionClosed; 444 event Action<IClientAPI> OnConnectionClosed;
388 void SendLogoutPacket(); 445 void SendLogoutPacket();
389 } 446 }
390} 447} \ No newline at end of file
diff --git a/OpenSim/Framework/General/IGenericConfig.cs b/OpenSim/Framework/General/IGenericConfig.cs
index 8d45d47..0c9ee1e 100644
--- a/OpenSim/Framework/General/IGenericConfig.cs
+++ b/OpenSim/Framework/General/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/General/IPlugin.cs b/OpenSim/Framework/General/IPlugin.cs
index 6926ef4..cc835da 100644
--- a/OpenSim/Framework/General/IPlugin.cs
+++ b/OpenSim/Framework/General/IPlugin.cs
@@ -26,10 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32
33namespace OpenSim.Framework 29namespace OpenSim.Framework
34{ 30{
35 /// <summary> 31 /// <summary>
@@ -54,4 +50,4 @@ namespace OpenSim.Framework
54 /// </summary> 50 /// </summary>
55 void Initialise(); 51 void Initialise();
56 } 52 }
57} 53} \ No newline at end of file
diff --git a/OpenSim/Framework/General/IRegionCommsListener.cs b/OpenSim/Framework/General/IRegionCommsListener.cs
index 9ac9988..1a24469 100644
--- a/OpenSim/Framework/General/IRegionCommsListener.cs
+++ b/OpenSim/Framework/General/IRegionCommsListener.cs
@@ -27,14 +27,15 @@
27*/ 27*/
28using System.Collections.Generic; 28using System.Collections.Generic;
29using libsecondlife; 29using libsecondlife;
30using OpenSim.Framework.Interfaces;
31using OpenSim.Framework;
32 30
33namespace OpenSim.Framework 31namespace OpenSim.Framework
34{ 32{
35 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent); 33 public delegate void ExpectUserDelegate(ulong regionHandle, AgentCircuitData agent);
34
36 public delegate void UpdateNeighbours(List<RegionInfo> neighbours); 35 public delegate void UpdateNeighbours(List<RegionInfo> neighbours);
36
37 public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying); 37 public delegate void AgentCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying);
38
38 public delegate void AcknowledgeAgentCross(ulong regionHandle, LLUUID agentID); 39 public delegate void AcknowledgeAgentCross(ulong regionHandle, LLUUID agentID);
39 40
40 public interface IRegionCommsListener 41 public interface IRegionCommsListener
@@ -45,4 +46,4 @@ namespace OpenSim.Framework
45 event AcknowledgeAgentCross OnAcknowledgeAgentCrossed; 46 event AcknowledgeAgentCross OnAcknowledgeAgentCrossed;
46 event UpdateNeighbours OnNeighboursUpdate; 47 event UpdateNeighbours OnNeighboursUpdate;
47 } 48 }
48} 49} \ No newline at end of file
diff --git a/OpenSim/Framework/General/IScene.cs b/OpenSim/Framework/General/IScene.cs
index 9f03a04..cf5ee93 100644
--- a/OpenSim/Framework/General/IScene.cs
+++ b/OpenSim/Framework/General/IScene.cs
@@ -26,7 +26,6 @@
26* 26*
27*/ 27*/
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
@@ -34,14 +33,11 @@ namespace OpenSim.Framework
34 { 33 {
35 void AddNewClient(IClientAPI client, bool child); 34 void AddNewClient(IClientAPI client, bool child);
36 void RemoveClient(LLUUID agentID); 35 void RemoveClient(LLUUID agentID);
37 36
38 RegionInfo RegionInfo { get; } 37 RegionInfo RegionInfo { get; }
39 object SyncRoot { get; } 38 object SyncRoot { get; }
40 uint NextLocalId { get; } 39 uint NextLocalId { get; }
41 40
42 ClientManager ClientManager 41 ClientManager ClientManager { get; }
43 {
44 get;
45 }
46 } 42 }
47} 43} \ No newline at end of file
diff --git a/OpenSim/Framework/General/IUserData.cs b/OpenSim/Framework/General/IUserData.cs
index e1e9c99..b955ef1 100644
--- a/OpenSim/Framework/General/IUserData.cs
+++ b/OpenSim/Framework/General/IUserData.cs
@@ -26,7 +26,6 @@
26* 26*
27*/ 27*/
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework;
30 29
31namespace OpenSim.Framework 30namespace OpenSim.Framework
32{ 31{
@@ -132,4 +131,4 @@ namespace OpenSim.Framework
132 /// </summary> 131 /// </summary>
133 void Initialise(); 132 void Initialise();
134 } 133 }
135} 134} \ No newline at end of file
diff --git a/OpenSim/Framework/General/IUserService.cs b/OpenSim/Framework/General/IUserService.cs
index 400c12b..bf1c7e8 100644
--- a/OpenSim/Framework/General/IUserService.cs
+++ b/OpenSim/Framework/General/IUserService.cs
@@ -26,7 +26,6 @@
26* 26*
27*/ 27*/
28using libsecondlife; 28using libsecondlife;
29using OpenSim.Framework;
30 29
31namespace OpenSim.Framework.Interfaces 30namespace OpenSim.Framework.Interfaces
32{ 31{
diff --git a/OpenSim/Framework/General/InventoryItemBase.cs b/OpenSim/Framework/General/InventoryItemBase.cs
index 27124d9..45700ae 100644
--- a/OpenSim/Framework/General/InventoryItemBase.cs
+++ b/OpenSim/Framework/General/InventoryItemBase.cs
@@ -39,50 +39,62 @@ namespace OpenSim.Framework
39 /// A UUID containing the ID for the inventory item itself 39 /// A UUID containing the ID for the inventory item itself
40 /// </summary> 40 /// </summary>
41 public LLUUID inventoryID; 41 public LLUUID inventoryID;
42
42 /// <summary> 43 /// <summary>
43 /// The UUID of the associated asset on the asset server 44 /// The UUID of the associated asset on the asset server
44 /// </summary> 45 /// </summary>
45 public LLUUID assetID; 46 public LLUUID assetID;
47
46 /// <summary> 48 /// <summary>
47 /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc) 49 /// This is an enumerated value determining the type of asset (eg Notecard, Sound, Object, etc)
48 /// </summary> 50 /// </summary>
49 public int assetType; 51 public int assetType;
52
50 /// <summary> 53 /// <summary>
51 /// The type of inventory item. (Can be slightly different to the asset type 54 /// The type of inventory item. (Can be slightly different to the asset type
52 /// </summary> 55 /// </summary>
53 public int invType; 56 public int invType;
57
54 /// <summary> 58 /// <summary>
55 /// The folder this item is contained in 59 /// The folder this item is contained in
56 /// </summary> 60 /// </summary>
57 public LLUUID parentFolderID; 61 public LLUUID parentFolderID;
62
58 /// <summary> 63 /// <summary>
59 /// The owner of this inventory item 64 /// The owner of this inventory item
60 /// </summary> 65 /// </summary>
61 public LLUUID avatarID; 66 public LLUUID avatarID;
67
62 /// <summary> 68 /// <summary>
63 /// The creator of this item 69 /// The creator of this item
64 /// </summary> 70 /// </summary>
65 public LLUUID creatorsID; 71 public LLUUID creatorsID;
72
66 /// <summary> 73 /// <summary>
67 /// The name of the inventory item (must be less than 64 characters) 74 /// The name of the inventory item (must be less than 64 characters)
68 /// </summary> 75 /// </summary>
69 public string inventoryName; 76 public string inventoryName;
77
70 /// <summary> 78 /// <summary>
71 /// The description of the inventory item (must be less than 64 characters) 79 /// The description of the inventory item (must be less than 64 characters)
72 /// </summary> 80 /// </summary>
73 public string inventoryDescription; 81 public string inventoryDescription;
82
74 /// <summary> 83 /// <summary>
75 /// A mask containing the permissions for the next owner (cannot be enforced) 84 /// A mask containing the permissions for the next owner (cannot be enforced)
76 /// </summary> 85 /// </summary>
77 public uint inventoryNextPermissions; 86 public uint inventoryNextPermissions;
87
78 /// <summary> 88 /// <summary>
79 /// A mask containing permissions for the current owner (cannot be enforced) 89 /// A mask containing permissions for the current owner (cannot be enforced)
80 /// </summary> 90 /// </summary>
81 public uint inventoryCurrentPermissions; 91 public uint inventoryCurrentPermissions;
92
82 /// <summary> 93 /// <summary>
83 /// 94 ///
84 /// </summary> 95 /// </summary>
85 public uint inventoryBasePermissions; 96 public uint inventoryBasePermissions;
97
86 /// <summary> 98 /// <summary>
87 /// 99 ///
88 /// </summary> 100 /// </summary>
@@ -98,22 +110,27 @@ namespace OpenSim.Framework
98 /// The name of the folder (64 characters or less) 110 /// The name of the folder (64 characters or less)
99 /// </summary> 111 /// </summary>
100 public string name; 112 public string name;
113
101 /// <summary> 114 /// <summary>
102 /// The agent who's inventory this is contained by 115 /// The agent who's inventory this is contained by
103 /// </summary> 116 /// </summary>
104 public LLUUID agentID; 117 public LLUUID agentID;
118
105 /// <summary> 119 /// <summary>
106 /// The folder this folder is contained in 120 /// The folder this folder is contained in
107 /// </summary> 121 /// </summary>
108 public LLUUID parentID; 122 public LLUUID parentID;
123
109 /// <summary> 124 /// <summary>
110 /// The UUID for this folder 125 /// The UUID for this folder
111 /// </summary> 126 /// </summary>
112 public LLUUID folderID; 127 public LLUUID folderID;
128
113 /// <summary> 129 /// <summary>
114 /// Tyep of Items normally stored in this folder 130 /// Tyep of Items normally stored in this folder
115 /// </summary> 131 /// </summary>
116 public short type; 132 public short type;
133
117 /// <summary> 134 /// <summary>
118 /// 135 ///
119 /// </summary> 136 /// </summary>
@@ -225,4 +242,4 @@ namespace OpenSim.Framework
225 /// <param name="folder">The id of the folder</param> 242 /// <param name="folder">The id of the folder</param>
226 void deleteInventoryFolder(LLUUID folder); 243 void deleteInventoryFolder(LLUUID folder);
227 } 244 }
228} 245} \ No newline at end of file
diff --git a/OpenSim/Framework/General/LandData.cs b/OpenSim/Framework/General/LandData.cs
index 414b613..cab71a9 100644
--- a/OpenSim/Framework/General/LandData.cs
+++ b/OpenSim/Framework/General/LandData.cs
@@ -29,92 +29,95 @@ using libsecondlife;
29 29
30namespace OpenSim.Framework 30namespace OpenSim.Framework
31{ 31{
32 32 public class LandData
33 public class LandData 33 {
34 { 34 public byte[] landBitmapByteArray = new byte[512];
35 public byte[] landBitmapByteArray = new byte[512]; 35 public string landName = "Your Parcel";
36 public string landName = "Your Parcel"; 36 public string landDesc = "";
37 public string landDesc = ""; 37 public LLUUID ownerID = new LLUUID();
38 public LLUUID ownerID = new LLUUID(); 38 public bool isGroupOwned = false;
39 public bool isGroupOwned = false; 39 public LLVector3 AABBMin = new LLVector3();
40 public LLVector3 AABBMin = new LLVector3(); 40 public LLVector3 AABBMax = new LLVector3();
41 public LLVector3 AABBMax = new LLVector3(); 41 public int area = 0;
42 public int area = 0; 42 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned
43 public uint auctionID = 0; //Unemplemented. If set to 0, not being auctioned 43 public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID
44 public LLUUID authBuyerID = new LLUUID(); //Unemplemented. Authorized Buyer's UUID 44 public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category
45 public Parcel.ParcelCategory category = new Parcel.ParcelCategory(); //Unemplemented. Parcel's chosen category 45 public int claimDate = 0; //Unemplemented
46 public int claimDate = 0; //Unemplemented 46 public int claimPrice = 0; //Unemplemented
47 public int claimPrice = 0; //Unemplemented 47 public LLUUID groupID = new LLUUID(); //Unemplemented
48 public LLUUID groupID = new LLUUID(); //Unemplemented 48 public int groupPrims = 0;
49 public int groupPrims = 0; 49 public int otherPrims = 0;
50 public int otherPrims = 0; 50 public int ownerPrims = 0;
51 public int ownerPrims = 0; 51 public int selectedPrims = 0;
52 public int selectedPrims = 0; 52 public int simwidePrims = 0;
53 public int simwidePrims = 0; 53 public int simwideArea = 0;
54 public int simwideArea = 0; 54 public int salePrice = 0; //Unemeplemented. Parcels price.
55 public int salePrice = 0; //Unemeplemented. Parcels price. 55 public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased;
56 public Parcel.ParcelStatus landStatus = Parcel.ParcelStatus.Leased; 56
57 public uint landFlags = (uint)Parcel.ParcelFlags.AllowFly | (uint)Parcel.ParcelFlags.AllowLandmark | (uint)Parcel.ParcelFlags.AllowAllObjectEntry | (uint)Parcel.ParcelFlags.AllowDeedToGroup | (uint)Parcel.ParcelFlags.AllowTerraform | (uint)Parcel.ParcelFlags.CreateObjects | (uint)Parcel.ParcelFlags.AllowOtherScripts | (uint)Parcel.ParcelFlags.SoundLocal ; 57 public uint landFlags = (uint) Parcel.ParcelFlags.AllowFly | (uint) Parcel.ParcelFlags.AllowLandmark |
58 public byte landingType = 0; 58 (uint) Parcel.ParcelFlags.AllowAllObjectEntry |
59 public byte mediaAutoScale = 0; 59 (uint) Parcel.ParcelFlags.AllowDeedToGroup | (uint) Parcel.ParcelFlags.AllowTerraform |
60 public LLUUID mediaID = LLUUID.Zero; 60 (uint) Parcel.ParcelFlags.CreateObjects | (uint) Parcel.ParcelFlags.AllowOtherScripts |
61 public int localID = 0; 61 (uint) Parcel.ParcelFlags.SoundLocal;
62 public LLUUID globalID = new LLUUID(); 62
63 public byte landingType = 0;
64 public byte mediaAutoScale = 0;
65 public LLUUID mediaID = LLUUID.Zero;
66 public int localID = 0;
67 public LLUUID globalID = new LLUUID();
63 68
64 public string mediaURL = ""; 69 public string mediaURL = "";
65 public string musicURL = ""; 70 public string musicURL = "";
66 public float passHours = 0; 71 public float passHours = 0;
67 public int passPrice = 0; 72 public int passPrice = 0;
68 public LLUUID snapshotID = LLUUID.Zero; 73 public LLUUID snapshotID = LLUUID.Zero;
69 public LLVector3 userLocation = new LLVector3(); 74 public LLVector3 userLocation = new LLVector3();
70 public LLVector3 userLookAt = new LLVector3(); 75 public LLVector3 userLookAt = new LLVector3();
71 76
72 public LandData() 77 public LandData()
73 { 78 {
74 globalID = LLUUID.Random(); 79 globalID = LLUUID.Random();
75 } 80 }
76 81
77 public LandData Copy() 82 public LandData Copy()
78 { 83 {
79 LandData landData = new LandData(); 84 LandData landData = new LandData();
80 85
81 landData.AABBMax = this.AABBMax; 86 landData.AABBMax = AABBMax;
82 landData.AABBMin = this.AABBMin; 87 landData.AABBMin = AABBMin;
83 landData.area = this.area; 88 landData.area = area;
84 landData.auctionID = this.auctionID; 89 landData.auctionID = auctionID;
85 landData.authBuyerID = this.authBuyerID; 90 landData.authBuyerID = authBuyerID;
86 landData.category = this.category; 91 landData.category = category;
87 landData.claimDate = this.claimDate; 92 landData.claimDate = claimDate;
88 landData.claimPrice = this.claimPrice; 93 landData.claimPrice = claimPrice;
89 landData.globalID = this.globalID; 94 landData.globalID = globalID;
90 landData.groupID = this.groupID; 95 landData.groupID = groupID;
91 landData.groupPrims = this.groupPrims; 96 landData.groupPrims = groupPrims;
92 landData.otherPrims = this.otherPrims; 97 landData.otherPrims = otherPrims;
93 landData.ownerPrims = this.ownerPrims; 98 landData.ownerPrims = ownerPrims;
94 landData.selectedPrims = this.selectedPrims; 99 landData.selectedPrims = selectedPrims;
95 landData.isGroupOwned = this.isGroupOwned; 100 landData.isGroupOwned = isGroupOwned;
96 landData.localID = this.localID; 101 landData.localID = localID;
97 landData.landingType = this.landingType; 102 landData.landingType = landingType;
98 landData.mediaAutoScale = this.mediaAutoScale; 103 landData.mediaAutoScale = mediaAutoScale;
99 landData.mediaID = this.mediaID; 104 landData.mediaID = mediaID;
100 landData.mediaURL = this.mediaURL; 105 landData.mediaURL = mediaURL;
101 landData.musicURL = this.musicURL; 106 landData.musicURL = musicURL;
102 landData.ownerID = this.ownerID; 107 landData.ownerID = ownerID;
103 landData.landBitmapByteArray = (byte[])this.landBitmapByteArray.Clone(); 108 landData.landBitmapByteArray = (byte[]) landBitmapByteArray.Clone();
104 landData.landDesc = this.landDesc; 109 landData.landDesc = landDesc;
105 landData.landFlags = this.landFlags; 110 landData.landFlags = landFlags;
106 landData.landName = this.landName; 111 landData.landName = landName;
107 landData.landStatus = this.landStatus; 112 landData.landStatus = landStatus;
108 landData.passHours = this.passHours; 113 landData.passHours = passHours;
109 landData.passPrice = this.passPrice; 114 landData.passPrice = passPrice;
110 landData.salePrice = this.salePrice; 115 landData.salePrice = salePrice;
111 landData.snapshotID = this.snapshotID; 116 landData.snapshotID = snapshotID;
112 landData.userLocation = this.userLocation; 117 landData.userLocation = userLocation;
113 landData.userLookAt = this.userLookAt; 118 landData.userLookAt = userLookAt;
114 119
115 return landData; 120 return landData;
116
117 }
118 } 121 }
119 122 }
120} 123} \ No newline at end of file
diff --git a/OpenSim/Framework/General/Login.cs b/OpenSim/Framework/General/Login.cs
index a55fd57..d9a5ab2 100644
--- a/OpenSim/Framework/General/Login.cs
+++ b/OpenSim/Framework/General/Login.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework
39 public LLUUID InventoryFolder; 39 public LLUUID InventoryFolder;
40 public LLUUID BaseFolder; 40 public LLUUID BaseFolder;
41 public uint CircuitCode; 41 public uint CircuitCode;
42 public string CapsPath =""; 42 public string CapsPath = "";
43 public LLVector3 StartPos; 43 public LLVector3 StartPos;
44 44
45 public Login() 45 public Login()
@@ -47,4 +47,4 @@ namespace OpenSim.Framework
47 StartPos = new LLVector3(128, 128, 70); 47 StartPos = new LLVector3(128, 128, 70);
48 } 48 }
49 } 49 }
50} 50} \ No newline at end of file
diff --git a/OpenSim/Framework/General/MapBlockData.cs b/OpenSim/Framework/General/MapBlockData.cs
index eafd65d..d794015 100644
--- a/OpenSim/Framework/General/MapBlockData.cs
+++ b/OpenSim/Framework/General/MapBlockData.cs
@@ -45,7 +45,6 @@ namespace OpenSim.Framework
45 45
46 public MapBlockData() 46 public MapBlockData()
47 { 47 {
48
49 } 48 }
50 } 49 }
51} 50} \ No newline at end of file
diff --git a/OpenSim/Framework/General/NeighbourInfo.cs b/OpenSim/Framework/General/NeighbourInfo.cs
index 771b844..457f7d0 100644
--- a/OpenSim/Framework/General/NeighbourInfo.cs
+++ b/OpenSim/Framework/General/NeighbourInfo.cs
@@ -39,4 +39,4 @@ namespace OpenSim.Framework
39 public string sim_ip; 39 public string sim_ip;
40 public uint sim_port; 40 public uint sim_port;
41 } 41 }
42} 42} \ No newline at end of file
diff --git a/OpenSim/Framework/General/NetworkServersInfo.cs b/OpenSim/Framework/General/NetworkServersInfo.cs
index 358e496..98d489e 100644
--- a/OpenSim/Framework/General/NetworkServersInfo.cs
+++ b/OpenSim/Framework/General/NetworkServersInfo.cs
@@ -25,12 +25,9 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using System;
29using OpenSim.Framework.Console;
30using OpenSim.Framework.Interfaces;
31using OpenSim.Framework;
32 28
33using Nini.Config; 29using Nini.Config;
30
34namespace OpenSim.Framework 31namespace OpenSim.Framework
35{ 32{
36 public class NetworkServersInfo 33 public class NetworkServersInfo
@@ -63,12 +60,14 @@ namespace OpenSim.Framework
63 } 60 }
64 61
65 private uint? m_defaultHomeLocX; 62 private uint? m_defaultHomeLocX;
63
66 public uint DefaultHomeLocX 64 public uint DefaultHomeLocX
67 { 65 {
68 get { return m_defaultHomeLocX.Value; } 66 get { return m_defaultHomeLocX.Value; }
69 } 67 }
70 68
71 private uint? m_defaultHomeLocY; 69 private uint? m_defaultHomeLocY;
70
72 public uint DefaultHomeLocY 71 public uint DefaultHomeLocY
73 { 72 {
74 get { return m_defaultHomeLocY.Value; } 73 get { return m_defaultHomeLocY.Value; }
@@ -76,19 +75,22 @@ namespace OpenSim.Framework
76 75
77 public void loadFromConfiguration(IConfigSource config) 76 public void loadFromConfiguration(IConfigSource config)
78 { 77 {
79 m_defaultHomeLocX = (uint)config.Configs["StandAlone"].GetInt("default_location_x", 1000); 78 m_defaultHomeLocX = (uint) config.Configs["StandAlone"].GetInt("default_location_x", 1000);
80 m_defaultHomeLocY = (uint)config.Configs["StandAlone"].GetInt("default_location_y", 1000); 79 m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
81 80
82 HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort); 81 HttpListenerPort = config.Configs["Network"].GetInt("http_listener_port", DefaultHttpListenerPort);
83 RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort); 82 RemotingListenerPort = config.Configs["Network"].GetInt("remoting_listener_port", RemotingListenerPort);
84 GridURL = config.Configs["Network"].GetString("grid_server_url", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString()); 83 GridURL =
84 config.Configs["Network"].GetString("grid_server_url",
85 "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString());
85 GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null"); 86 GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
86 GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null"); 87 GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
87 UserURL = config.Configs["Network"].GetString("user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString()); 88 UserURL =
89 config.Configs["Network"].GetString("user_server_url",
90 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
88 UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); 91 UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
89 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); 92 UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
90 AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL); 93 AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
91
92 } 94 }
93 } 95 }
94} 96} \ No newline at end of file
diff --git a/OpenSim/Framework/General/PrimitiveBaseShape.cs b/OpenSim/Framework/General/PrimitiveBaseShape.cs
index 1799fb8..2123ecb 100644
--- a/OpenSim/Framework/General/PrimitiveBaseShape.cs
+++ b/OpenSim/Framework/General/PrimitiveBaseShape.cs
@@ -28,7 +28,6 @@
28 28
29using System.Xml.Serialization; 29using System.Xml.Serialization;
30using libsecondlife; 30using libsecondlife;
31using libsecondlife.Packets;
32 31
33namespace OpenSim.Framework 32namespace OpenSim.Framework
34{ 33{
@@ -93,47 +92,39 @@ namespace OpenSim.Framework
93 92
94 public ProfileShape ProfileShape 93 public ProfileShape ProfileShape
95 { 94 {
96 get 95 get { return (ProfileShape) (ProfileCurve & 0xf); }
97 {
98 return (ProfileShape)(ProfileCurve & 0xf);
99 }
100 set 96 set
101 { 97 {
102 byte oldValueMasked = (byte)(ProfileCurve & 0xf0); 98 byte oldValueMasked = (byte) (ProfileCurve & 0xf0);
103 ProfileCurve = (byte)(oldValueMasked | (byte)value); 99 ProfileCurve = (byte) (oldValueMasked | (byte) value);
104 } 100 }
105 } 101 }
106 102
107 [XmlIgnore] 103 [XmlIgnore]
108 public HollowShape HollowShape 104 public HollowShape HollowShape
109 { 105 {
110 get 106 get { return (HollowShape) (ProfileHollow & 0xf0); }
111 {
112 return (HollowShape)(ProfileHollow & 0xf0);
113 }
114 set 107 set
115 { 108 {
116 byte oldValueMasked = (byte)(ProfileHollow & 0xf0); 109 byte oldValueMasked = (byte) (ProfileHollow & 0xf0);
117 ProfileHollow = (byte)(oldValueMasked | (byte)value); 110 ProfileHollow = (byte) (oldValueMasked | (byte) value);
118 } 111 }
119 } 112 }
120 113
121 public LLVector3 PrimScale 114 public LLVector3 PrimScale
122 { 115 {
123 get 116 get { return Scale; }
124 {
125 return this.Scale;
126 }
127 } 117 }
128 118
129 static PrimitiveBaseShape() 119 static PrimitiveBaseShape()
130 { 120 {
131 m_defaultTextureEntry = new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")).ToBytes(); 121 m_defaultTextureEntry =
122 new LLObject.TextureEntry(new LLUUID("00000000-0000-0000-9999-000000000005")).ToBytes();
132 } 123 }
133 124
134 public PrimitiveBaseShape() 125 public PrimitiveBaseShape()
135 { 126 {
136 PCode = (byte)PCodeEnum.Primitive; 127 PCode = (byte) PCodeEnum.Primitive;
137 ExtraParams = new byte[1]; 128 ExtraParams = new byte[1];
138 TextureEntry = m_defaultTextureEntry; 129 TextureEntry = m_defaultTextureEntry;
139 } 130 }
@@ -141,12 +132,11 @@ namespace OpenSim.Framework
141 //void returns need to change of course 132 //void returns need to change of course
142 public virtual void GetMesh() 133 public virtual void GetMesh()
143 { 134 {
144
145 } 135 }
146 136
147 public PrimitiveBaseShape Copy() 137 public PrimitiveBaseShape Copy()
148 { 138 {
149 return (PrimitiveBaseShape)this.MemberwiseClone(); 139 return (PrimitiveBaseShape) MemberwiseClone();
150 } 140 }
151 } 141 }
152 142
@@ -155,7 +145,6 @@ namespace OpenSim.Framework
155 public GenericShape() 145 public GenericShape()
156 : base() 146 : base()
157 { 147 {
158
159 } 148 }
160 } 149 }
161 150
@@ -164,7 +153,7 @@ namespace OpenSim.Framework
164 public BoxShape() 153 public BoxShape()
165 : base() 154 : base()
166 { 155 {
167 PathCurve = (byte)Extrusion.Straight; 156 PathCurve = (byte) Extrusion.Straight;
168 ProfileShape = ProfileShape.Square; 157 ProfileShape = ProfileShape.Square;
169 PathScaleX = 100; 158 PathScaleX = 100;
170 PathScaleY = 100; 159 PathScaleY = 100;
@@ -193,12 +182,13 @@ namespace OpenSim.Framework
193 } 182 }
194 } 183 }
195 } 184 }
185
196 public class CylinderShape : PrimitiveBaseShape 186 public class CylinderShape : PrimitiveBaseShape
197 { 187 {
198 public CylinderShape() 188 public CylinderShape()
199 : base() 189 : base()
200 { 190 {
201 PathCurve = (byte)Extrusion.Straight; 191 PathCurve = (byte) Extrusion.Straight;
202 ProfileShape = ProfileShape.Circle; 192 ProfileShape = ProfileShape.Circle;
203 PathScaleX = 100; 193 PathScaleX = 100;
204 PathScaleY = 100; 194 PathScaleY = 100;
@@ -218,7 +208,7 @@ namespace OpenSim.Framework
218 208
219 private void SetRadius(float radius) 209 private void SetRadius(float radius)
220 { 210 {
221 Scale.X = Scale.Y = radius * 2f; 211 Scale.X = Scale.Y = radius*2f;
222 } 212 }
223 } 213 }
224} 214} \ No newline at end of file
diff --git a/OpenSim/Framework/General/Properties/AssemblyInfo.cs b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
index 655cffc..b3206a7 100644
--- a/OpenSim/Framework/General/Properties/AssemblyInfo.cs
+++ b/OpenSim/Framework/General/Properties/AssemblyInfo.cs
@@ -1,24 +1,28 @@
1using System.Reflection; 1using System.Reflection;
2using System.Runtime.InteropServices; 2using System.Runtime.InteropServices;
3
3// General Information about an assembly is controlled through the following 4// General Information about an assembly is controlled through the following
4// set of attributes. Change these attribute values to modify the information 5// set of attributes. Change these attribute values to modify the information
5// associated with an assembly. 6// associated with an assembly.
6[assembly: AssemblyTitle("OpenSim.FrameWork")] 7
7[assembly: AssemblyDescription("")] 8[assembly : AssemblyTitle("OpenSim.FrameWork")]
8[assembly: AssemblyConfiguration("")] 9[assembly : AssemblyDescription("")]
9[assembly: AssemblyCompany("")] 10[assembly : AssemblyConfiguration("")]
10[assembly: AssemblyProduct("OpenSim.FrameWork")] 11[assembly : AssemblyCompany("")]
11[assembly: AssemblyCopyright("Copyright © 2007")] 12[assembly : AssemblyProduct("OpenSim.FrameWork")]
12[assembly: AssemblyTrademark("")] 13[assembly : AssemblyCopyright("Copyright © 2007")]
13[assembly: AssemblyCulture("")] 14[assembly : AssemblyTrademark("")]
15[assembly : AssemblyCulture("")]
14 16
15// Setting ComVisible to false makes the types in this assembly not visible 17// Setting ComVisible to false makes the types in this assembly not visible
16// to COM components. If you need to access a type in this assembly from 18// to COM components. If you need to access a type in this assembly from
17// COM, set the ComVisible attribute to true on that type. 19// COM, set the ComVisible attribute to true on that type.
18[assembly: ComVisible(false)] 20
21[assembly : ComVisible(false)]
19 22
20// The following GUID is for the ID of the typelib if this project is exposed to COM 23// The following GUID is for the ID of the typelib if this project is exposed to COM
21[assembly: Guid("a08e20c7-f191-4137-b1f0-9291408fa521")] 24
25[assembly : Guid("a08e20c7-f191-4137-b1f0-9291408fa521")]
22 26
23// Version information for an assembly consists of the following four values: 27// Version information for an assembly consists of the following four values:
24// 28//
@@ -27,5 +31,6 @@ using System.Runtime.InteropServices;
27// Build Number 31// Build Number
28// Revision 32// Revision
29// 33//
30[assembly: AssemblyVersion("1.0.0.0")] 34
31[assembly: AssemblyFileVersion("1.0.0.0")] 35[assembly : AssemblyVersion("1.0.0.0")]
36[assembly : AssemblyFileVersion("1.0.0.0")] \ No newline at end of file
diff --git a/OpenSim/Framework/General/RegionCommsListener.cs b/OpenSim/Framework/General/RegionCommsListener.cs
index caa4af7..ee0d503 100644
--- a/OpenSim/Framework/General/RegionCommsListener.cs
+++ b/OpenSim/Framework/General/RegionCommsListener.cs
@@ -25,15 +25,13 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28using libsecondlife;
29using OpenSim.Framework.Interfaces;
30using OpenSim.Framework;
31 28
32using System.Collections.Generic; 29using System.Collections.Generic;
30using libsecondlife;
33 31
34namespace OpenSim.Framework 32namespace OpenSim.Framework
35{ 33{
36 public class RegionCommsListener :IRegionCommsListener 34 public class RegionCommsListener : IRegionCommsListener
37 { 35 {
38 public event ExpectUserDelegate OnExpectUser; 36 public event ExpectUserDelegate OnExpectUser;
39 public event GenericCall2 OnExpectChildAgent; 37 public event GenericCall2 OnExpectChildAgent;
@@ -46,11 +44,10 @@ namespace OpenSim.Framework
46 /// </summary> 44 /// </summary>
47 /// <param name="agent"></param> 45 /// <param name="agent"></param>
48 /// <returns></returns> 46 /// <returns></returns>
49 public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent) 47 public virtual bool TriggerExpectUser(ulong regionHandle, AgentCircuitData agent)
50 { 48 {
51 if(OnExpectUser != null) 49 if (OnExpectUser != null)
52 { 50 {
53
54 OnExpectUser(regionHandle, agent); 51 OnExpectUser(regionHandle, agent);
55 return true; 52 return true;
56 } 53 }
@@ -58,7 +55,8 @@ namespace OpenSim.Framework
58 return false; 55 return false;
59 } 56 }
60 57
61 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position, bool isFlying) 58 public virtual bool TriggerExpectAvatarCrossing(ulong regionHandle, LLUUID agentID, LLVector3 position,
59 bool isFlying)
62 { 60 {
63 if (OnAvatarCrossingIntoRegion != null) 61 if (OnAvatarCrossingIntoRegion != null)
64 { 62 {
@@ -111,4 +109,4 @@ namespace OpenSim.Framework
111 return false; 109 return false;
112 } 110 }
113 } 111 }
114} 112} \ No newline at end of file
diff --git a/OpenSim/Framework/General/RegionHandle.cs b/OpenSim/Framework/General/RegionHandle.cs
index d800e57..807a17c 100644
--- a/OpenSim/Framework/General/RegionHandle.cs
+++ b/OpenSim/Framework/General/RegionHandle.cs
@@ -28,13 +28,14 @@
28 28
29using System; 29using System;
30using System.Net; 30using System.Net;
31using System.Net.Sockets;
31 32
32namespace OpenSim.Framework 33namespace OpenSim.Framework
33{ 34{
34 /// <summary> 35 /// <summary>
35 /// A class for manipulating RegionHandle coordinates 36 /// A class for manipulating RegionHandle coordinates
36 /// </summary> 37 /// </summary>
37 class RegionHandle 38 internal class RegionHandle
38 { 39 {
39 private UInt64 handle; 40 private UInt64 handle;
40 41
@@ -48,28 +49,28 @@ namespace OpenSim.Framework
48 { 49 {
49 IPAddress addr = IPAddress.Parse(ip); 50 IPAddress addr = IPAddress.Parse(ip);
50 51
51 if (addr.AddressFamily != System.Net.Sockets.AddressFamily.InterNetwork) 52 if (addr.AddressFamily != AddressFamily.InterNetwork)
52 throw new Exception("Bad RegionHandle Parameter - must be an IPv4 address"); 53 throw new Exception("Bad RegionHandle Parameter - must be an IPv4 address");
53 54
54 uint baseHandle = BitConverter.ToUInt32(addr.GetAddressBytes(), 0); 55 uint baseHandle = BitConverter.ToUInt32(addr.GetAddressBytes(), 0);
55 56
56 // Split the IP address in half 57 // Split the IP address in half
57 short a = (short)((baseHandle << 16) & 0xFFFF); 58 short a = (short) ((baseHandle << 16) & 0xFFFF);
58 short b = (short)((baseHandle << 0) & 0xFFFF); 59 short b = (short) ((baseHandle << 0) & 0xFFFF);
59 60
60 // Raise the bounds a little 61 // Raise the bounds a little
61 uint nx = (uint)x; 62 uint nx = (uint) x;
62 uint ny = (uint)y; 63 uint ny = (uint) y;
63 64
64 // Multiply grid coords to get region coords 65 // Multiply grid coords to get region coords
65 nx *= 256; 66 nx *= 256;
66 ny *= 256; 67 ny *= 256;
67 68
68 // Stuff the IP address in too 69 // Stuff the IP address in too
69 nx = (uint)a << 16; 70 nx = (uint) a << 16;
70 ny = (uint)b << 16; 71 ny = (uint) b << 16;
71 72
72 handle = ((UInt64)nx << 32) | (uint)ny; 73 handle = ((UInt64) nx << 32) | (uint) ny;
73 } 74 }
74 75
75 /// <summary> 76 /// <summary>
@@ -79,7 +80,7 @@ namespace OpenSim.Framework
79 /// <param name="y">Grid Y Coordinate</param> 80 /// <param name="y">Grid Y Coordinate</param>
80 public RegionHandle(uint x, uint y) 81 public RegionHandle(uint x, uint y)
81 { 82 {
82 handle = ((x * 256) << 32) | (y * 256); 83 handle = ((x*256) << 32) | (y*256);
83 } 84 }
84 85
85 /// <summary> 86 /// <summary>
@@ -118,10 +119,10 @@ namespace OpenSim.Framework
118 /// <returns>Grid Server IP Address</returns> 119 /// <returns>Grid Server IP Address</returns>
119 public IPAddress getGridIP() 120 public IPAddress getGridIP()
120 { 121 {
121 uint a = (uint)((handle >> 16) & 0xFFFF); 122 uint a = (uint) ((handle >> 16) & 0xFFFF);
122 uint b = (uint)((handle >> 48) & 0xFFFF); 123 uint b = (uint) ((handle >> 48) & 0xFFFF);
123 124
124 return new IPAddress((long)(a << 16) | (long)b); 125 return new IPAddress((long) (a << 16) | (long) b);
125 } 126 }
126 127
127 /// <summary> 128 /// <summary>
@@ -130,7 +131,7 @@ namespace OpenSim.Framework
130 /// <returns>X Coordinate</returns> 131 /// <returns>X Coordinate</returns>
131 public uint getGridX() 132 public uint getGridX()
132 { 133 {
133 uint x = (uint)((handle >> 32) & 0xFFFF); 134 uint x = (uint) ((handle >> 32) & 0xFFFF);
134 135
135 return x; 136 return x;
136 } 137 }
@@ -141,9 +142,9 @@ namespace OpenSim.Framework
141 /// <returns>Y Coordinate</returns> 142 /// <returns>Y Coordinate</returns>
142 public uint getGridY() 143 public uint getGridY()
143 { 144 {
144 uint y = (uint)((handle >> 0) & 0xFFFF); 145 uint y = (uint) ((handle >> 0) & 0xFFFF);
145 146
146 return y; 147 return y;
147 } 148 }
148 } 149 }
149} 150} \ No newline at end of file
diff --git a/OpenSim/Framework/General/RegionInfo.cs b/OpenSim/Framework/General/RegionInfo.cs
index 32f0c76..c14afd2 100644
--- a/OpenSim/Framework/General/RegionInfo.cs
+++ b/OpenSim/Framework/General/RegionInfo.cs
@@ -26,14 +26,10 @@
26* 26*
27*/ 27*/
28using System; 28using System;
29using System.Globalization;
30using System.Net; 29using System.Net;
31using System.Net.Sockets; 30using System.Net.Sockets;
32using Nini.Config;
33using libsecondlife; 31using libsecondlife;
34using OpenSim.Framework.Console; 32using Nini.Config;
35using OpenSim.Framework.Interfaces;
36using OpenSim.Framework;
37 33
38namespace OpenSim.Framework 34namespace OpenSim.Framework
39{ 35{
@@ -45,7 +41,6 @@ namespace OpenSim.Framework
45 41
46 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) 42 public SimpleRegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri)
47 { 43 {
48
49 m_regionLocX = regionLocX; 44 m_regionLocX = regionLocX;
50 m_regionLocY = regionLocY; 45 m_regionLocY = regionLocY;
51 46
@@ -55,7 +50,6 @@ namespace OpenSim.Framework
55 50
56 public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, int port) 51 public SimpleRegionInfo(uint regionLocX, uint regionLocY, string externalUri, int port)
57 { 52 {
58
59 m_regionLocX = regionLocX; 53 m_regionLocX = regionLocX;
60 m_regionLocY = regionLocY; 54 m_regionLocY = regionLocY;
61 55
@@ -67,16 +61,11 @@ namespace OpenSim.Framework
67 public LLUUID RegionID = new LLUUID(); 61 public LLUUID RegionID = new LLUUID();
68 62
69 private uint m_remotingPort; 63 private uint m_remotingPort;
64
70 public uint RemotingPort 65 public uint RemotingPort
71 { 66 {
72 get 67 get { return m_remotingPort; }
73 { 68 set { m_remotingPort = value; }
74 return m_remotingPort;
75 }
76 set
77 {
78 m_remotingPort = value;
79 }
80 } 69 }
81 70
82 public string RemotingAddress; 71 public string RemotingAddress;
@@ -109,76 +98,49 @@ namespace OpenSim.Framework
109 ia = Adr; 98 ia = Adr;
110 break; 99 break;
111 } 100 }
112
113 } 101 }
114 102
115 return new IPEndPoint(ia, m_internalEndPoint.Port); 103 return new IPEndPoint(ia, m_internalEndPoint.Port);
116 } 104 }
117 105
118 set 106 set { m_externalHostName = value.ToString(); }
119 {
120 m_externalHostName = value.ToString();
121 }
122 } 107 }
123 108
124 protected string m_externalHostName; 109 protected string m_externalHostName;
110
125 public string ExternalHostName 111 public string ExternalHostName
126 { 112 {
127 get 113 get { return m_externalHostName; }
128 { 114 set { m_externalHostName = value; }
129 return m_externalHostName;
130 }
131 set
132 {
133 m_externalHostName = value;
134 }
135 } 115 }
136 116
137 protected IPEndPoint m_internalEndPoint; 117 protected IPEndPoint m_internalEndPoint;
118
138 public IPEndPoint InternalEndPoint 119 public IPEndPoint InternalEndPoint
139 { 120 {
140 get 121 get { return m_internalEndPoint; }
141 { 122 set { m_internalEndPoint = value; }
142 return m_internalEndPoint;
143 }
144 set
145 {
146 m_internalEndPoint = value;
147 }
148 } 123 }
149 124
150 protected uint? m_regionLocX; 125 protected uint? m_regionLocX;
126
151 public uint RegionLocX 127 public uint RegionLocX
152 { 128 {
153 get 129 get { return m_regionLocX.Value; }
154 { 130 set { m_regionLocX = value; }
155 return m_regionLocX.Value;
156 }
157 set
158 {
159 m_regionLocX = value;
160 }
161 } 131 }
162 132
163 protected uint? m_regionLocY; 133 protected uint? m_regionLocY;
134
164 public uint RegionLocY 135 public uint RegionLocY
165 { 136 {
166 get 137 get { return m_regionLocY.Value; }
167 { 138 set { m_regionLocY = value; }
168 return m_regionLocY.Value;
169 }
170 set
171 {
172 m_regionLocY = value;
173 }
174 } 139 }
175 140
176 public ulong RegionHandle 141 public ulong RegionHandle
177 { 142 {
178 get 143 get { return Util.UIntsToLong((RegionLocX*256), (RegionLocY*256)); }
179 {
180 return Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
181 }
182 } 144 }
183 } 145 }
184 146
@@ -196,80 +158,81 @@ namespace OpenSim.Framework
196 158
197 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote. 159 // Apparently, we're applying the same estatesettings regardless of whether it's local or remote.
198 private static EstateSettings m_estateSettings; 160 private static EstateSettings m_estateSettings;
161
199 public EstateSettings EstateSettings 162 public EstateSettings EstateSettings
200 { 163 {
201 get 164 get
202 { 165 {
203 if( m_estateSettings == null ) 166 if (m_estateSettings == null)
204 { 167 {
205 m_estateSettings = new EstateSettings(); 168 m_estateSettings = new EstateSettings();
206 } 169 }
207 170
208 return m_estateSettings; 171 return m_estateSettings;
209 } 172 }
210
211 } 173 }
212 174
213 public ConfigurationMember configMember; 175 public ConfigurationMember configMember;
176
214 public RegionInfo(string description, string filename) 177 public RegionInfo(string description, string filename)
215 { 178 {
216 configMember = new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration); 179 configMember =
180 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
217 configMember.performConfigurationRetrieve(); 181 configMember.performConfigurationRetrieve();
218 } 182 }
219 183
220 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) : 184 public RegionInfo(uint regionLocX, uint regionLocY, IPEndPoint internalEndPoint, string externalUri) :
221 base(regionLocX, regionLocY, internalEndPoint, externalUri) 185 base(regionLocX, regionLocY, internalEndPoint, externalUri)
222 { 186 {
223
224
225 } 187 }
226 188
227 public RegionInfo() 189 public RegionInfo()
228 { 190 {
229
230 } 191 }
231 192
232 //not in use, should swap to nini though. 193 //not in use, should swap to nini though.
233 public void LoadFromNiniSource(IConfigSource source) 194 public void LoadFromNiniSource(IConfigSource source)
234 { 195 {
235 this.LoadFromNiniSource(source, "RegionInfo"); 196 LoadFromNiniSource(source, "RegionInfo");
236 } 197 }
237 198
238 //not in use, should swap to nini though. 199 //not in use, should swap to nini though.
239 public void LoadFromNiniSource(IConfigSource source, string sectionName) 200 public void LoadFromNiniSource(IConfigSource source, string sectionName)
240 { 201 {
241 string errorMessage = ""; 202 string errorMessage = "";
242 this.RegionID = new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToStringHyphenated())); 203 RegionID =
243 this.RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test"); 204 new LLUUID(source.Configs[sectionName].GetString("Region_ID", LLUUID.Random().ToStringHyphenated()));
244 this.m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000")); 205 RegionName = source.Configs[sectionName].GetString("sim_name", "OpenSim Test");
245 this.m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000")); 206 m_regionLocX = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_x", "1000"));
246 this.DataStore = source.Configs[sectionName].GetString("datastore", "OpenSim.db"); 207 m_regionLocY = Convert.ToUInt32(source.Configs[sectionName].GetString("sim_location_y", "1000"));
208 DataStore = source.Configs[sectionName].GetString("datastore", "OpenSim.db");
247 209
248 string ipAddress = source.Configs[sectionName].GetString("internal_ip_address", "0.0.0.0"); 210 string ipAddress = source.Configs[sectionName].GetString("internal_ip_address", "0.0.0.0");
249 IPAddress ipAddressResult; 211 IPAddress ipAddressResult;
250 if (IPAddress.TryParse(ipAddress, out ipAddressResult)) 212 if (IPAddress.TryParse(ipAddress, out ipAddressResult))
251 { 213 {
252 this.m_internalEndPoint = new IPEndPoint(ipAddressResult, 0); 214 m_internalEndPoint = new IPEndPoint(ipAddressResult, 0);
253 } 215 }
254 else 216 else
255 { 217 {
256 errorMessage = "needs an IP Address (IPAddress)"; 218 errorMessage = "needs an IP Address (IPAddress)";
257 } 219 }
258 this.m_internalEndPoint.Port = source.Configs[sectionName].GetInt("internal_ip_port", NetworkServersInfo.DefaultHttpListenerPort); 220 m_internalEndPoint.Port =
221 source.Configs[sectionName].GetInt("internal_ip_port", NetworkServersInfo.DefaultHttpListenerPort);
259 222
260 string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1"); 223 string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1");
261 if (externalHost != "SYSTEMIP") 224 if (externalHost != "SYSTEMIP")
262 { 225 {
263 this.m_externalHostName = externalHost; 226 m_externalHostName = externalHost;
264 } 227 }
265 else 228 else
266 { 229 {
267 this.m_externalHostName = Util.GetLocalHost().ToString(); 230 m_externalHostName = Util.GetLocalHost().ToString();
268 } 231 }
269 232
270 this.MasterAvatarFirstName = source.Configs[sectionName].GetString("master_avatar_first", "Test"); 233 MasterAvatarFirstName = source.Configs[sectionName].GetString("master_avatar_first", "Test");
271 this.MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User"); 234 MasterAvatarLastName = source.Configs[sectionName].GetString("master_avatar_last", "User");
272 this.MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test"); 235 MasterAvatarSandboxPassword = source.Configs[sectionName].GetString("master_avatar_pass", "test");
273 236
274 if (errorMessage != "") 237 if (errorMessage != "")
275 { 238 {
@@ -279,17 +242,36 @@ namespace OpenSim.Framework
279 242
280 public void loadConfigurationOptions() 243 public void loadConfigurationOptions()
281 { 244 {
282 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID, "UUID of Region (Default is recommended, random UUID)", LLUUID.Random().ToString(), true); 245 configMember.addConfigurationOption("sim_UUID", ConfigurationOption.ConfigurationTypes.TYPE_LLUUID,
283 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Region Name", "OpenSim Test", false); 246 "UUID of Region (Default is recommended, random UUID)",
284 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (X Axis)", "1000", false); 247 LLUUID.Random().ToString(), true);
285 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Grid Location (Y Axis)", "1000", false); 248 configMember.addConfigurationOption("sim_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
286 configMember.addConfigurationOption("datastore", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Filename for local storage", "OpenSim.db", false); 249 "Region Name", "OpenSim Test", false);
287 configMember.addConfigurationOption("internal_ip_address", ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS, "Internal IP Address for incoming UDP client connections", "0.0.0.0", false); 250 configMember.addConfigurationOption("sim_location_x", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
288 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, "Internal IP Port for incoming UDP client connections", NetworkServersInfo.DefaultHttpListenerPort.ToString(), false); 251 "Grid Location (X Axis)", "1000", false);
289 configMember.addConfigurationOption("external_host_name", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "External Host Name", "127.0.0.1", false); 252 configMember.addConfigurationOption("sim_location_y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
290 configMember.addConfigurationOption("master_avatar_first", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "First Name of Master Avatar", "Test", false); 253 "Grid Location (Y Axis)", "1000", false);
291 configMember.addConfigurationOption("master_avatar_last", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Last Name of Master Avatar", "User", false); 254 configMember.addConfigurationOption("datastore",
292 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "(Sandbox Mode Only)Password for Master Avatar account", "test", false); 255 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
256 "Filename for local storage", "OpenSim.db", false);
257 configMember.addConfigurationOption("internal_ip_address",
258 ConfigurationOption.ConfigurationTypes.TYPE_IP_ADDRESS,
259 "Internal IP Address for incoming UDP client connections", "0.0.0.0",
260 false);
261 configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
262 "Internal IP Port for incoming UDP client connections",
263 NetworkServersInfo.DefaultHttpListenerPort.ToString(), false);
264 configMember.addConfigurationOption("external_host_name",
265 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
266 "External Host Name", "127.0.0.1", false);
267 configMember.addConfigurationOption("master_avatar_first",
268 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
269 "First Name of Master Avatar", "Test", false);
270 configMember.addConfigurationOption("master_avatar_last",
271 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
272 "Last Name of Master Avatar", "User", false);
273 configMember.addConfigurationOption("master_avatar_pass", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
274 "(Sandbox Mode Only)Password for Master Avatar account", "test", false);
293 } 275 }
294 276
295 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 277 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -297,51 +279,50 @@ namespace OpenSim.Framework
297 switch (configuration_key) 279 switch (configuration_key)
298 { 280 {
299 case "sim_UUID": 281 case "sim_UUID":
300 this.RegionID = (LLUUID)configuration_result; 282 RegionID = (LLUUID) configuration_result;
301 break; 283 break;
302 case "sim_name": 284 case "sim_name":
303 this.RegionName = (string)configuration_result; 285 RegionName = (string) configuration_result;
304 break; 286 break;
305 case "sim_location_x": 287 case "sim_location_x":
306 this.m_regionLocX = (uint)configuration_result; 288 m_regionLocX = (uint) configuration_result;
307 break; 289 break;
308 case "sim_location_y": 290 case "sim_location_y":
309 this.m_regionLocY = (uint)configuration_result; 291 m_regionLocY = (uint) configuration_result;
310 break; 292 break;
311 case "datastore": 293 case "datastore":
312 this.DataStore = (string)configuration_result; 294 DataStore = (string) configuration_result;
313 break; 295 break;
314 case "internal_ip_address": 296 case "internal_ip_address":
315 IPAddress address = (IPAddress)configuration_result; 297 IPAddress address = (IPAddress) configuration_result;
316 this.m_internalEndPoint = new IPEndPoint(address, 0); 298 m_internalEndPoint = new IPEndPoint(address, 0);
317 break; 299 break;
318 case "internal_ip_port": 300 case "internal_ip_port":
319 this.m_internalEndPoint.Port = (int)configuration_result; 301 m_internalEndPoint.Port = (int) configuration_result;
320 break; 302 break;
321 case "external_host_name": 303 case "external_host_name":
322 if ((string)configuration_result != "SYSTEMIP") 304 if ((string) configuration_result != "SYSTEMIP")
323 { 305 {
324 this.m_externalHostName = (string)configuration_result; 306 m_externalHostName = (string) configuration_result;
325 } 307 }
326 else 308 else
327 { 309 {
328 this.m_externalHostName = Util.GetLocalHost().ToString(); 310 m_externalHostName = Util.GetLocalHost().ToString();
329 } 311 }
330 break; 312 break;
331 case "master_avatar_first": 313 case "master_avatar_first":
332 this.MasterAvatarFirstName = (string)configuration_result; 314 MasterAvatarFirstName = (string) configuration_result;
333 break; 315 break;
334 case "master_avatar_last": 316 case "master_avatar_last":
335 this.MasterAvatarLastName = (string)configuration_result; 317 MasterAvatarLastName = (string) configuration_result;
336 break; 318 break;
337 case "master_avatar_pass": 319 case "master_avatar_pass":
338 string tempMD5Passwd = (string)configuration_result; 320 string tempMD5Passwd = (string) configuration_result;
339 this.MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + ""); 321 MasterAvatarSandboxPassword = Util.Md5Hash(Util.Md5Hash(tempMD5Passwd) + ":" + "");
340 break; 322 break;
341 } 323 }
342 324
343 return true; 325 return true;
344 } 326 }
345
346 } 327 }
347} 328} \ No newline at end of file
diff --git a/OpenSim/Framework/General/Remoting.cs b/OpenSim/Framework/General/Remoting.cs
index 330c078..667ae69 100644
--- a/OpenSim/Framework/General/Remoting.cs
+++ b/OpenSim/Framework/General/Remoting.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework
41 /// <para>When recieving data from the foreign host - run 'Authenticate' against the data and the attached byte[].</para> 41 /// <para>When recieving data from the foreign host - run 'Authenticate' against the data and the attached byte[].</para>
42 /// <para>Both hosts should be performing these operations for this to be effective.</para> 42 /// <para>Both hosts should be performing these operations for this to be effective.</para>
43 /// </remarks> 43 /// </remarks>
44 class RemoteDigest 44 internal class RemoteDigest
45 { 45 {
46 private byte[] currentHash; 46 private byte[] currentHash;
47 private byte[] secret; 47 private byte[] secret;
@@ -58,7 +58,7 @@ namespace OpenSim.Framework
58 public RemoteDigest(string sharedSecret, byte[] salt, string challenge) 58 public RemoteDigest(string sharedSecret, byte[] salt, string challenge)
59 { 59 {
60 SHA512 = new SHA512Managed(); 60 SHA512 = new SHA512Managed();
61 Rfc2898DeriveBytes RFC2898 = new Rfc2898DeriveBytes(sharedSecret,salt); 61 Rfc2898DeriveBytes RFC2898 = new Rfc2898DeriveBytes(sharedSecret, salt);
62 secret = RFC2898.GetBytes(512); 62 secret = RFC2898.GetBytes(512);
63 ASCIIEncoding ASCII = new ASCIIEncoding(); 63 ASCIIEncoding ASCII = new ASCIIEncoding();
64 64
@@ -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);
@@ -130,6 +130,5 @@ namespace OpenSim.Framework
130 Buffer.BlockCopy(b, 0, c, a.Length, b.Length); 130 Buffer.BlockCopy(b, 0, c, a.Length, b.Length);
131 return c; 131 return c;
132 } 132 }
133
134 } 133 }
135} 134} \ No newline at end of file
diff --git a/OpenSim/Framework/General/UUID.cs b/OpenSim/Framework/General/UUID.cs
index 4327f40..f27cd6c 100644
--- a/OpenSim/Framework/General/UUID.cs
+++ b/OpenSim/Framework/General/UUID.cs
@@ -31,7 +31,7 @@ using libsecondlife;
31 31
32namespace OpenSim.Framework 32namespace OpenSim.Framework
33{ 33{
34 class UUID 34 internal class UUID
35 { 35 {
36 public LLUUID llUUID; 36 public LLUUID llUUID;
37 37
@@ -73,7 +73,7 @@ namespace OpenSim.Framework
73 n = BitConverter.GetBytes(fourth); 73 n = BitConverter.GetBytes(fourth);
74 n.CopyTo(uuid, 12); 74 n.CopyTo(uuid, 12);
75 75
76 llUUID = new LLUUID(uuid,0); 76 llUUID = new LLUUID(uuid, 0);
77 } 77 }
78 78
79 public override string ToString() 79 public override string ToString()
@@ -152,4 +152,4 @@ namespace OpenSim.Framework
152 return !a.Equals(b); 152 return !a.Equals(b);
153 } 153 }
154 } 154 }
155} 155} \ No newline at end of file
diff --git a/OpenSim/Framework/General/UserConfig.cs b/OpenSim/Framework/General/UserConfig.cs
index 3d79fc9..9abe61f 100644
--- a/OpenSim/Framework/General/UserConfig.cs
+++ b/OpenSim/Framework/General/UserConfig.cs
@@ -26,10 +26,6 @@
26* 26*
27*/ 27*/
28 28
29using System;
30using System.Collections.Generic;
31using System.Text;
32
33namespace OpenSim.Framework 29namespace OpenSim.Framework
34{ 30{
35 /// <summary> 31 /// <summary>
@@ -51,21 +47,30 @@ namespace OpenSim.Framework
51 47
52 public UserConfig(string description, string filename) 48 public UserConfig(string description, string filename)
53 { 49 {
54 configMember = new ConfigurationMember(filename, description, this.loadConfigurationOptions, this.handleIncomingConfiguration); 50 configMember =
51 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration);
55 configMember.performConfigurationRetrieve(); 52 configMember.performConfigurationRetrieve();
56 } 53 }
57 54
58 public void loadConfigurationOptions() 55 public void loadConfigurationOptions()
59 { 56 {
60 configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS", false); 57 configMember.addConfigurationOption("default_startup_message",
61 58 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
62 configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false); 59 "Default Startup Message", "Welcome to OGS", false);
63 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
64 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
65 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
66 60
67 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, "Http Listener port", DefaultHttpPort.ToString(), false); 61 configMember.addConfigurationOption("default_grid_server",
62 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
63 "Default Grid Server URI",
64 "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false);
65 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
66 "Key to send to grid server", "null", false);
67 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
68 "Key to expect from grid server", "null", false);
69 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
70 "DLL for database provider", "OpenSim.Framework.Data.MySQL.dll", false);
68 71
72 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
73 "Http Listener port", DefaultHttpPort.ToString(), false);
69 } 74 }
70 75
71 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 76 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -73,26 +78,26 @@ namespace OpenSim.Framework
73 switch (configuration_key) 78 switch (configuration_key)
74 { 79 {
75 case "default_startup_message": 80 case "default_startup_message":
76 this.DefaultStartupMsg = (string)configuration_result; 81 DefaultStartupMsg = (string) configuration_result;
77 break; 82 break;
78 case "default_grid_server": 83 case "default_grid_server":
79 this.GridServerURL = (string)configuration_result; 84 GridServerURL = (string) configuration_result;
80 break; 85 break;
81 case "grid_send_key": 86 case "grid_send_key":
82 this.GridSendKey = (string)configuration_result; 87 GridSendKey = (string) configuration_result;
83 break; 88 break;
84 case "grid_recv_key": 89 case "grid_recv_key":
85 this.GridRecvKey = (string)configuration_result; 90 GridRecvKey = (string) configuration_result;
86 break; 91 break;
87 case "database_provider": 92 case "database_provider":
88 this.DatabaseProvider = (string)configuration_result; 93 DatabaseProvider = (string) configuration_result;
89 break; 94 break;
90 case "http_port": 95 case "http_port":
91 HttpPort = (uint)configuration_result; 96 HttpPort = (uint) configuration_result;
92 break; 97 break;
93 } 98 }
94 99
95 return true; 100 return true;
96 } 101 }
97 } 102 }
98} 103} \ No newline at end of file
diff --git a/OpenSim/Framework/General/UserProfileData.cs b/OpenSim/Framework/General/UserProfileData.cs
index 444d811..ed70246 100644
--- a/OpenSim/Framework/General/UserProfileData.cs
+++ b/OpenSim/Framework/General/UserProfileData.cs
@@ -44,6 +44,7 @@ namespace OpenSim.Framework
44 /// The first component of a users account name 44 /// The first component of a users account name
45 /// </summary> 45 /// </summary>
46 public string username; 46 public string username;
47
47 /// <summary> 48 /// <summary>
48 /// The second component of a users account name 49 /// The second component of a users account name
49 /// </summary> 50 /// </summary>
@@ -54,6 +55,7 @@ namespace OpenSim.Framework
54 /// </summary> 55 /// </summary>
55 /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks> 56 /// <remarks>This is double MD5'd because the client sends an unsalted MD5 to the loginserver</remarks>
56 public string passwordHash; 57 public string passwordHash;
58
57 /// <summary> 59 /// <summary>
58 /// The salt used for the users hash, should be 32 bytes or longer 60 /// The salt used for the users hash, should be 32 bytes or longer
59 /// </summary> 61 /// </summary>
@@ -64,18 +66,22 @@ namespace OpenSim.Framework
64 /// </summary> 66 /// </summary>
65 public ulong homeRegion 67 public ulong homeRegion
66 { 68 {
67 get { return Helpers.UIntsToLong((homeRegionX * 256), (homeRegionY * 256)); } 69 get { return Helpers.UIntsToLong((homeRegionX*256), (homeRegionY*256)); }
68 set { 70 set
69 homeRegionX = (uint)(value >> 40); 71 {
70 homeRegionY = (((uint)(value)) >> 8); 72 homeRegionX = (uint) (value >> 40);
73 homeRegionY = (((uint) (value)) >> 8);
71 } 74 }
72 } 75 }
76
73 public uint homeRegionX; 77 public uint homeRegionX;
74 public uint homeRegionY; 78 public uint homeRegionY;
79
75 /// <summary> 80 /// <summary>
76 /// The coordinates inside the region of the home location 81 /// The coordinates inside the region of the home location
77 /// </summary> 82 /// </summary>
78 public LLVector3 homeLocation; 83 public LLVector3 homeLocation;
84
79 /// <summary> 85 /// <summary>
80 /// Where the user will be looking when they rez. 86 /// Where the user will be looking when they rez.
81 /// </summary> 87 /// </summary>
@@ -85,6 +91,7 @@ namespace OpenSim.Framework
85 /// A UNIX Timestamp (seconds since epoch) for the users creation 91 /// A UNIX Timestamp (seconds since epoch) for the users creation
86 /// </summary> 92 /// </summary>
87 public int created; 93 public int created;
94
88 /// <summary> 95 /// <summary>
89 /// A UNIX Timestamp for the users last login date / time 96 /// A UNIX Timestamp for the users last login date / time
90 /// </summary> 97 /// </summary>
@@ -96,6 +103,7 @@ namespace OpenSim.Framework
96 /// A URI to the users inventory server, used for foreigners and large grids 103 /// A URI to the users inventory server, used for foreigners and large grids
97 /// </summary> 104 /// </summary>
98 public string userInventoryURI = String.Empty; 105 public string userInventoryURI = String.Empty;
106
99 /// <summary> 107 /// <summary>
100 /// A URI to the users asset server, used for foreigners and large grids. 108 /// A URI to the users asset server, used for foreigners and large grids.
101 /// </summary> 109 /// </summary>
@@ -105,6 +113,7 @@ namespace OpenSim.Framework
105 /// A uint mask containing the "I can do" fields of the users profile 113 /// A uint mask containing the "I can do" fields of the users profile
106 /// </summary> 114 /// </summary>
107 public uint profileCanDoMask; 115 public uint profileCanDoMask;
116
108 /// <summary> 117 /// <summary>
109 /// A uint mask containing the "I want to do" part of the users profile 118 /// A uint mask containing the "I want to do" part of the users profile
110 /// </summary> 119 /// </summary>
@@ -114,6 +123,7 @@ namespace OpenSim.Framework
114 /// The about text listed in a users profile. 123 /// The about text listed in a users profile.
115 /// </summary> 124 /// </summary>
116 public string profileAboutText = String.Empty; 125 public string profileAboutText = String.Empty;
126
117 /// <summary> 127 /// <summary>
118 /// The first life about text listed in a users profile 128 /// The first life about text listed in a users profile
119 /// </summary> 129 /// </summary>
@@ -123,10 +133,12 @@ namespace OpenSim.Framework
123 /// The profile image for an avatar stored on the asset server 133 /// The profile image for an avatar stored on the asset server
124 /// </summary> 134 /// </summary>
125 public LLUUID profileImage; 135 public LLUUID profileImage;
136
126 /// <summary> 137 /// <summary>
127 /// The profile image for the users first life tab 138 /// The profile image for the users first life tab
128 /// </summary> 139 /// </summary>
129 public LLUUID profileFirstImage; 140 public LLUUID profileFirstImage;
141
130 /// <summary> 142 /// <summary>
131 /// The users last registered agent (filled in on the user server) 143 /// The users last registered agent (filled in on the user server)
132 /// </summary> 144 /// </summary>
@@ -142,47 +154,58 @@ namespace OpenSim.Framework
142 /// The UUID of the users avatar (not the agent!) 154 /// The UUID of the users avatar (not the agent!)
143 /// </summary> 155 /// </summary>
144 public LLUUID UUID; 156 public LLUUID UUID;
157
145 /// <summary> 158 /// <summary>
146 /// The IP address of the user 159 /// The IP address of the user
147 /// </summary> 160 /// </summary>
148 public string agentIP = String.Empty; 161 public string agentIP = String.Empty;
162
149 /// <summary> 163 /// <summary>
150 /// The port of the user 164 /// The port of the user
151 /// </summary> 165 /// </summary>
152 public uint agentPort; 166 public uint agentPort;
167
153 /// <summary> 168 /// <summary>
154 /// Is the user online? 169 /// Is the user online?
155 /// </summary> 170 /// </summary>
156 public bool agentOnline; 171 public bool agentOnline;
172
157 /// <summary> 173 /// <summary>
158 /// The session ID for the user (also the agent ID) 174 /// The session ID for the user (also the agent ID)
159 /// </summary> 175 /// </summary>
160 public LLUUID sessionID; 176 public LLUUID sessionID;
177
161 /// <summary> 178 /// <summary>
162 /// The "secure" session ID for the user 179 /// The "secure" session ID for the user
163 /// </summary> 180 /// </summary>
164 /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks> 181 /// <remarks>Not very secure. Dont rely on it for anything more than Linden Lab does.</remarks>
165 public LLUUID secureSessionID; 182 public LLUUID secureSessionID;
183
166 /// <summary> 184 /// <summary>
167 /// The region the user logged into initially 185 /// The region the user logged into initially
168 /// </summary> 186 /// </summary>
169 public LLUUID regionID; 187 public LLUUID regionID;
188
170 /// <summary> 189 /// <summary>
171 /// A unix timestamp from when the user logged in 190 /// A unix timestamp from when the user logged in
172 /// </summary> 191 /// </summary>
173 public int loginTime; 192 public int loginTime;
193
174 /// <summary> 194 /// <summary>
175 /// When this agent expired and logged out, 0 if still online 195 /// When this agent expired and logged out, 0 if still online
176 /// </summary> 196 /// </summary>
177 public int logoutTime; 197 public int logoutTime;
198
178 /// <summary> 199 /// <summary>
179 /// Current region the user is logged into 200 /// Current region the user is logged into
180 /// </summary> 201 /// </summary>
181 public LLUUID currentRegion; 202 public LLUUID currentRegion;
203
182 /// <summary> 204 /// <summary>
183 /// Region handle of the current region the user is in 205 /// Region handle of the current region the user is in
184 /// </summary> 206 /// </summary>
185 public ulong currentHandle; 207 public ulong currentHandle;
208
186 /// <summary> 209 /// <summary>
187 /// The position of the user within the region 210 /// The position of the user within the region
188 /// </summary> 211 /// </summary>
diff --git a/OpenSim/Framework/General/Util.cs b/OpenSim/Framework/General/Util.cs
index e3b156d..c731561 100644
--- a/OpenSim/Framework/General/Util.cs
+++ b/OpenSim/Framework/General/Util.cs
@@ -25,14 +25,16 @@
25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 25* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26* 26*
27*/ 27*/
28
28using System; 29using System;
29using System.Collections.Generic; 30using System.Collections.Generic;
31using System.Data;
30using System.IO; 32using System.IO;
31using System.Security.Cryptography;
32using System.Net; 33using System.Net;
34using System.Net.Sockets;
35using System.Security.Cryptography;
33using System.Text; 36using System.Text;
34using libsecondlife; 37using libsecondlife;
35
36using Nini.Config; 38using Nini.Config;
37 39
38namespace OpenSim.Framework 40namespace OpenSim.Framework
@@ -52,16 +54,13 @@ namespace OpenSim.Framework
52 54
53 public static Random RandomClass 55 public static Random RandomClass
54 { 56 {
55 get 57 get { return randomClass; }
56 {
57 return randomClass;
58 }
59 } 58 }
60 59
61 public static uint GetNextXferID() 60 public static uint GetNextXferID()
62 { 61 {
63 uint id = 0; 62 uint id = 0;
64 lock(XferLock) 63 lock (XferLock)
65 { 64 {
66 id = nextXferID; 65 id = nextXferID;
67 nextXferID++; 66 nextXferID++;
@@ -71,25 +70,24 @@ namespace OpenSim.Framework
71 70
72 public Util() 71 public Util()
73 { 72 {
74
75 } 73 }
76 74
77 public static string GetFileName(string file) 75 public static string GetFileName(string file)
78 { 76 {
79 // Return just the filename on UNIX platforms 77 // Return just the filename on UNIX platforms
80 // TODO: this should be customisable with a prefix, but that's something to do later. 78 // TODO: this should be customisable with a prefix, but that's something to do later.
81 if (System.Environment.OSVersion.Platform == PlatformID.Unix) 79 if (Environment.OSVersion.Platform == PlatformID.Unix)
82 { 80 {
83 return file; 81 return file;
84 } 82 }
85 83
86 // Return %APPDATA%/OpenSim/file for 2K/XP/NT/2K3/VISTA 84 // Return %APPDATA%/OpenSim/file for 2K/XP/NT/2K3/VISTA
87 // TODO: Switch this to System.Enviroment.SpecialFolders.ApplicationData 85 // TODO: Switch this to System.Enviroment.SpecialFolders.ApplicationData
88 if (System.Environment.OSVersion.Platform == PlatformID.Win32NT) 86 if (Environment.OSVersion.Platform == PlatformID.Win32NT)
89 { 87 {
90 if (!System.IO.Directory.Exists("%APPDATA%\\OpenSim\\")) 88 if (!Directory.Exists("%APPDATA%\\OpenSim\\"))
91 { 89 {
92 System.IO.Directory.CreateDirectory("%APPDATA%\\OpenSim"); 90 Directory.CreateDirectory("%APPDATA%\\OpenSim");
93 } 91 }
94 92
95 return "%APPDATA%\\OpenSim\\" + file; 93 return "%APPDATA%\\OpenSim\\" + file;
@@ -103,23 +101,23 @@ namespace OpenSim.Framework
103 public static bool IsEnvironmentSupported(ref string reason) 101 public static bool IsEnvironmentSupported(ref string reason)
104 { 102 {
105 // Must have .NET 2.0 (Generics / libsl) 103 // Must have .NET 2.0 (Generics / libsl)
106 if (System.Environment.Version.Major < 2) 104 if (Environment.Version.Major < 2)
107 { 105 {
108 reason = ".NET 1.0/1.1 lacks components that is used by OpenSim"; 106 reason = ".NET 1.0/1.1 lacks components that is used by OpenSim";
109 return false; 107 return false;
110 } 108 }
111 109
112 // Windows 95/98/ME are unsupported 110 // Windows 95/98/ME are unsupported
113 if (System.Environment.OSVersion.Platform == PlatformID.Win32Windows && 111 if (Environment.OSVersion.Platform == PlatformID.Win32Windows &&
114 System.Environment.OSVersion.Platform != PlatformID.Win32NT) 112 Environment.OSVersion.Platform != PlatformID.Win32NT)
115 { 113 {
116 reason = "Windows 95/98/ME will not run OpenSim"; 114 reason = "Windows 95/98/ME will not run OpenSim";
117 return false; 115 return false;
118 } 116 }
119 117
120 // Windows 2000 / Pre-SP2 XP 118 // Windows 2000 / Pre-SP2 XP
121 if (System.Environment.OSVersion.Version.Major == 5 && ( 119 if (Environment.OSVersion.Version.Major == 5 && (
122 System.Environment.OSVersion.Version.Minor == 0)) 120 Environment.OSVersion.Version.Minor == 0))
123 { 121 {
124 reason = "Please update to Windows XP Service Pack 2 or Server2003"; 122 reason = "Please update to Windows XP Service Pack 2 or Server2003";
125 return false; 123 return false;
@@ -131,7 +129,7 @@ namespace OpenSim.Framework
131 public static int UnixTimeSinceEpoch() 129 public static int UnixTimeSinceEpoch()
132 { 130 {
133 TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1)); 131 TimeSpan t = (DateTime.UtcNow - new DateTime(1970, 1, 1));
134 int timestamp = (int)t.TotalSeconds; 132 int timestamp = (int) t.TotalSeconds;
135 return timestamp; 133 return timestamp;
136 } 134 }
137 135
@@ -155,10 +153,10 @@ namespace OpenSim.Framework
155 153
156 public static int fast_distance2d(int x, int y) 154 public static int fast_distance2d(int x, int y)
157 { 155 {
158 x = System.Math.Abs(x); 156 x = Math.Abs(x);
159 y = System.Math.Abs(y); 157 y = Math.Abs(y);
160 158
161 int min = System.Math.Min(x, y); 159 int min = Math.Min(x, y);
162 160
163 return (x + y - (min >> 1) - (min >> 2) + (min >> 4)); 161 return (x + y - (min >> 1) - (min >> 2) + (min >> 4));
164 } 162 }
@@ -233,7 +231,7 @@ namespace OpenSim.Framework
233 for (int j = 0; j < 16 && (i + j) < bytes.Length; j++) 231 for (int j = 0; j < 16 && (i + j) < bytes.Length; j++)
234 { 232 {
235 if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E) 233 if (bytes[i + j] >= 0x20 && bytes[i + j] < 0x7E)
236 output.Append((char)bytes[i + j]); 234 output.Append((char) bytes[i + j]);
237 else 235 else
238 output.Append("."); 236 output.Append(".");
239 } 237 }
@@ -250,7 +248,6 @@ namespace OpenSim.Framework
250 /// <returns>An IP address, or null</returns> 248 /// <returns>An IP address, or null</returns>
251 public static IPAddress GetHostFromDNS(string dnsAddress) 249 public static IPAddress GetHostFromDNS(string dnsAddress)
252 { 250 {
253
254 // Is it already a valid IP? No need to look it up. 251 // Is it already a valid IP? No need to look it up.
255 IPAddress ipa; 252 IPAddress ipa;
256 if (IPAddress.TryParse(dnsAddress, out ipa)) 253 if (IPAddress.TryParse(dnsAddress, out ipa))
@@ -261,7 +258,7 @@ namespace OpenSim.Framework
261 258
262 foreach (IPAddress host in hosts) 259 foreach (IPAddress host in hosts)
263 { 260 {
264 if (host.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) 261 if (host.AddressFamily == AddressFamily.InterNetwork)
265 { 262 {
266 return host; 263 return host;
267 } 264 }
@@ -281,7 +278,7 @@ namespace OpenSim.Framework
281 278
282 foreach (IPAddress host in hosts) 279 foreach (IPAddress host in hosts)
283 { 280 {
284 if (!IPAddress.IsLoopback(host) && host.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork) 281 if (!IPAddress.IsLoopback(host) && host.AddressFamily == AddressFamily.InterNetwork)
285 { 282 {
286 return host; 283 return host;
287 } 284 }
@@ -302,7 +299,7 @@ namespace OpenSim.Framework
302 string temp; 299 string temp;
303// string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal)); 300// string personal=(Environment.GetFolderPath(Environment.SpecialFolder.Personal));
304// temp = Path.Combine(personal,".OpenSim"); 301// temp = Path.Combine(personal,".OpenSim");
305 temp="."; 302 temp = ".";
306 return temp; 303 return temp;
307 } 304 }
308 305
@@ -349,9 +346,9 @@ namespace OpenSim.Framework
349 } 346 }
350 347
351 // Nini (config) related Methods 348 // Nini (config) related Methods
352 public static IConfigSource ConvertDataRowToXMLConfig(System.Data.DataRow row, string fileName) 349 public static IConfigSource ConvertDataRowToXMLConfig(DataRow row, string fileName)
353 { 350 {
354 if(!File.Exists(fileName)) 351 if (!File.Exists(fileName))
355 { 352 {
356 //create new file 353 //create new file
357 } 354 }
@@ -362,13 +359,13 @@ namespace OpenSim.Framework
362 return config; 359 return config;
363 } 360 }
364 361
365 public static void AddDataRowToConfig(IConfigSource config, System.Data.DataRow row) 362 public static void AddDataRowToConfig(IConfigSource config, DataRow row)
366 { 363 {
367 config.Configs.Add((string)row[0]); 364 config.Configs.Add((string) row[0]);
368 for (int i = 0; i < row.Table.Columns.Count; i++) 365 for (int i = 0; i < row.Table.Columns.Count; i++)
369 { 366 {
370 config.Configs[(string)row[0]].Set(row.Table.Columns[i].ColumnName, row[i]); 367 config.Configs[(string) row[0]].Set(row.Table.Columns[i].ColumnName, row[i]);
371 } 368 }
372 } 369 }
373 } 370 }
374} 371} \ No newline at end of file
generated by cgit v1.1 at 2024-07-16 08:21:20 +0000