aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSignpostMarv2012-09-01 02:45:07 +0100
committerJustin Clark-Casey (justincc)2012-09-04 00:03:44 +0100
commit07dbe46ba3c2b949c9da34eaa80d7e1afd68fece (patch)
tree883296eafac2ad2981e5de724065f2e7f566677d
parentImplementing functing to send messages directly to attachments (diff)
downloadopensim-SC_OLD-07dbe46ba3c2b949c9da34eaa80d7e1afd68fece.zip
opensim-SC_OLD-07dbe46ba3c2b949c9da34eaa80d7e1afd68fece.tar.gz
opensim-SC_OLD-07dbe46ba3c2b949c9da34eaa80d7e1afd68fece.tar.bz2
opensim-SC_OLD-07dbe46ba3c2b949c9da34eaa80d7e1afd68fece.tar.xz
wrapping attachment functions in a region
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs2
3 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8e80b4c..2e1e5b6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -3229,6 +3229,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3229 } 3229 }
3230 } 3230 }
3231 3231
3232 #region Attachment commands
3233
3232 public void osForceAttachToAvatar(int attachmentPoint) 3234 public void osForceAttachToAvatar(int attachmentPoint)
3233 { 3235 {
3234 CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatar"); 3236 CheckThreatLevel(ThreatLevel.High, "osForceAttachToAvatar");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index bde7a8e..3985e66 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -157,7 +157,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
157 void osAvatarPlayAnimation(string avatar, string animation); 157 void osAvatarPlayAnimation(string avatar, string animation);
158 void osAvatarStopAnimation(string avatar, string animation); 158 void osAvatarStopAnimation(string avatar, string animation);
159 159
160 // Attachment commands 160 #region Attachment commands
161 161
162 /// <summary> 162 /// <summary>
163 /// Attach the object containing this script to the avatar that owns it without asking for PERMISSION_ATTACH 163 /// Attach the object containing this script to the avatar that owns it without asking for PERMISSION_ATTACH
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
index 08ebfd6..52ca3da 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OSSL_Stub.cs
@@ -289,7 +289,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
289 m_OSSL_Functions.osAvatarStopAnimation(avatar, animation); 289 m_OSSL_Functions.osAvatarStopAnimation(avatar, animation);
290 } 290 }
291 291
292 // Avatar functions 292 #region Attachment commands
293 293
294 public void osForceAttachToAvatar(int attachmentPoint) 294 public void osForceAttachToAvatar(int attachmentPoint)
295 { 295 {