aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface
diff options
context:
space:
mode:
authorDavid Walter Seikel2016-11-03 21:44:39 +1000
committerDavid Walter Seikel2016-11-03 21:44:39 +1000
commit134f86e8d5c414409631b25b8c6f0ee45fbd8631 (patch)
tree216b89d3fb89acfb81be1e440c25c41ab09fa96d /OpenSim/Region/ScriptEngine/Shared/Api/Interface
parentMore changing to production grid. Double oops. (diff)
downloadopensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.zip
opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.gz
opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.bz2
opensim-SC-134f86e8d5c414409631b25b8c6f0ee45fbd8631.tar.xz
Initial update to OpenSim 0.8.2.1 source code.
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs9
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs26
2 files changed, 34 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
index 98f8be7..3d58573 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
@@ -124,6 +124,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
124 LSL_String llGetCreator(); 124 LSL_String llGetCreator();
125 LSL_String llGetDate(); 125 LSL_String llGetDate();
126 LSL_Float llGetEnergy(); 126 LSL_Float llGetEnergy();
127 LSL_String llGetEnv(LSL_String name);
127 LSL_Vector llGetForce(); 128 LSL_Vector llGetForce();
128 LSL_Integer llGetFreeMemory(); 129 LSL_Integer llGetFreeMemory();
129 LSL_Integer llGetFreeURLs(); 130 LSL_Integer llGetFreeURLs();
@@ -149,6 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
149 LSL_Vector llGetLocalPos(); 150 LSL_Vector llGetLocalPos();
150 LSL_Rotation llGetLocalRot(); 151 LSL_Rotation llGetLocalRot();
151 LSL_Float llGetMass(); 152 LSL_Float llGetMass();
153 LSL_Float llGetMassMKS();
152 LSL_Integer llGetMemoryLimit(); 154 LSL_Integer llGetMemoryLimit();
153 void llGetNextEmail(string address, string subject); 155 void llGetNextEmail(string address, string subject);
154 LSL_String llGetNotecardLine(string name, int line); 156 LSL_String llGetNotecardLine(string name, int line);
@@ -207,7 +209,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
207 LSL_Float llGetWallclock(); 209 LSL_Float llGetWallclock();
208 void llGiveInventory(string destination, string inventory); 210 void llGiveInventory(string destination, string inventory);
209 void llGiveInventoryList(string destination, string category, LSL_List inventory); 211 void llGiveInventoryList(string destination, string category, LSL_List inventory);
210 LSL_Integer llGiveMoney(string destination, int amount); 212 void llGiveMoney(string destination, int amount);
213 LSL_String llTransferLindenDollars(string destination, int amount);
211 void llGodLikeRezObject(string inventory, LSL_Vector pos); 214 void llGodLikeRezObject(string inventory, LSL_Vector pos);
212 LSL_Float llGround(LSL_Vector offset); 215 LSL_Float llGround(LSL_Vector offset);
213 LSL_Vector llGroundContour(LSL_Vector offset); 216 LSL_Vector llGroundContour(LSL_Vector offset);
@@ -337,9 +340,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
337 void llSetCameraParams(LSL_List rules); 340 void llSetCameraParams(LSL_List rules);
338 void llSetClickAction(int action); 341 void llSetClickAction(int action);
339 void llSetColor(LSL_Vector color, int face); 342 void llSetColor(LSL_Vector color, int face);
343 void llSetContentType(LSL_Key id, LSL_Integer type);
340 void llSetDamage(double damage); 344 void llSetDamage(double damage);
341 void llSetForce(LSL_Vector force, int local); 345 void llSetForce(LSL_Vector force, int local);
342 void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local); 346 void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local);
347 void llSetVelocity(LSL_Vector velocity, int local);
348 void llSetAngularVelocity(LSL_Vector angularVelocity, int local);
343 void llSetHoverHeight(double height, int water, double tau); 349 void llSetHoverHeight(double height, int water, double tau);
344 void llSetInventoryPermMask(string item, int mask, int value); 350 void llSetInventoryPermMask(string item, int mask, int value);
345 void llSetLinkAlpha(int linknumber, double alpha, int face); 351 void llSetLinkAlpha(int linknumber, double alpha, int face);
@@ -426,6 +432,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
426 void print(string str); 432 void print(string str);
427 433
428 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc); 434 void SetPrimitiveParamsEx(LSL_Key prim, LSL_List rules, string originFunc);
435 void llSetKeyframedMotion(LSL_List frames, LSL_List options);
429 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules); 436 LSL_List GetPrimitiveParamsEx(LSL_Key prim, LSL_List rules);
430 } 437 }
431} 438}
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index cdd9ea8..6259b76 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -259,6 +259,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
259 259
260 string osGetScriptEngineName(); 260 string osGetScriptEngineName();
261 string osGetSimulatorVersion(); 261 string osGetSimulatorVersion();
262 LSL_Integer osCheckODE();
263 string osGetPhysicsEngineType();
262 Object osParseJSONNew(string JSON); 264 Object osParseJSONNew(string JSON);
263 Hashtable osParseJSON(string JSON); 265 Hashtable osParseJSON(string JSON);
264 266
@@ -281,6 +283,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
281 string osGetGridGatekeeperURI(); 283 string osGetGridGatekeeperURI();
282 string osGetGridCustom(string key); 284 string osGetGridCustom(string key);
283 285
286 string osGetAvatarHomeURI(string uuid);
287
284 LSL_String osFormatString(string str, LSL_List strings); 288 LSL_String osFormatString(string str, LSL_List strings);
285 LSL_List osMatchString(string src, string pattern, int start); 289 LSL_List osMatchString(string src, string pattern, int start);
286 LSL_String osReplaceString(string src, string pattern, string replace, int count, int start); 290 LSL_String osReplaceString(string src, string pattern, string replace, int count, int start);
@@ -293,6 +297,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
293 LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules); 297 LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules);
294 298
295 /// <summary> 299 /// <summary>
300 /// Identical to llCreateLink() but does not require permission from the owner.
301 /// </summary>
302 /// <param name='target'></param>
303 /// <param name='parent'></param>
304 void osForceCreateLink(string target, int parent);
305
306 /// <summary>
307 /// Identical to llBreakLink() but does not require permission from the owner.
308 /// </summary>
309 /// <param name='linknum'></param>
310 void osForceBreakLink(int linknum);
311
312 /// <summary>
313 /// Identical to llBreakAllLinks() but does not require permission from the owner.
314 /// </summary>
315 void osForceBreakAllLinks();
316
317 /// <summary>
296 /// Check if the given key is an npc 318 /// Check if the given key is an npc
297 /// </summary> 319 /// </summary>
298 /// <param name="npc"></param> 320 /// <param name="npc"></param>
@@ -333,9 +355,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
333 LSL_Key osOwnerSaveAppearance(string notecard); 355 LSL_Key osOwnerSaveAppearance(string notecard);
334 LSL_Key osAgentSaveAppearance(key agentId, string notecard); 356 LSL_Key osAgentSaveAppearance(key agentId, string notecard);
335 357
358 key osGetGender(LSL_Key rawAvatarId);
336 key osGetMapTexture(); 359 key osGetMapTexture();
337 key osGetRegionMapTexture(string regionName); 360 key osGetRegionMapTexture(string regionName);
338 LSL_List osGetRegionStats(); 361 LSL_List osGetRegionStats();
362 vector osGetRegionSize();
339 363
340 int osGetSimulatorMemory(); 364 int osGetSimulatorMemory();
341 void osKickAvatar(string FirstName,string SurName,string alert); 365 void osKickAvatar(string FirstName,string SurName,string alert);
@@ -343,6 +367,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
343 LSL_Float osGetHealth(string avatar); 367 LSL_Float osGetHealth(string avatar);
344 void osCauseHealing(string avatar, double healing); 368 void osCauseHealing(string avatar, double healing);
345 void osCauseDamage(string avatar, double damage); 369 void osCauseDamage(string avatar, double damage);
370 void osForceOtherSit(string avatar);
371 void osForceOtherSit(string avatar, string target);
346 LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules); 372 LSL_List osGetPrimitiveParams(LSL_Key prim, LSL_List rules);
347 void osSetPrimitiveParams(LSL_Key prim, LSL_List rules); 373 void osSetPrimitiveParams(LSL_Key prim, LSL_List rules);
348 void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb); 374 void osSetProjectionParams(bool projection, LSL_Key texture, double fov, double focus, double amb);