diff options
| author | Robert Adams | 2014-01-19 07:38:53 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-19 07:38:53 -0800 |
| commit | f127e4b4ee916a429ef1d9922432869d4138e214 (patch) | |
| tree | be90e6cea8d61088e8380e7027881a8d13f67849 /OpenSim/Data/IOfflineIMData.cs | |
| parent | varregion: Update Warp3D to properly handle varregions. (diff) | |
| parent | Fix casting error for float type INI file parameter parsing. (diff) | |
| download | opensim-SC-f127e4b4ee916a429ef1d9922432869d4138e214.zip opensim-SC-f127e4b4ee916a429ef1d9922432869d4138e214.tar.gz opensim-SC-f127e4b4ee916a429ef1d9922432869d4138e214.tar.bz2 opensim-SC-f127e4b4ee916a429ef1d9922432869d4138e214.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to 'OpenSim/Data/IOfflineIMData.cs')
| -rw-r--r-- | OpenSim/Data/IOfflineIMData.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Data/IOfflineIMData.cs b/OpenSim/Data/IOfflineIMData.cs index e780304..58501a3 100644 --- a/OpenSim/Data/IOfflineIMData.cs +++ b/OpenSim/Data/IOfflineIMData.cs | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Copyright (c) Contributors, http://opensimulator.org/ | 2 | * Copyright (c) Contributors, http://opensimulator.org/ |
| 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | 3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. |
| 4 | * | 4 | * |
| @@ -34,6 +34,7 @@ namespace OpenSim.Data | |||
| 34 | public class OfflineIMData | 34 | public class OfflineIMData |
| 35 | { | 35 | { |
| 36 | public UUID PrincipalID; | 36 | public UUID PrincipalID; |
| 37 | public UUID FromID; | ||
| 37 | public Dictionary<string, string> Data; | 38 | public Dictionary<string, string> Data; |
| 38 | } | 39 | } |
| 39 | 40 | ||