Merge branch 'master' into careminster

This commit is contained in:
Melanie
2010-01-03 21:43:39 +00:00
56 changed files with 1095 additions and 838 deletions

View File

@@ -162,7 +162,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
key osGetMapTexture();
key osGetRegionMapTexture(string regionName);
LSL_List osGetRegionStats();
LSL_List osGetRegionStats();
int osGetSimulatorMemory();
void osKickAvatar(string FirstName,string SurName,string alert);