diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 46 |
1 files changed, 25 insertions, 21 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index cbb7368..ee7765f 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs | |||
@@ -51,9 +51,9 @@ namespace OpenSim.Data.MSSQL | |||
51 | /// </summary> | 51 | /// </summary> |
52 | public MSSQLManager database; | 52 | public MSSQLManager database; |
53 | 53 | ||
54 | private string m_agentsTableName; | 54 | private const string m_agentsTableName = "agents"; |
55 | private string m_usersTableName; | 55 | private const string m_usersTableName = "users"; |
56 | private string m_userFriendsTableName; | 56 | private const string m_userFriendsTableName = "userfriends"; |
57 | 57 | ||
58 | override public void Initialise() | 58 | override public void Initialise() |
59 | { | 59 | { |
@@ -68,7 +68,6 @@ namespace OpenSim.Data.MSSQL | |||
68 | /// <remarks>use mssql_connection.ini</remarks> | 68 | /// <remarks>use mssql_connection.ini</remarks> |
69 | override public void Initialise(string connect) | 69 | override public void Initialise(string connect) |
70 | { | 70 | { |
71 | IniFile iniFile = new IniFile("mssql_connection.ini"); | ||
72 | 71 | ||
73 | if (string.IsNullOrEmpty(connect)) | 72 | if (string.IsNullOrEmpty(connect)) |
74 | { | 73 | { |
@@ -76,6 +75,8 @@ namespace OpenSim.Data.MSSQL | |||
76 | } | 75 | } |
77 | else | 76 | else |
78 | { | 77 | { |
78 | IniFile iniFile = new IniFile("mssql_connection.ini"); | ||
79 | |||
79 | string settingDataSource = iniFile.ParseFileReadValue("data_source"); | 80 | string settingDataSource = iniFile.ParseFileReadValue("data_source"); |
80 | string settingInitialCatalog = iniFile.ParseFileReadValue("initial_catalog"); | 81 | string settingInitialCatalog = iniFile.ParseFileReadValue("initial_catalog"); |
81 | string settingPersistSecurityInfo = iniFile.ParseFileReadValue("persist_security_info"); | 82 | string settingPersistSecurityInfo = iniFile.ParseFileReadValue("persist_security_info"); |
@@ -85,23 +86,23 @@ namespace OpenSim.Data.MSSQL | |||
85 | database = new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId, settingPassword); | 86 | database = new MSSQLManager(settingDataSource, settingInitialCatalog, settingPersistSecurityInfo, settingUserId, settingPassword); |
86 | } | 87 | } |
87 | 88 | ||
88 | m_usersTableName = iniFile.ParseFileReadValue("userstablename"); | 89 | // m_usersTableName = iniFile.ParseFileReadValue("userstablename"); |
89 | if (m_usersTableName == null) | 90 | // if (m_usersTableName == null) |
90 | { | 91 | // { |
91 | m_usersTableName = "users"; | 92 | // m_usersTableName = "users"; |
92 | } | 93 | // } |
93 | 94 | // | |
94 | m_userFriendsTableName = iniFile.ParseFileReadValue("userfriendstablename"); | 95 | // m_userFriendsTableName = iniFile.ParseFileReadValue("userfriendstablename"); |
95 | if (m_userFriendsTableName == null) | 96 | // if (m_userFriendsTableName == null) |
96 | { | 97 | // { |
97 | m_userFriendsTableName = "userfriends"; | 98 | // m_userFriendsTableName = "userfriends"; |
98 | } | 99 | // } |
99 | 100 | // | |
100 | m_agentsTableName = iniFile.ParseFileReadValue("agentstablename"); | 101 | // m_agentsTableName = iniFile.ParseFileReadValue("agentstablename"); |
101 | if (m_agentsTableName == null) | 102 | // if (m_agentsTableName == null) |
102 | { | 103 | // { |
103 | m_agentsTableName = "agents"; | 104 | // m_agentsTableName = "agents"; |
104 | } | 105 | // } |
105 | 106 | ||
106 | //TODO this can be removed at one time!!!!! | 107 | //TODO this can be removed at one time!!!!! |
107 | TestTables(); | 108 | TestTables(); |
@@ -110,6 +111,9 @@ namespace OpenSim.Data.MSSQL | |||
110 | database.CheckMigration(_migrationStore); | 111 | database.CheckMigration(_migrationStore); |
111 | } | 112 | } |
112 | 113 | ||
114 | /// <summary> | ||
115 | /// Releases unmanaged and - optionally - managed resources | ||
116 | /// </summary> | ||
113 | override public void Dispose() { } | 117 | override public void Dispose() { } |
114 | 118 | ||
115 | /// <summary> | 119 | /// <summary> |