diff options
| author | Teravus Ovares (Dan Olivares) | 2010-05-02 20:08:59 -0400 |
|---|---|---|
| committer | Teravus Ovares (Dan Olivares) | 2010-05-02 20:08:59 -0400 |
| commit | fc3e24af9c5f011546df485ec29dc198a8c8c316 (patch) | |
| tree | fc271408de336b3755ee4e3be6db96b73431788b /OpenSim | |
| parent | Modify README.txt to trigger new build /again/ (diff) | |
| parent | Make the IUserAccountData properly unpack the god mode data, so grid gods (diff) | |
| download | opensim-SC_OLD-fc3e24af9c5f011546df485ec29dc198a8c8c316.zip opensim-SC_OLD-fc3e24af9c5f011546df485ec29dc198a8c8c316.tar.gz opensim-SC_OLD-fc3e24af9c5f011546df485ec29dc198a8c8c316.tar.bz2 opensim-SC_OLD-fc3e24af9c5f011546df485ec29dc198a8c8c316.tar.xz | |
Merge branch 'master' of ssh://MyConnection/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Services/Interfaces/IUserAccountService.cs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs index 1527db2..38c191a 100644 --- a/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs +++ b/OpenSim/Services/Connectors/UserAccounts/UserAccountServiceConnector.cs | |||
| @@ -113,7 +113,7 @@ namespace OpenSim.Services.Connectors | |||
| 113 | 113 | ||
| 114 | public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID) | 114 | public virtual UserAccount GetUserAccount(UUID scopeID, UUID userID) |
| 115 | { | 115 | { |
| 116 | m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUSerAccount {0}", userID); | 116 | m_log.DebugFormat("[ACCOUNTS CONNECTOR]: GetUserAccount {0}", userID); |
| 117 | Dictionary<string, object> sendData = new Dictionary<string, object>(); | 117 | Dictionary<string, object> sendData = new Dictionary<string, object>(); |
| 118 | //sendData["SCOPEID"] = scopeID.ToString(); | 118 | //sendData["SCOPEID"] = scopeID.ToString(); |
| 119 | sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); | 119 | sendData["VERSIONMIN"] = ProtocolVersions.ClientProtocolVersionMin.ToString(); |
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs index befd14e..e316731 100644 --- a/OpenSim/Services/Interfaces/IUserAccountService.cs +++ b/OpenSim/Services/Interfaces/IUserAccountService.cs | |||
| @@ -84,11 +84,11 @@ namespace OpenSim.Services.Interfaces | |||
| 84 | if (kvp.ContainsKey("ScopeID")) | 84 | if (kvp.ContainsKey("ScopeID")) |
| 85 | UUID.TryParse(kvp["ScopeID"].ToString(), out ScopeID); | 85 | UUID.TryParse(kvp["ScopeID"].ToString(), out ScopeID); |
| 86 | if (kvp.ContainsKey("UserLevel")) | 86 | if (kvp.ContainsKey("UserLevel")) |
| 87 | Convert.ToInt32(kvp["UserLevel"].ToString()); | 87 | UserLevel = Convert.ToInt32(kvp["UserLevel"].ToString()); |
| 88 | if (kvp.ContainsKey("UserFlags")) | 88 | if (kvp.ContainsKey("UserFlags")) |
| 89 | Convert.ToInt32(kvp["UserFlags"].ToString()); | 89 | UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString()); |
| 90 | if (kvp.ContainsKey("UserTitle")) | 90 | if (kvp.ContainsKey("UserTitle")) |
| 91 | Email = kvp["UserTitle"].ToString(); | 91 | UserTitle = kvp["UserTitle"].ToString(); |
| 92 | 92 | ||
| 93 | if (kvp.ContainsKey("Created")) | 93 | if (kvp.ContainsKey("Created")) |
| 94 | Convert.ToInt32(kvp["Created"].ToString()); | 94 | Convert.ToInt32(kvp["Created"].ToString()); |