diff options
Diffstat (limited to 'OpenSim/Framework/Data.MSSQL')
-rw-r--r-- | OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs index 5a0f3f5..9bd8acc 100644 --- a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs +++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
38 | /// <summary> | 38 | /// <summary> |
39 | /// A grid data interface for Microsoft SQL Server | 39 | /// A grid data interface for Microsoft SQL Server |
40 | /// </summary> | 40 | /// </summary> |
41 | public class MSSQLGridData : IGridData | 41 | public class MSSQLGridData : GridDataBase |
42 | { | 42 | { |
43 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
52 | /// <summary> | 52 | /// <summary> |
53 | /// Initialises the Grid Interface | 53 | /// Initialises the Grid Interface |
54 | /// </summary> | 54 | /// </summary> |
55 | public void Initialise() | 55 | override public void Initialise() |
56 | { | 56 | { |
57 | IniFile iniFile = new IniFile("mssql_connection.ini"); | 57 | IniFile iniFile = new IniFile("mssql_connection.ini"); |
58 | 58 | ||
@@ -94,7 +94,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
94 | /// <summary> | 94 | /// <summary> |
95 | /// Shuts down the grid interface | 95 | /// Shuts down the grid interface |
96 | /// </summary> | 96 | /// </summary> |
97 | public void Close() | 97 | override public void Close() |
98 | { | 98 | { |
99 | database.Close(); | 99 | database.Close(); |
100 | } | 100 | } |
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
103 | /// Returns the storage system name | 103 | /// Returns the storage system name |
104 | /// </summary> | 104 | /// </summary> |
105 | /// <returns>A string containing the storage system name</returns> | 105 | /// <returns>A string containing the storage system name</returns> |
106 | public string getName() | 106 | override public string getName() |
107 | { | 107 | { |
108 | return "Sql OpenGridData"; | 108 | return "Sql OpenGridData"; |
109 | } | 109 | } |
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
112 | /// Returns the storage system version | 112 | /// Returns the storage system version |
113 | /// </summary> | 113 | /// </summary> |
114 | /// <returns>A string containing the storage system version</returns> | 114 | /// <returns>A string containing the storage system version</returns> |
115 | public string getVersion() | 115 | override public string getVersion() |
116 | { | 116 | { |
117 | return "0.1"; | 117 | return "0.1"; |
118 | } | 118 | } |
@@ -125,7 +125,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
125 | /// <param name="c">maximum X coordinate</param> | 125 | /// <param name="c">maximum X coordinate</param> |
126 | /// <param name="d">maximum Y coordinate</param> | 126 | /// <param name="d">maximum Y coordinate</param> |
127 | /// <returns>An array of region profiles</returns> | 127 | /// <returns>An array of region profiles</returns> |
128 | public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) | 128 | override public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) |
129 | { | 129 | { |
130 | return null; | 130 | return null; |
131 | } | 131 | } |
@@ -135,7 +135,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
135 | /// </summary> | 135 | /// </summary> |
136 | /// <param name="handle">Region location handle</param> | 136 | /// <param name="handle">Region location handle</param> |
137 | /// <returns>Sim profile</returns> | 137 | /// <returns>Sim profile</returns> |
138 | public RegionProfileData GetProfileByHandle(ulong handle) | 138 | override public RegionProfileData GetProfileByHandle(ulong handle) |
139 | { | 139 | { |
140 | IDataReader reader = null; | 140 | IDataReader reader = null; |
141 | try | 141 | try |
@@ -166,7 +166,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
166 | /// </summary> | 166 | /// </summary> |
167 | /// <param name="uuid">The region UUID</param> | 167 | /// <param name="uuid">The region UUID</param> |
168 | /// <returns>The sim profile</returns> | 168 | /// <returns>The sim profile</returns> |
169 | public RegionProfileData GetProfileByLLUUID(LLUUID uuid) | 169 | override public RegionProfileData GetProfileByLLUUID(LLUUID uuid) |
170 | { | 170 | { |
171 | Dictionary<string, string> param = new Dictionary<string, string>(); | 171 | Dictionary<string, string> param = new Dictionary<string, string>(); |
172 | param["uuid"] = uuid.ToString(); | 172 | param["uuid"] = uuid.ToString(); |
@@ -185,7 +185,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
185 | /// </summary> | 185 | /// </summary> |
186 | /// <param name="uuid">The region name search query</param> | 186 | /// <param name="uuid">The region name search query</param> |
187 | /// <returns>The sim profile</returns> | 187 | /// <returns>The sim profile</returns> |
188 | public RegionProfileData GetProfileByString(string regionName) | 188 | override public RegionProfileData GetProfileByString(string regionName) |
189 | { | 189 | { |
190 | if (regionName.Length > 2) | 190 | if (regionName.Length > 2) |
191 | { | 191 | { |
@@ -226,7 +226,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
226 | /// </summary> | 226 | /// </summary> |
227 | /// <param name="profile">The profile to add</param> | 227 | /// <param name="profile">The profile to add</param> |
228 | /// <returns>A dataresponse enum indicating success</returns> | 228 | /// <returns>A dataresponse enum indicating success</returns> |
229 | public DataResponse AddProfile(RegionProfileData profile) | 229 | override public DataResponse AddProfile(RegionProfileData profile) |
230 | { | 230 | { |
231 | try | 231 | try |
232 | { | 232 | { |
@@ -327,7 +327,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
327 | /// <param name="handle">The attempted regionHandle of the challenger</param> | 327 | /// <param name="handle">The attempted regionHandle of the challenger</param> |
328 | /// <param name="authkey">The secret</param> | 328 | /// <param name="authkey">The secret</param> |
329 | /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> | 329 | /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> |
330 | public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) | 330 | override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) |
331 | { | 331 | { |
332 | bool throwHissyFit = false; // Should be true by 1.0 | 332 | bool throwHissyFit = false; // Should be true by 1.0 |
333 | 333 | ||
@@ -358,7 +358,7 @@ namespace OpenSim.Framework.Data.MSSQL | |||
358 | return false; | 358 | return false; |
359 | } | 359 | } |
360 | 360 | ||
361 | public ReservationData GetReservationAtPoint(uint x, uint y) | 361 | override public ReservationData GetReservationAtPoint(uint x, uint y) |
362 | { | 362 | { |
363 | return null; | 363 | return null; |
364 | } | 364 | } |