Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-06-12 01:26:55 +01:00
10 changed files with 71 additions and 21 deletions

View File

@@ -1310,5 +1310,7 @@ namespace OpenSim.Framework
void SendChangeUserRights(UUID agentID, UUID friendID, int rights);
void SendTextBoxRequest(string message, int chatChannel, string objectname, string ownerFirstName, string ownerLastName, UUID objectId);
void StopFlying(ISceneEntity presence);
}
}