diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Services/Interfaces/IOfflineIMService.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to 'OpenSim/Services/Interfaces/IOfflineIMService.cs')
| -rw-r--r-- | OpenSim/Services/Interfaces/IOfflineIMService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Services/Interfaces/IOfflineIMService.cs b/OpenSim/Services/Interfaces/IOfflineIMService.cs index 588aaaf..db501fd 100644 --- a/OpenSim/Services/Interfaces/IOfflineIMService.cs +++ b/OpenSim/Services/Interfaces/IOfflineIMService.cs | |||
| @@ -35,9 +35,9 @@ namespace OpenSim.Services.Interfaces | |||
| 35 | public interface IOfflineIMService | 35 | public interface IOfflineIMService |
| 36 | { | 36 | { |
| 37 | List<GridInstantMessage> GetMessages(UUID principalID); | 37 | List<GridInstantMessage> GetMessages(UUID principalID); |
| 38 | 38 | ||
| 39 | bool StoreMessage(GridInstantMessage im, out string reason); | 39 | bool StoreMessage(GridInstantMessage im, out string reason); |
| 40 | 40 | ||
| 41 | /// <summary> | 41 | /// <summary> |
| 42 | /// Delete messages to or from this user (or group). | 42 | /// Delete messages to or from this user (or group). |
| 43 | /// </summary> | 43 | /// </summary> |