diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Data.MySQL/MySQLGridData.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs index 0cba9f0..61ab067 100644 --- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs +++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs | |||
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
39 | /// <summary> | 39 | /// <summary> |
40 | /// A MySQL Interface for the Grid Server | 40 | /// A MySQL Interface for the Grid Server |
41 | /// </summary> | 41 | /// </summary> |
42 | public class MySQLGridData : IGridData | 42 | public class MySQLGridData : GridDataBase |
43 | { | 43 | { |
44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 44 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
45 | 45 | ||
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
51 | /// <summary> | 51 | /// <summary> |
52 | /// Initialises the Grid Interface | 52 | /// Initialises the Grid Interface |
53 | /// </summary> | 53 | /// </summary> |
54 | public void Initialise() | 54 | override public void Initialise() |
55 | { | 55 | { |
56 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 56 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
57 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); | 57 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); |
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
113 | /// <summary> | 113 | /// <summary> |
114 | /// Shuts down the grid interface | 114 | /// Shuts down the grid interface |
115 | /// </summary> | 115 | /// </summary> |
116 | public void Close() | 116 | override public void Close() |
117 | { | 117 | { |
118 | database.Close(); | 118 | database.Close(); |
119 | } | 119 | } |
@@ -122,7 +122,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
122 | /// Returns the plugin name | 122 | /// Returns the plugin name |
123 | /// </summary> | 123 | /// </summary> |
124 | /// <returns>Plugin name</returns> | 124 | /// <returns>Plugin name</returns> |
125 | public string getName() | 125 | override public string getName() |
126 | { | 126 | { |
127 | return "MySql OpenGridData"; | 127 | return "MySql OpenGridData"; |
128 | } | 128 | } |
@@ -131,7 +131,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
131 | /// Returns the plugin version | 131 | /// Returns the plugin version |
132 | /// </summary> | 132 | /// </summary> |
133 | /// <returns>Plugin version</returns> | 133 | /// <returns>Plugin version</returns> |
134 | public string getVersion() | 134 | override public string getVersion() |
135 | { | 135 | { |
136 | return "0.1"; | 136 | return "0.1"; |
137 | } | 137 | } |
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
144 | /// <param name="xmax">Maximum X coordinate</param> | 144 | /// <param name="xmax">Maximum X coordinate</param> |
145 | /// <param name="ymax">Maximum Y coordinate</param> | 145 | /// <param name="ymax">Maximum Y coordinate</param> |
146 | /// <returns></returns> | 146 | /// <returns></returns> |
147 | public RegionProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax) | 147 | override public RegionProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax) |
148 | { | 148 | { |
149 | try | 149 | try |
150 | { | 150 | { |
@@ -189,7 +189,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
189 | /// </summary> | 189 | /// </summary> |
190 | /// <param name="handle">Region location handle</param> | 190 | /// <param name="handle">Region location handle</param> |
191 | /// <returns>Sim profile</returns> | 191 | /// <returns>Sim profile</returns> |
192 | public RegionProfileData GetProfileByHandle(ulong handle) | 192 | override public RegionProfileData GetProfileByHandle(ulong handle) |
193 | { | 193 | { |
194 | try | 194 | try |
195 | { | 195 | { |
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
221 | /// </summary> | 221 | /// </summary> |
222 | /// <param name="uuid">The region UUID</param> | 222 | /// <param name="uuid">The region UUID</param> |
223 | /// <returns>The sim profile</returns> | 223 | /// <returns>The sim profile</returns> |
224 | public RegionProfileData GetProfileByLLUUID(LLUUID uuid) | 224 | override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) |
225 | { | 225 | { |
226 | try | 226 | try |
227 | { | 227 | { |
@@ -253,7 +253,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
253 | /// </summary> | 253 | /// </summary> |
254 | /// <param name="uuid">The region name search query</param> | 254 | /// <param name="uuid">The region name search query</param> |
255 | /// <returns>The sim profile</returns> | 255 | /// <returns>The sim profile</returns> |
256 | public RegionProfileData GetProfileByString(string regionName) | 256 | override public RegionProfileData GetProfileByString(string regionName) |
257 | { | 257 | { |
258 | if (regionName.Length > 2) | 258 | if (regionName.Length > 2) |
259 | { | 259 | { |
@@ -294,7 +294,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
294 | /// </summary> | 294 | /// </summary> |
295 | /// <param name="profile">The profile to add</param> | 295 | /// <param name="profile">The profile to add</param> |
296 | /// <returns>Successful?</returns> | 296 | /// <returns>Successful?</returns> |
297 | public DataResponse AddProfile(RegionProfileData profile) | 297 | override public DataResponse AddProfile(RegionProfileData profile) |
298 | { | 298 | { |
299 | lock (database) | 299 | lock (database) |
300 | { | 300 | { |
@@ -337,7 +337,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
337 | /// <param name="handle">The attempted regionHandle of the challenger</param> | 337 | /// <param name="handle">The attempted regionHandle of the challenger</param> |
338 | /// <param name="authkey">The secret</param> | 338 | /// <param name="authkey">The secret</param> |
339 | /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> | 339 | /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> |
340 | public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) | 340 | override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) |
341 | { | 341 | { |
342 | bool throwHissyFit = false; // Should be true by 1.0 | 342 | bool throwHissyFit = false; // Should be true by 1.0 |
343 | 343 | ||
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Data.MySQL | |||
369 | return false; | 369 | return false; |
370 | } | 370 | } |
371 | 371 | ||
372 | public ReservationData GetReservationAtPoint(uint x, uint y) | 372 | override public ReservationData GetReservationAtPoint(uint x, uint y) |
373 | { | 373 | { |
374 | try | 374 | try |
375 | { | 375 | { |