diff options
| author | Melanie | 2012-04-23 20:44:41 +0100 |
|---|---|---|
| committer | Melanie | 2012-04-23 20:44:41 +0100 |
| commit | e9037098475202c02d3327d2dff877d0fd108c93 (patch) | |
| tree | cd52623e1f12ffe0ca98609f270d27d30afc35af /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Mantis 5977 Corrections to llRegionSayTo (diff) | |
| download | opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.zip opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.gz opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.bz2 opensim-SC-e9037098475202c02d3327d2dff877d0fd108c93.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -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 e8e375e..4e74781 100644 --- a/OpenSim/Region/Framework/Interfaces/IWorldComm.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs | |||
| @@ -103,7 +103,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 103 | /// <param name='msg'> | 103 | /// <param name='msg'> |
| 104 | /// Message. | 104 | /// Message. |
| 105 | /// </param> | 105 | /// </param> |
| 106 | bool DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg, out string error); | 106 | void DeliverMessageTo(UUID target, int channel, Vector3 pos, string name, UUID id, string msg); |
| 107 | 107 | ||
| 108 | /// <summary> | 108 | /// <summary> |
| 109 | /// Are there any listen events ready to be dispatched? | 109 | /// Are there any listen events ready to be dispatched? |