diff options
| author | Melanie | 2013-02-10 00:17:14 +0000 |
|---|---|---|
| committer | Melanie | 2013-02-10 00:17:14 +0000 |
| commit | 069e587841465d8d041164929e27fc891b66a64a (patch) | |
| tree | c37a59b837bfbac696850a7af2b8f20c520141ba /OpenSim/Services/Connectors | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.zip opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.tar.gz opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.tar.bz2 opensim-SC_OLD-069e587841465d8d041164929e27fc891b66a64a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
Diffstat (limited to 'OpenSim/Services/Connectors')
| -rw-r--r-- | OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs index 5731e2f..6b2d710 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServicesConnector.cs | |||
| @@ -162,7 +162,7 @@ namespace OpenSim.Services.Connectors | |||
| 162 | 162 | ||
| 163 | if (replyData != null) | 163 | if (replyData != null) |
| 164 | { | 164 | { |
| 165 | if (replyData.ContainsKey("result") && replyData.ContainsKey("result").ToString() == "null") | 165 | if (replyData.ContainsKey("result") && replyData["result"].ToString() == "null") |
| 166 | { | 166 | { |
| 167 | return accounts; | 167 | return accounts; |
| 168 | } | 168 | } |