diff options
author | Tleiades Hax | 2007-10-17 09:36:11 +0000 |
---|---|---|
committer | Tleiades Hax | 2007-10-17 09:36:11 +0000 |
commit | 44a7db0e44d175fcb854b7bfd11d3b97ed6b934c (patch) | |
tree | 52f6853eb180fbdd998c2019a136c7bdfa03dec4 /OpenSim/Framework/Data.SQLite | |
parent | this might help with ODE errors. Or maybe not. YMMV (diff) | |
download | opensim-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/Data.SQLite')
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteGridData.cs | 14 | ||||
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteManager.cs | 6 |
2 files changed, 10 insertions, 10 deletions
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, "; |