From fc89bde044bf5805af9a5fe79d6e29e665e133ef Mon Sep 17 00:00:00 2001
From: Talun
Date: Thu, 13 Jun 2013 22:57:09 +0100
Subject: Mantis 6108: ossetprimitiveparams temporary/phantom problem
Corrected to ensure that the target prim is updated by
osSetPrimitiveParams when setting PRIM_TEMP_ON_REZ and/or PRIM_PHANTOM
instead of the prim that the script is in.
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index e1630b3..d2e9f6c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -7725,7 +7725,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return null;
string ph = rules.Data[idx++].ToString();
- m_host.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
+ part.ParentGroup.ScriptSetPhantomStatus(ph.Equals("1"));
break;
@@ -7764,7 +7764,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return null;
string temp = rules.Data[idx++].ToString();
- m_host.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
+ part.ParentGroup.ScriptSetTemporaryStatus(temp.Equals("1"));
break;
--
cgit v1.1
From f074739e3381f85a73dfddcb522c0060edede148 Mon Sep 17 00:00:00 2001
From: Talun
Date: Wed, 12 Jun 2013 00:06:08 +0100
Subject: Mantis 6280: llSetContentType(). An implementation.
An implimentation of llSetContentType including all of the new
constants added since the mantis was raised.
---
.../Shared/Api/Implementation/LSL_Api.cs | 67 ++++++++++++++++++++++
1 file changed, 67 insertions(+)
(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index d2e9f6c..733e868 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -1480,6 +1480,73 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
m_host.SetFaceColorAlpha(face, color, null);
}
+ public void llSetContentType(LSL_Key id, LSL_Integer type)
+ {
+ m_host.AddScriptLPS(1);
+
+ if (m_UrlModule == null)
+ return;
+
+ // Make sure the content type is text/plain to start with
+ m_UrlModule.HttpContentType(new UUID(id), "text/plain");
+
+ // Is the object owner online and in the region
+ ScenePresence agent = World.GetScenePresence(m_host.ParentGroup.OwnerID);
+ if (agent == null || agent.IsChildAgent)
+ return; // Fail if the owner is not in the same region
+
+ // Is it the embeded browser?
+ string userAgent = m_UrlModule.GetHttpHeader(new UUID(id), "user-agent");
+ if (userAgent.IndexOf("SecondLife") < 0)
+ return; // Not the embedded browser. Is this check good enough?
+
+ // Use the IP address of the client and check against the request
+ // seperate logins from the same IP will allow all of them to get non-text/plain as long
+ // as the owner is in the region. Same as SL!
+ string logonFromIPAddress = agent.ControllingClient.RemoteEndPoint.Address.ToString();
+ string requestFromIPAddress = m_UrlModule.GetHttpHeader(new UUID(id), "remote_addr");
+ //m_log.Debug("IP from header='" + requestFromIPAddress + "' IP from endpoint='" + logonFromIPAddress + "'");
+ if (requestFromIPAddress == null || requestFromIPAddress.Trim() == "")
+ return;
+ if (logonFromIPAddress == null || logonFromIPAddress.Trim() == "")
+ return;
+
+ // If the request isnt from the same IP address then the request cannot be from the owner
+ if (!requestFromIPAddress.Trim().Equals(logonFromIPAddress.Trim()))
+ return;
+
+ switch (type)
+ {
+ case ScriptBaseClass.CONTENT_TYPE_HTML:
+ m_UrlModule.HttpContentType(new UUID(id), "text/html");
+ break;
+ case ScriptBaseClass.CONTENT_TYPE_XML:
+ m_UrlModule.HttpContentType(new UUID(id), "application/xml");
+ break;
+ case ScriptBaseClass.CONTENT_TYPE_XHTML:
+ m_UrlModule.HttpContentType(new UUID(id), "application/xhtml+xml");
+ break;
+ case ScriptBaseClass.CONTENT_TYPE_ATOM:
+ m_UrlModule.HttpContentType(new UUID(id), "application/atom+xml");
+ break;
+ case ScriptBaseClass.CONTENT_TYPE_JSON:
+ m_UrlModule.HttpContentType(new UUID(id), "application/json");
+ break;
+ case ScriptBaseClass.CONTENT_TYPE_LLSD:
+ m_UrlModule.HttpContentType(new UUID(id), "application/llsd+xml");
+ break;
+ case ScriptBaseClass.CONTENT_TYPE_FORM:
+ m_UrlModule.HttpContentType(new UUID(id), "application/x-www-form-urlencoded");
+ break;
+ case ScriptBaseClass.CONTENT_TYPE_RSS:
+ m_UrlModule.HttpContentType(new UUID(id), "application/rss+xml");
+ break;
+ default:
+ m_UrlModule.HttpContentType(new UUID(id), "text/plain");
+ break;
+ }
+ }
+
public void SetTexGen(SceneObjectPart part, int face,int style)
{
Primitive.TextureEntry tex = part.Shape.Textures;
--
cgit v1.1
From da3724a904d1edb48b83d7f87b7283fd61c7a273 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 15 Jun 2013 00:11:36 +0100
Subject: minor: remove mono compiler warnings from LSL_Api, properly format
method doc for llRot2Axis()
---
.../Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 733e868..256167c 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4726,13 +4726,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return new LSL_Rotation(x,y,z,s);
}
-
- // Xantor 29/apr/2008
- // converts a Quaternion to X,Y,Z axis rotations
+ ///
+ /// Converts a Quaternion to X,Y,Z axis rotations
+ ///
+ ///
+ ///
public LSL_Vector llRot2Axis(LSL_Rotation rot)
{
m_host.AddScriptLPS(1);
- double x, y, z;
if (Math.Abs(rot.s) > 1) // normalization needed
rot.Normalize();
@@ -7454,14 +7455,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return;
}
- int code = (int)options.GetLSLIntegerItem(0);
-
int idx = 0;
while (idx < options.Data.Length)
{
int option = (int)options.GetLSLIntegerItem(idx++);
- int remain = options.Data.Length - idx;
switch (option)
{
--
cgit v1.1
From 694c4bcbb671338263802457bb5a384c4fe44d26 Mon Sep 17 00:00:00 2001
From: dahlia
Date: Fri, 14 Jun 2013 20:00:20 -0700
Subject: correct method doc for llRot2Axis()
---
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 256167c..c0b8373 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -4727,7 +4727,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
}
///
- /// Converts a Quaternion to X,Y,Z axis rotations
+ /// Returns the axis of rotation for a quaternion
///
///
///
--
cgit v1.1