diff options
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 55 |
1 files changed, 39 insertions, 16 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index 00ca070..dbc1dfc 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -42,6 +42,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
42 | { | 42 | { |
43 | public enum ThreatLevel | 43 | public enum ThreatLevel |
44 | { | 44 | { |
45 | NoAccess = -1, | ||
45 | None = 0, | 46 | None = 0, |
46 | Nuisance = 1, | 47 | Nuisance = 1, |
47 | VeryLow = 2, | 48 | VeryLow = 2, |
@@ -159,6 +160,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
159 | string osGetGridNick(); | 160 | string osGetGridNick(); |
160 | string osGetGridName(); | 161 | string osGetGridName(); |
161 | string osGetGridLoginURI(); | 162 | string osGetGridLoginURI(); |
163 | string osGetGridHomeURI(); | ||
164 | string osGetGridCustom(string key); | ||
162 | 165 | ||
163 | LSL_String osFormatString(string str, LSL_List strings); | 166 | LSL_String osFormatString(string str, LSL_List strings); |
164 | LSL_List osMatchString(string src, string pattern, int start); | 167 | LSL_List osMatchString(string src, string pattern, int start); |
@@ -170,22 +173,42 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
170 | 173 | ||
171 | LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules); | 174 | LSL_List osGetLinkPrimitiveParams(int linknumber, LSL_List rules); |
172 | 175 | ||
173 | key osNpcCreate(string user, string name, vector position, string notecard); | 176 | /// <summary> |
174 | LSL_Key osNpcSaveAppearance(key npc, string notecard); | 177 | /// Check if the given key is an npc |
175 | void osNpcLoadAppearance(key npc, string notecard); | 178 | /// </summary> |
176 | vector osNpcGetPos(key npc); | 179 | /// <param name="npc"></param> |
177 | void osNpcMoveTo(key npc, vector position); | 180 | /// <returns>TRUE if the key belongs to an npc in the scene. FALSE otherwise.</returns> |
178 | void osNpcMoveToTarget(key npc, vector target, int options); | 181 | LSL_Integer osIsNpc(LSL_Key npc); |
179 | rotation osNpcGetRot(key npc); | 182 | |
180 | void osNpcSetRot(LSL_Key npc, rotation rot); | 183 | key osNpcCreate(string user, string name, vector position, string notecard); |
181 | void osNpcStopMoveToTarget(LSL_Key npc); | 184 | key osNpcCreate(string user, string name, vector position, string notecard, int options); |
182 | void osNpcSay(key npc, string message); | 185 | LSL_Key osNpcSaveAppearance(key npc, string notecard); |
183 | void osNpcSit(key npc, key target, int options); | 186 | void osNpcLoadAppearance(key npc, string notecard); |
184 | void osNpcStand(LSL_Key npc); | 187 | vector osNpcGetPos(key npc); |
185 | void osNpcRemove(key npc); | 188 | void osNpcMoveTo(key npc, vector position); |
186 | 189 | void osNpcMoveToTarget(key npc, vector target, int options); | |
187 | LSL_Key osOwnerSaveAppearance(string notecard); | 190 | |
188 | LSL_Key osAgentSaveAppearance(key agentId, string notecard); | 191 | /// <summary> |
192 | /// Get the owner of the NPC | ||
193 | /// </summary> | ||
194 | /// <param name="npc"></param> | ||
195 | /// <returns> | ||
196 | /// The owner of the NPC for an owned NPC. The NPC's agent id for an unowned NPC. UUID.Zero if the key is not an npc. | ||
197 | /// </returns> | ||
198 | LSL_Key osNpcGetOwner(key npc); | ||
199 | |||
200 | rotation osNpcGetRot(key npc); | ||
201 | void osNpcSetRot(LSL_Key npc, rotation rot); | ||
202 | void osNpcStopMoveToTarget(LSL_Key npc); | ||
203 | void osNpcSay(key npc, string message); | ||
204 | void osNpcSit(key npc, key target, int options); | ||
205 | void osNpcStand(LSL_Key npc); | ||
206 | void osNpcRemove(key npc); | ||
207 | void osNpcPlayAnimation(LSL_Key npc, string animation); | ||
208 | void osNpcStopAnimation(LSL_Key npc, string animation); | ||
209 | |||
210 | LSL_Key osOwnerSaveAppearance(string notecard); | ||
211 | LSL_Key osAgentSaveAppearance(key agentId, string notecard); | ||
189 | 212 | ||
190 | key osGetMapTexture(); | 213 | key osGetMapTexture(); |
191 | key osGetRegionMapTexture(string regionName); | 214 | key osGetRegionMapTexture(string regionName); |