Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-11-25 03:27:35 +00:00
6 changed files with 67 additions and 126 deletions

View File

@@ -73,7 +73,7 @@ namespace OpenSim.Framework
void AddNewClient(IClientAPI client);
void RemoveClient(UUID agentID);
void Restart(int seconds);
void Restart();
//RegionInfo OtherRegionUp(RegionInfo thisRegion);
string GetSimulatorVersion();