diff options
| author | teravus | 2012-11-15 09:46:41 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 09:46:41 -0500 |
| commit | dfac269032300872c4d0dc507f4f9062d102b0f4 (patch) | |
| tree | d60fca83f54417c349c33b46de6ac65748ff762f /OpenSim/Services/Interfaces/IGridUserService.cs | |
| parent | * Fixes mesh loading issues in last commit. (diff) | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.zip opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.gz opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.bz2 opensim-SC_OLD-dfac269032300872c4d0dc507f4f9062d102b0f4.tar.xz | |
Merge master into teravuswork
Diffstat (limited to 'OpenSim/Services/Interfaces/IGridUserService.cs')
| -rw-r--r-- | OpenSim/Services/Interfaces/IGridUserService.cs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs index 0a52bfa..2e7237e 100644 --- a/OpenSim/Services/Interfaces/IGridUserService.cs +++ b/OpenSim/Services/Interfaces/IGridUserService.cs | |||
| @@ -80,7 +80,7 @@ namespace OpenSim.Services.Interfaces | |||
| 80 | 80 | ||
| 81 | } | 81 | } |
| 82 | 82 | ||
| 83 | public Dictionary<string, object> ToKeyValuePairs() | 83 | public virtual Dictionary<string, object> ToKeyValuePairs() |
| 84 | { | 84 | { |
| 85 | Dictionary<string, object> result = new Dictionary<string, object>(); | 85 | Dictionary<string, object> result = new Dictionary<string, object>(); |
| 86 | result["UserID"] = UserID; | 86 | result["UserID"] = UserID; |
| @@ -96,7 +96,6 @@ namespace OpenSim.Services.Interfaces | |||
| 96 | result["Online"] = Online.ToString(); | 96 | result["Online"] = Online.ToString(); |
| 97 | result["Login"] = Login.ToString(); | 97 | result["Login"] = Login.ToString(); |
| 98 | result["Logout"] = Logout.ToString(); | 98 | result["Logout"] = Logout.ToString(); |
| 99 | |||
| 100 | 99 | ||
| 101 | return result; | 100 | return result; |
| 102 | } | 101 | } |