diff options
author | Jeff Ames | 2008-07-19 09:35:48 +0000 |
---|---|---|
committer | Jeff Ames | 2008-07-19 09:35:48 +0000 |
commit | 19fd2230bfda7ff3419e97157be07adc49e933f5 (patch) | |
tree | 5e0a6468be81aa7626ca8018e900cdcaf5e5fc3e /OpenSim/Data/MySQL | |
parent | Quick fix to make the estate ban list effective again, when the region (diff) | |
download | opensim-SC_OLD-19fd2230bfda7ff3419e97157be07adc49e933f5.zip opensim-SC_OLD-19fd2230bfda7ff3419e97157be07adc49e933f5.tar.gz opensim-SC_OLD-19fd2230bfda7ff3419e97157be07adc49e933f5.tar.bz2 opensim-SC_OLD-19fd2230bfda7ff3419e97157be07adc49e933f5.tar.xz |
Update svn properties. Fix some inconsistent newlines.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLEstateData.cs | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/OpenSim/Data/MySQL/MySQLEstateData.cs b/OpenSim/Data/MySQL/MySQLEstateData.cs index c0395a9..f8641bc 100644 --- a/OpenSim/Data/MySQL/MySQLEstateData.cs +++ b/OpenSim/Data/MySQL/MySQLEstateData.cs | |||
@@ -59,29 +59,29 @@ namespace OpenSim.Data.MySQL | |||
59 | 59 | ||
60 | public void Initialise(string connectionString) | 60 | public void Initialise(string connectionString) |
61 | { | 61 | { |
62 | m_connectionString = connectionString; | 62 | m_connectionString = connectionString; |
63 | 63 | ||
64 | int passPosition = 0; | 64 | int passPosition = 0; |
65 | int passEndPosition = 0; | 65 | int passEndPosition = 0; |
66 | string displayConnectionString = null; | 66 | string displayConnectionString = null; |
67 | 67 | ||
68 | try | 68 | try |
69 | { // hide the password in the connection string | 69 | { // hide the password in the connection string |
70 | passPosition = m_connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase); | 70 | passPosition = m_connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase); |
71 | passPosition = m_connectionString.IndexOf("=", passPosition); | 71 | passPosition = m_connectionString.IndexOf("=", passPosition); |
72 | if (passPosition < m_connectionString.Length) | 72 | if (passPosition < m_connectionString.Length) |
73 | passPosition += 1; | 73 | passPosition += 1; |
74 | passEndPosition = m_connectionString.IndexOf(";", passPosition); | 74 | passEndPosition = m_connectionString.IndexOf(";", passPosition); |
75 | 75 | ||
76 | displayConnectionString = m_connectionString.Substring(0, passPosition); | 76 | displayConnectionString = m_connectionString.Substring(0, passPosition); |
77 | displayConnectionString += "***"; | 77 | displayConnectionString += "***"; |
78 | displayConnectionString += m_connectionString.Substring(passEndPosition, m_connectionString.Length - passEndPosition); | 78 | displayConnectionString += m_connectionString.Substring(passEndPosition, m_connectionString.Length - passEndPosition); |
79 | } | 79 | } |
80 | catch (Exception e) | 80 | catch (Exception e) |
81 | { | 81 | { |
82 | m_log.Debug("Exception: password not found in connection string\n" + e.ToString()); | 82 | m_log.Debug("Exception: password not found in connection string\n" + e.ToString()); |
83 | } | 83 | } |
84 | 84 | ||
85 | m_log.Info("[REGION DB]: MySql - connecting: " + displayConnectionString); | 85 | m_log.Info("[REGION DB]: MySql - connecting: " + displayConnectionString); |
86 | 86 | ||
87 | //m_log.Info("[ESTATE DB]: MySql - connecting: "+m_connectionString); | 87 | //m_log.Info("[ESTATE DB]: MySql - connecting: "+m_connectionString); |