diff options
| author | Melanie | 2012-12-04 23:01:18 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-04 23:01:18 +0000 |
| commit | 5837e731bfbd7ceafbd45aaf61c566440b25bf7e (patch) | |
| tree | 8ab9e0a345d5c5f281dc0b59085195f03126da12 /OpenSim/Region/Framework/Interfaces/IXmlRpcRouter.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Bug fix in OfflineMessageModule. Mantis #6446 (diff) | |
| download | opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.zip opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.gz opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.bz2 opensim-SC-5837e731bfbd7ceafbd45aaf61c566440b25bf7e.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IXmlRpcRouter.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IXmlRpcRouter.cs b/OpenSim/Region/Framework/Interfaces/IXmlRpcRouter.cs index 6db6674..093d3f0 100644 --- a/OpenSim/Region/Framework/Interfaces/IXmlRpcRouter.cs +++ b/OpenSim/Region/Framework/Interfaces/IXmlRpcRouter.cs | |||
| @@ -34,5 +34,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 34 | void RegisterNewReceiver(IScriptModule scriptEngine, UUID channelID, UUID objectID, UUID itemID, string url); | 34 | void RegisterNewReceiver(IScriptModule scriptEngine, UUID channelID, UUID objectID, UUID itemID, string url); |
| 35 | void ScriptRemoved(UUID itemID); | 35 | void ScriptRemoved(UUID itemID); |
| 36 | void ObjectRemoved(UUID objectID); | 36 | void ObjectRemoved(UUID objectID); |
| 37 | void UnRegisterReceiver(string channelID, UUID itemID); | ||
| 37 | } | 38 | } |
| 38 | } | 39 | } |