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/Region/Framework/Interfaces/IWorldComm.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/Region/Framework/Interfaces/IWorldComm.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IWorldComm.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs index d76a0d7..3da4130 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs | |||
| @@ -140,7 +140,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 140 | /// </summary> | 140 | /// </summary> |
| 141 | /// <returns>ListenerInfo with filter filled in</returns> | 141 | /// <returns>ListenerInfo with filter filled in</returns> |
| 142 | IWorldCommListenerInfo GetNextMessage(); | 142 | IWorldCommListenerInfo GetNextMessage(); |
| 143 | 143 | ||
| 144 | void ListenControl(UUID itemID, int handle, int active); | 144 | void ListenControl(UUID itemID, int handle, int active); |
| 145 | void ListenRemove(UUID itemID, int handle); | 145 | void ListenRemove(UUID itemID, int handle); |
| 146 | void DeleteListener(UUID itemID); | 146 | void DeleteListener(UUID itemID); |