diff options
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserData.cs | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index 5f7db15..3226162 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs | |||
@@ -58,9 +58,9 @@ namespace OpenSim.Data.MySQL | |||
58 | public int m_maxConnections = 10; | 58 | public int m_maxConnections = 10; |
59 | public int m_lastConnect; | 59 | public int m_lastConnect; |
60 | 60 | ||
61 | private string m_agentsTableName; | 61 | private string m_agentsTableName = "agents"; |
62 | private string m_usersTableName; | 62 | private string m_usersTableName = "users"; |
63 | private string m_userFriendsTableName; | 63 | private string m_userFriendsTableName = "userfriends"; |
64 | private string m_appearanceTableName = "avatarappearance"; | 64 | private string m_appearanceTableName = "avatarappearance"; |
65 | private string m_attachmentsTableName = "avatarattachments"; | 65 | private string m_attachmentsTableName = "avatarattachments"; |
66 | private string m_connectString; | 66 | private string m_connectString; |
@@ -123,24 +123,6 @@ namespace OpenSim.Data.MySQL | |||
123 | string settingPooling = iniFile.ParseFileReadValue("pooling"); | 123 | string settingPooling = iniFile.ParseFileReadValue("pooling"); |
124 | string settingPort = iniFile.ParseFileReadValue("port"); | 124 | string settingPort = iniFile.ParseFileReadValue("port"); |
125 | 125 | ||
126 | m_usersTableName = iniFile.ParseFileReadValue("userstablename"); | ||
127 | if (m_usersTableName == null) | ||
128 | { | ||
129 | m_usersTableName = "users"; | ||
130 | } | ||
131 | |||
132 | m_userFriendsTableName = iniFile.ParseFileReadValue("userfriendstablename"); | ||
133 | if (m_userFriendsTableName == null) | ||
134 | { | ||
135 | m_userFriendsTableName = "userfriends"; | ||
136 | } | ||
137 | |||
138 | m_agentsTableName = iniFile.ParseFileReadValue("agentstablename"); | ||
139 | if (m_agentsTableName == null) | ||
140 | { | ||
141 | m_agentsTableName = "agents"; | ||
142 | } | ||
143 | |||
144 | m_connectString = "Server=" + settingHostname + ";Port=" + settingPort + ";Database=" + settingDatabase + | 126 | m_connectString = "Server=" + settingHostname + ";Port=" + settingPort + ";Database=" + settingDatabase + |
145 | ";User ID=" + | 127 | ";User ID=" + |
146 | settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";"; | 128 | settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";"; |
@@ -159,9 +141,6 @@ namespace OpenSim.Data.MySQL | |||
159 | else | 141 | else |
160 | { | 142 | { |
161 | m_connectString = connect; | 143 | m_connectString = connect; |
162 | m_agentsTableName = "agents"; | ||
163 | m_usersTableName = "users"; | ||
164 | m_userFriendsTableName = "userfriends"; | ||
165 | database = new MySQLManager(m_connectString); | 144 | database = new MySQLManager(m_connectString); |
166 | 145 | ||
167 | m_log.Info("Creating " + m_maxConnections + " DB connections..."); | 146 | m_log.Info("Creating " + m_maxConnections + " DB connections..."); |