Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-11-17 18:21:35 +00:00
5 changed files with 61 additions and 12 deletions

View File

@@ -184,5 +184,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
LSL_List osGetAvatarList();
LSL_String osUnixTimeToTimestamp(long time);
}
}