ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
This commit is contained in:
Melanie
2012-12-04 23:01:18 +00:00
parent 56b2bc7101 583e44103c
commit 5837e731bf
20 changed files with 770 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Interfaces/IXmlRpcRouter.cs
View File

@@ -34,5 +34,6 @@ namespace OpenSim.Region.Framework.Interfaces
void RegisterNewReceiver(IScriptModule scriptEngine, UUID channelID, UUID objectID, UUID itemID, string url);
void ScriptRemoved(UUID itemID);
void ObjectRemoved(UUID objectID);
void UnRegisterReceiver(string channelID, UUID itemID);
}
}