diff options
| author | Melanie | 2012-09-29 19:21:07 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-29 19:21:07 +0100 |
| commit | 71dd55a1ce8560dba3fbab76e25bbeaf974f422a (patch) | |
| tree | b1c3759d25e29b8ab9b2c61da3f408c6aa7803f4 /OpenSim/Services/UserAccountService | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Get rid of some unnecessary casts in RemoteAdminPlugin. (diff) | |
| download | opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.zip opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.gz opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.bz2 opensim-SC_OLD-71dd55a1ce8560dba3fbab76e25bbeaf974f422a.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
CONTRIBUTORS.txt
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
Diffstat (limited to 'OpenSim/Services/UserAccountService')
| -rw-r--r-- | OpenSim/Services/UserAccountService/GridUserService.cs | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/OpenSim/Services/UserAccountService/GridUserService.cs b/OpenSim/Services/UserAccountService/GridUserService.cs index 8eae859..ac3d8fd 100644 --- a/OpenSim/Services/UserAccountService/GridUserService.cs +++ b/OpenSim/Services/UserAccountService/GridUserService.cs | |||
| @@ -70,8 +70,6 @@ namespace OpenSim.Services.UserAccountService | |||
| 70 | info.Login = Util.ToDateTime(Convert.ToInt32(d.Data["Login"])); | 70 | info.Login = Util.ToDateTime(Convert.ToInt32(d.Data["Login"])); |
| 71 | info.Logout = Util.ToDateTime(Convert.ToInt32(d.Data["Logout"])); | 71 | info.Logout = Util.ToDateTime(Convert.ToInt32(d.Data["Logout"])); |
| 72 | 72 | ||
| 73 | info.TOS = d.Data["TOS"]; | ||
| 74 | |||
| 75 | return info; | 73 | return info; |
| 76 | } | 74 | } |
| 77 | 75 | ||