aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTleiades Hax2007-10-17 09:36:11 +0000
committerTleiades Hax2007-10-17 09:36:11 +0000
commit44a7db0e44d175fcb854b7bfd11d3b97ed6b934c (patch)
tree52f6853eb180fbdd998c2019a136c7bdfa03dec4 /OpenSim/Framework
parentthis might help with ODE errors. Or maybe not. YMMV (diff)
downloadopensim-SC_OLD-44a7db0e44d175fcb854b7bfd11d3b97ed6b934c.zip
opensim-SC_OLD-44a7db0e44d175fcb854b7bfd11d3b97ed6b934c.tar.gz
opensim-SC_OLD-44a7db0e44d175fcb854b7bfd11d3b97ed6b934c.tar.bz2
opensim-SC_OLD-44a7db0e44d175fcb854b7bfd11d3b97ed6b934c.tar.xz
Renamed SimProfileData to RegionProfileData
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oGridData.cs9
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oManager.cs9
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs14
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLManager.cs6
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLGridData.cs18
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLManager.cs6
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteGridData.cs14
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteManager.cs6
-rw-r--r--OpenSim/Framework/Data/GridData.cs8
-rw-r--r--OpenSim/Framework/Data/RegionProfileData.cs (renamed from OpenSim/Framework/Data/SimProfileData.cs)10
10 files changed, 51 insertions, 49 deletions
diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index a01d1a4..bc7225a 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -56,7 +56,7 @@ namespace OpenSim.Framework.Data.DB4o
56 /// <param name="c">maximum X coordinate</param> 56 /// <param name="c">maximum X coordinate</param>
57 /// <param name="d">maximum Y coordinate</param> 57 /// <param name="d">maximum Y coordinate</param>
58 /// <returns>An array of region profiles</returns> 58 /// <returns>An array of region profiles</returns>
59 public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) 59 public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
60 { 60 {
61 return null; 61 return null;
62 } 62 }
@@ -66,7 +66,8 @@ namespace OpenSim.Framework.Data.DB4o
66 /// </summary> 66 /// </summary>
67 /// <param name="handle">The handle to search for</param> 67 /// <param name="handle">The handle to search for</param>
68 /// <returns>A region profile</returns> 68 /// <returns>A region profile</returns>
69 public SimProfileData GetProfileByHandle(ulong handle) { 69 public RegionProfileData GetProfileByHandle(ulong handle)
70 {
70 lock (manager.simProfiles) 71 lock (manager.simProfiles)
71 { 72 {
72 foreach (LLUUID UUID in manager.simProfiles.Keys) 73 foreach (LLUUID UUID in manager.simProfiles.Keys)
@@ -85,7 +86,7 @@ namespace OpenSim.Framework.Data.DB4o
85 /// </summary> 86 /// </summary>
86 /// <param name="uuid">The region ID code</param> 87 /// <param name="uuid">The region ID code</param>
87 /// <returns>A region profile</returns> 88 /// <returns>A region profile</returns>
88 public SimProfileData GetProfileByLLUUID(LLUUID uuid) 89 public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
89 { 90 {
90 lock (manager.simProfiles) 91 lock (manager.simProfiles)
91 { 92 {
@@ -100,7 +101,7 @@ namespace OpenSim.Framework.Data.DB4o
100 /// </summary> 101 /// </summary>
101 /// <param name="profile">The profile to add</param> 102 /// <param name="profile">The profile to add</param>
102 /// <returns>A dataresponse enum indicating success</returns> 103 /// <returns>A dataresponse enum indicating success</returns>
103 public DataResponse AddProfile(SimProfileData profile) 104 public DataResponse AddProfile(RegionProfileData profile)
104 { 105 {
105 lock (manager.simProfiles) 106 lock (manager.simProfiles)
106 { 107 {
diff --git a/OpenSim/Framework/Data.DB4o/DB4oManager.cs b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
index 224b842..10c8490 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oManager.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oManager.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Data.DB4o
41 /// <summary> 41 /// <summary>
42 /// A list of the current regions connected (in-memory cache) 42 /// A list of the current regions connected (in-memory cache)
43 /// </summary> 43 /// </summary>
44 public Dictionary<LLUUID, SimProfileData> simProfiles = new Dictionary<LLUUID, SimProfileData>(); 44 public Dictionary<LLUUID, RegionProfileData> simProfiles = new Dictionary<LLUUID, RegionProfileData>();
45 /// <summary> 45 /// <summary>
46 /// Database File Name 46 /// Database File Name
47 /// </summary> 47 /// </summary>
@@ -56,9 +56,10 @@ namespace OpenSim.Framework.Data.DB4o
56 dbfl = db4odb; 56 dbfl = db4odb;
57 IObjectContainer database; 57 IObjectContainer database;
58 database = Db4oFactory.OpenFile(dbfl); 58 database = Db4oFactory.OpenFile(dbfl);
59 IObjectSet result = database.Get(typeof(SimProfileData)); 59 IObjectSet result = database.Get(typeof(RegionProfileData));
60 // Loads the file into the in-memory cache 60 // Loads the file into the in-memory cache
61 foreach(SimProfileData row in result) { 61 foreach (RegionProfileData row in result)
62 {
62 simProfiles.Add(row.UUID, row); 63 simProfiles.Add(row.UUID, row);
63 } 64 }
64 database.Close(); 65 database.Close();
@@ -69,7 +70,7 @@ namespace OpenSim.Framework.Data.DB4o
69 /// </summary> 70 /// </summary>
70 /// <param name="row">The profile to add</param> 71 /// <param name="row">The profile to add</param>
71 /// <returns>Successful?</returns> 72 /// <returns>Successful?</returns>
72 public bool AddRow(SimProfileData row) 73 public bool AddRow(RegionProfileData row)
73 { 74 {
74 if (simProfiles.ContainsKey(row.UUID)) 75 if (simProfiles.ContainsKey(row.UUID))
75 { 76 {
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
index 09ce6d2..e628882 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Data.MSSQL
86 /// <param name="c">maximum X coordinate</param> 86 /// <param name="c">maximum X coordinate</param>
87 /// <param name="d">maximum Y coordinate</param> 87 /// <param name="d">maximum Y coordinate</param>
88 /// <returns>An array of region profiles</returns> 88 /// <returns>An array of region profiles</returns>
89 public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) 89 public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
90 { 90 {
91 return null; 91 return null;
92 } 92 }
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Data.MSSQL
96 /// </summary> 96 /// </summary>
97 /// <param name="handle">Region location handle</param> 97 /// <param name="handle">Region location handle</param>
98 /// <returns>Sim profile</returns> 98 /// <returns>Sim profile</returns>
99 public SimProfileData GetProfileByHandle(ulong handle) 99 public RegionProfileData GetProfileByHandle(ulong handle)
100 { 100 {
101 Dictionary<string, string> param = new Dictionary<string, string>(); 101 Dictionary<string, string> param = new Dictionary<string, string>();
102 param["handle"] = handle.ToString(); 102 param["handle"] = handle.ToString();
@@ -104,7 +104,7 @@ namespace OpenSim.Framework.Data.MSSQL
104 IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param); 104 IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
105 IDataReader reader = result.ExecuteReader(); 105 IDataReader reader = result.ExecuteReader();
106 106
107 SimProfileData row = database.getRow(reader); 107 RegionProfileData row = database.getRow(reader);
108 reader.Close(); 108 reader.Close();
109 result.Dispose(); 109 result.Dispose();
110 110
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.Data.MSSQL
116 /// </summary> 116 /// </summary>
117 /// <param name="uuid">The region UUID</param> 117 /// <param name="uuid">The region UUID</param>
118 /// <returns>The sim profile</returns> 118 /// <returns>The sim profile</returns>
119 public SimProfileData GetProfileByLLUUID(LLUUID uuid) 119 public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
120 { 120 {
121 Dictionary<string, string> param = new Dictionary<string, string>(); 121 Dictionary<string, string> param = new Dictionary<string, string>();
122 param["uuid"] = uuid.ToStringHyphenated(); 122 param["uuid"] = uuid.ToStringHyphenated();
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Data.MSSQL
124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); 124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
125 IDataReader reader = result.ExecuteReader(); 125 IDataReader reader = result.ExecuteReader();
126 126
127 SimProfileData row = database.getRow(reader); 127 RegionProfileData row = database.getRow(reader);
128 reader.Close(); 128 reader.Close();
129 result.Dispose(); 129 result.Dispose();
130 130
@@ -136,7 +136,7 @@ namespace OpenSim.Framework.Data.MSSQL
136 /// </summary> 136 /// </summary>
137 /// <param name="profile">The profile to add</param> 137 /// <param name="profile">The profile to add</param>
138 /// <returns>A dataresponse enum indicating success</returns> 138 /// <returns>A dataresponse enum indicating success</returns>
139 public DataResponse AddProfile(SimProfileData profile) 139 public DataResponse AddProfile(RegionProfileData profile)
140 { 140 {
141 if (database.insertRow(profile)) 141 if (database.insertRow(profile))
142 { 142 {
@@ -162,7 +162,7 @@ namespace OpenSim.Framework.Data.MSSQL
162 if (throwHissyFit) 162 if (throwHissyFit)
163 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 163 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
164 164
165 SimProfileData data = GetProfileByLLUUID(uuid); 165 RegionProfileData data = GetProfileByLLUUID(uuid);
166 166
167 return (handle == data.regionHandle && authkey == data.regionSecret); 167 return (handle == data.regionHandle && authkey == data.regionSecret);
168 } 168 }
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
index 1efd51e..77d29f7 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
@@ -98,9 +98,9 @@ namespace OpenSim.Framework.Data.MSSQL
98 /// </summary> 98 /// </summary>
99 /// <param name="reader">An active database reader</param> 99 /// <param name="reader">An active database reader</param>
100 /// <returns>A region row</returns> 100 /// <returns>A region row</returns>
101 public SimProfileData getRow(IDataReader reader) 101 public RegionProfileData getRow(IDataReader reader)
102 { 102 {
103 SimProfileData regionprofile = new SimProfileData(); 103 RegionProfileData regionprofile = new RegionProfileData();
104 104
105 if (reader.Read()) 105 if (reader.Read())
106 { 106 {
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Data.MSSQL
154 /// </summary> 154 /// </summary>
155 /// <param name="profile">The region profile to insert</param> 155 /// <param name="profile">The region profile to insert</param>
156 /// <returns>Successful?</returns> 156 /// <returns>Successful?</returns>
157 public bool insertRow(SimProfileData profile) 157 public bool insertRow(RegionProfileData profile)
158 { 158 {
159 string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, "; 159 string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
160 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; 160 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 5709bf0..9876ab1 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Data.MySQL
96 /// <param name="xmax">Maximum X coordinate</param> 96 /// <param name="xmax">Maximum X coordinate</param>
97 /// <param name="ymax">Maximum Y coordinate</param> 97 /// <param name="ymax">Maximum Y coordinate</param>
98 /// <returns></returns> 98 /// <returns></returns>
99 public SimProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax) 99 public RegionProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
100 { 100 {
101 try 101 try
102 { 102 {
@@ -111,9 +111,9 @@ namespace OpenSim.Framework.Data.MySQL
111 IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param); 111 IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
112 IDataReader reader = result.ExecuteReader(); 112 IDataReader reader = result.ExecuteReader();
113 113
114 SimProfileData row; 114 RegionProfileData row;
115 115
116 List<SimProfileData> rows = new List<SimProfileData>(); 116 List<RegionProfileData> rows = new List<RegionProfileData>();
117 117
118 while ((row = database.readSimRow(reader)) != null) 118 while ((row = database.readSimRow(reader)) != null)
119 { 119 {
@@ -139,7 +139,7 @@ namespace OpenSim.Framework.Data.MySQL
139 /// </summary> 139 /// </summary>
140 /// <param name="handle">Region location handle</param> 140 /// <param name="handle">Region location handle</param>
141 /// <returns>Sim profile</returns> 141 /// <returns>Sim profile</returns>
142 public SimProfileData GetProfileByHandle(ulong handle) 142 public RegionProfileData GetProfileByHandle(ulong handle)
143 { 143 {
144 try 144 try
145 { 145 {
@@ -151,7 +151,7 @@ namespace OpenSim.Framework.Data.MySQL
151 IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param); 151 IDbCommand result = database.Query("SELECT * FROM regions WHERE regionHandle = ?handle", param);
152 IDataReader reader = result.ExecuteReader(); 152 IDataReader reader = result.ExecuteReader();
153 153
154 SimProfileData row = database.readSimRow(reader); 154 RegionProfileData row = database.readSimRow(reader);
155 reader.Close(); 155 reader.Close();
156 result.Dispose(); 156 result.Dispose();
157 157
@@ -171,7 +171,7 @@ namespace OpenSim.Framework.Data.MySQL
171 /// </summary> 171 /// </summary>
172 /// <param name="uuid">The region UUID</param> 172 /// <param name="uuid">The region UUID</param>
173 /// <returns>The sim profile</returns> 173 /// <returns>The sim profile</returns>
174 public SimProfileData GetProfileByLLUUID(LLUUID uuid) 174 public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
175 { 175 {
176 try 176 try
177 { 177 {
@@ -183,7 +183,7 @@ namespace OpenSim.Framework.Data.MySQL
183 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param); 183 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = ?uuid", param);
184 IDataReader reader = result.ExecuteReader(); 184 IDataReader reader = result.ExecuteReader();
185 185
186 SimProfileData row = database.readSimRow(reader); 186 RegionProfileData row = database.readSimRow(reader);
187 reader.Close(); 187 reader.Close();
188 result.Dispose(); 188 result.Dispose();
189 189
@@ -203,7 +203,7 @@ namespace OpenSim.Framework.Data.MySQL
203 /// </summary> 203 /// </summary>
204 /// <param name="profile">The profile to add</param> 204 /// <param name="profile">The profile to add</param>
205 /// <returns>Successful?</returns> 205 /// <returns>Successful?</returns>
206 public DataResponse AddProfile(SimProfileData profile) 206 public DataResponse AddProfile(RegionProfileData profile)
207 { 207 {
208 lock (database) 208 lock (database)
209 { 209 {
@@ -232,7 +232,7 @@ namespace OpenSim.Framework.Data.MySQL
232 if (throwHissyFit) 232 if (throwHissyFit)
233 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 233 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
234 234
235 SimProfileData data = GetProfileByLLUUID(uuid); 235 RegionProfileData data = GetProfileByLLUUID(uuid);
236 236
237 return (handle == data.regionHandle && authkey == data.regionSecret); 237 return (handle == data.regionHandle && authkey == data.regionSecret);
238 } 238 }
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index d3f6976..8600d6b 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -267,9 +267,9 @@ namespace OpenSim.Framework.Data.MySQL
267 /// </summary> 267 /// </summary>
268 /// <param name="reader">An active database reader</param> 268 /// <param name="reader">An active database reader</param>
269 /// <returns>A region profile</returns> 269 /// <returns>A region profile</returns>
270 public SimProfileData readSimRow(IDataReader reader) 270 public RegionProfileData readSimRow(IDataReader reader)
271 { 271 {
272 SimProfileData retval = new SimProfileData(); 272 RegionProfileData retval = new RegionProfileData();
273 273
274 if (reader.Read()) 274 if (reader.Read())
275 { 275 {
@@ -583,7 +583,7 @@ namespace OpenSim.Framework.Data.MySQL
583 /// </summary> 583 /// </summary>
584 /// <param name="profile">The region to insert</param> 584 /// <param name="profile">The region to insert</param>
585 /// <returns>Success?</returns> 585 /// <returns>Success?</returns>
586 public bool insertRegion(SimProfileData regiondata) 586 public bool insertRegion(RegionProfileData regiondata)
587 { 587 {
588 string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, "; 588 string sql = "REPLACE INTO regions (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
589 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; 589 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index a7ff0f7..2fc80b4 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Data.SQLite
86 /// <param name="c">maximum X coordinate</param> 86 /// <param name="c">maximum X coordinate</param>
87 /// <param name="d">maximum Y coordinate</param> 87 /// <param name="d">maximum Y coordinate</param>
88 /// <returns>An array of region profiles</returns> 88 /// <returns>An array of region profiles</returns>
89 public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) 89 public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
90 { 90 {
91 return null; 91 return null;
92 } 92 }
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Data.SQLite
96 /// </summary> 96 /// </summary>
97 /// <param name="handle">Region location handle</param> 97 /// <param name="handle">Region location handle</param>
98 /// <returns>Sim profile</returns> 98 /// <returns>Sim profile</returns>
99 public SimProfileData GetProfileByHandle(ulong handle) 99 public RegionProfileData GetProfileByHandle(ulong handle)
100 { 100 {
101 Dictionary<string, string> param = new Dictionary<string, string>(); 101 Dictionary<string, string> param = new Dictionary<string, string>();
102 param["handle"] = handle.ToString(); 102 param["handle"] = handle.ToString();
@@ -104,7 +104,7 @@ namespace OpenSim.Framework.Data.SQLite
104 IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param); 104 IDbCommand result = database.Query("SELECT * FROM regions WHERE handle = @handle", param);
105 IDataReader reader = result.ExecuteReader(); 105 IDataReader reader = result.ExecuteReader();
106 106
107 SimProfileData row = database.getRow(reader); 107 RegionProfileData row = database.getRow(reader);
108 reader.Close(); 108 reader.Close();
109 result.Dispose(); 109 result.Dispose();
110 110
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.Data.SQLite
116 /// </summary> 116 /// </summary>
117 /// <param name="uuid">The region UUID</param> 117 /// <param name="uuid">The region UUID</param>
118 /// <returns>The sim profile</returns> 118 /// <returns>The sim profile</returns>
119 public SimProfileData GetProfileByLLUUID(LLUUID uuid) 119 public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
120 { 120 {
121 Dictionary<string, string> param = new Dictionary<string, string>(); 121 Dictionary<string, string> param = new Dictionary<string, string>();
122 param["uuid"] = uuid.ToStringHyphenated(); 122 param["uuid"] = uuid.ToStringHyphenated();
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Data.SQLite
124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param); 124 IDbCommand result = database.Query("SELECT * FROM regions WHERE uuid = @uuid", param);
125 IDataReader reader = result.ExecuteReader(); 125 IDataReader reader = result.ExecuteReader();
126 126
127 SimProfileData row = database.getRow(reader); 127 RegionProfileData row = database.getRow(reader);
128 reader.Close(); 128 reader.Close();
129 result.Dispose(); 129 result.Dispose();
130 130
@@ -136,7 +136,7 @@ namespace OpenSim.Framework.Data.SQLite
136 /// </summary> 136 /// </summary>
137 /// <param name="profile">The profile to add</param> 137 /// <param name="profile">The profile to add</param>
138 /// <returns>A dataresponse enum indicating success</returns> 138 /// <returns>A dataresponse enum indicating success</returns>
139 public DataResponse AddProfile(SimProfileData profile) 139 public DataResponse AddProfile(RegionProfileData profile)
140 { 140 {
141 if (database.insertRow(profile)) 141 if (database.insertRow(profile))
142 { 142 {
@@ -162,7 +162,7 @@ namespace OpenSim.Framework.Data.SQLite
162 if (throwHissyFit) 162 if (throwHissyFit)
163 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential."); 163 throw new Exception("CRYPTOWEAK AUTHENTICATE: Refusing to authenticate due to replay potential.");
164 164
165 SimProfileData data = GetProfileByLLUUID(uuid); 165 RegionProfileData data = GetProfileByLLUUID(uuid);
166 166
167 return (handle == data.regionHandle && authkey == data.regionSecret); 167 return (handle == data.regionHandle && authkey == data.regionSecret);
168 } 168 }
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
index f73f480..5954fba 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteManager.cs
@@ -161,9 +161,9 @@ namespace OpenSim.Framework.Data.SQLite
161 /// </summary> 161 /// </summary>
162 /// <param name="reader">An active database reader</param> 162 /// <param name="reader">An active database reader</param>
163 /// <returns>A region profile</returns> 163 /// <returns>A region profile</returns>
164 public SimProfileData getRow(IDataReader reader) 164 public RegionProfileData getRow(IDataReader reader)
165 { 165 {
166 SimProfileData retval = new SimProfileData(); 166 RegionProfileData retval = new RegionProfileData();
167 167
168 if (reader.Read()) 168 if (reader.Read())
169 { 169 {
@@ -217,7 +217,7 @@ namespace OpenSim.Framework.Data.SQLite
217 /// </summary> 217 /// </summary>
218 /// <param name="profile">The region to insert</param> 218 /// <param name="profile">The region to insert</param>
219 /// <returns>Success?</returns> 219 /// <returns>Success?</returns>
220 public bool insertRow(SimProfileData profile) 220 public bool insertRow(RegionProfileData profile)
221 { 221 {
222 string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, "; 222 string sql = "REPLACE INTO regions VALUES (regionHandle, regionName, uuid, regionRecvKey, regionSecret, regionSendKey, regionDataURI, ";
223 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, "; 223 sql += "serverIP, serverPort, serverURI, locX, locY, locZ, eastOverrideHandle, westOverrideHandle, southOverrideHandle, northOverrideHandle, regionAssetURI, regionAssetRecvKey, ";
diff --git a/OpenSim/Framework/Data/GridData.cs b/OpenSim/Framework/Data/GridData.cs
index 7075922..2a5b8f6 100644
--- a/OpenSim/Framework/Data/GridData.cs
+++ b/OpenSim/Framework/Data/GridData.cs
@@ -47,14 +47,14 @@ namespace OpenSim.Framework.Data
47 /// </summary> 47 /// </summary>
48 /// <param name="regionHandle">A 64bit Region Handle</param> 48 /// <param name="regionHandle">A 64bit Region Handle</param>
49 /// <returns>A simprofile</returns> 49 /// <returns>A simprofile</returns>
50 SimProfileData GetProfileByHandle(ulong regionHandle); 50 RegionProfileData GetProfileByHandle(ulong regionHandle);
51 51
52 /// <summary> 52 /// <summary>
53 /// Returns a sim profile from a UUID 53 /// Returns a sim profile from a UUID
54 /// </summary> 54 /// </summary>
55 /// <param name="UUID">A 128bit UUID</param> 55 /// <param name="UUID">A 128bit UUID</param>
56 /// <returns>A sim profile</returns> 56 /// <returns>A sim profile</returns>
57 SimProfileData GetProfileByLLUUID(LLUUID UUID); 57 RegionProfileData GetProfileByLLUUID(LLUUID UUID);
58 58
59 /// <summary> 59 /// <summary>
60 /// Returns all profiles within the specified range 60 /// Returns all profiles within the specified range
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Data
64 /// <param name="Xmax">Maximum sim coordinate (X)</param> 64 /// <param name="Xmax">Maximum sim coordinate (X)</param>
65 /// <param name="Ymin">Maximum sim coordinate (Y)</param> 65 /// <param name="Ymin">Maximum sim coordinate (Y)</param>
66 /// <returns>An array containing all the sim profiles in the specified range</returns> 66 /// <returns>An array containing all the sim profiles in the specified range</returns>
67 SimProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax); 67 RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
68 68
69 /// <summary> 69 /// <summary>
70 /// Authenticates a sim by use of it's recv key. 70 /// Authenticates a sim by use of it's recv key.
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Data
103 /// </summary> 103 /// </summary>
104 /// <param name="profile">The profile to add</param> 104 /// <param name="profile">The profile to add</param>
105 /// <returns>RESPONSE_OK if successful, error if not.</returns> 105 /// <returns>RESPONSE_OK if successful, error if not.</returns>
106 DataResponse AddProfile(SimProfileData profile); 106 DataResponse AddProfile(RegionProfileData profile);
107 107
108 ReservationData GetReservationAtPoint(uint x, uint y); 108 ReservationData GetReservationAtPoint(uint x, uint y);
109 109
diff --git a/OpenSim/Framework/Data/SimProfileData.cs b/OpenSim/Framework/Data/RegionProfileData.cs
index abde1f3..5e5dac6 100644
--- a/OpenSim/Framework/Data/SimProfileData.cs
+++ b/OpenSim/Framework/Data/RegionProfileData.cs
@@ -36,7 +36,7 @@ namespace OpenSim.Framework.Data
36 /// <summary> 36 /// <summary>
37 /// A class which contains information known to the grid server about a region 37 /// A class which contains information known to the grid server about a region
38 /// </summary> 38 /// </summary>
39 public class SimProfileData 39 public class RegionProfileData
40 { 40 {
41 /// <summary> 41 /// <summary>
42 /// The name of the region 42 /// The name of the region
@@ -124,7 +124,7 @@ namespace OpenSim.Framework.Data
124 /// <param name="gridserver_url"></param> 124 /// <param name="gridserver_url"></param>
125 /// <param name="?"></param> 125 /// <param name="?"></param>
126 /// <returns></returns> 126 /// <returns></returns>
127 public SimProfileData RequestSimProfileData(LLUUID region_uuid, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey) 127 public RegionProfileData RequestSimProfileData(LLUUID region_uuid, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)
128 { 128 {
129 Hashtable requestData = new Hashtable(); 129 Hashtable requestData = new Hashtable();
130 requestData["region_uuid"] = region_uuid.UUID.ToString(); 130 requestData["region_uuid"] = region_uuid.UUID.ToString();
@@ -141,7 +141,7 @@ namespace OpenSim.Framework.Data
141 return null; 141 return null;
142 } 142 }
143 143
144 SimProfileData simData = new SimProfileData(); 144 RegionProfileData simData = new RegionProfileData();
145 simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]); 145 simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);
146 simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]); 146 simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);
147 simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256)); 147 simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));
@@ -156,7 +156,7 @@ namespace OpenSim.Framework.Data
156 156
157 return simData; 157 return simData;
158 } 158 }
159 public SimProfileData RequestSimProfileData(ulong region_handle, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey) 159 public RegionProfileData RequestSimProfileData(ulong region_handle, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)
160 { 160 {
161 Hashtable requestData = new Hashtable(); 161 Hashtable requestData = new Hashtable();
162 requestData["region_handle"] = region_handle.ToString(); 162 requestData["region_handle"] = region_handle.ToString();
@@ -173,7 +173,7 @@ namespace OpenSim.Framework.Data
173 return null; 173 return null;
174 } 174 }
175 175
176 SimProfileData simData = new SimProfileData(); 176 RegionProfileData simData = new RegionProfileData();
177 simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]); 177 simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);
178 simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]); 178 simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);
179 simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256)); 179 simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));
generated by cgit v1.1 at 2024-11-10 10:16:13 +0000