diff options
| author | UbitUmarov | 2016-12-14 13:35:53 +0000 |
|---|---|---|
| committer | UbitUmarov | 2016-12-14 13:35:53 +0000 |
| commit | 18a292ad02e590619760a71aeb1514e6916b257f (patch) | |
| tree | 584faa43265cc20ee36d92b2bc14cb1c55435ef0 /OpenSim/Framework/Util.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | fix: check for region_handle before region_id, viewers are so funny.. (diff) | |
| download | opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.zip opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.gz opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.bz2 opensim-SC-18a292ad02e590619760a71aeb1514e6916b257f.tar.xz | |
Merge branch 'master' into httptests
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Framework/Util.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs index 01a06cd..a6fd99f 100644 --- a/OpenSim/Framework/Util.cs +++ b/OpenSim/Framework/Util.cs | |||
| @@ -1685,6 +1685,8 @@ namespace OpenSim.Framework | |||
| 1685 | 1685 | ||
| 1686 | // hide the password in the connection string | 1686 | // hide the password in the connection string |
| 1687 | passPosition = connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase); | 1687 | passPosition = connectionString.IndexOf("password", StringComparison.OrdinalIgnoreCase); |
| 1688 | if (passPosition == -1) | ||
| 1689 | return connectionString; | ||
| 1688 | passPosition = connectionString.IndexOf("=", passPosition); | 1690 | passPosition = connectionString.IndexOf("=", passPosition); |
| 1689 | if (passPosition < connectionString.Length) | 1691 | if (passPosition < connectionString.Length) |
| 1690 | passPosition += 1; | 1692 | passPosition += 1; |