Merge branch 'master' into careminster

This commit is contained in:
Melanie
2012-01-21 19:52:33 +00:00
22 changed files with 762 additions and 46 deletions

View File

@@ -160,6 +160,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
string osGetGridNick();
string osGetGridName();
string osGetGridLoginURI();
string osGetGridHomeURI();
string osGetGridCustom(string key);
LSL_String osFormatString(string str, LSL_List strings);
LSL_List osMatchString(string src, string pattern, int start);