Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-07-20 22:12:02 +01:00
4 changed files with 39 additions and 3 deletions

View File

@@ -930,5 +930,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
{
m_OSSL_Functions.osSetTerrainTextureHeight(corner, low, high);
}
public LSL_Integer osIsUUID(string thing)
{
return m_OSSL_Functions.osIsUUID(thing);
}
}
}