Mantis 6280: llSetContentType(). An implementation.
An implimentation of llSetContentType including all of the new constants added since the mantis was raised.cpu-performance
parent
fc89bde044
commit
f074739e33
|
@ -1480,6 +1480,73 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
||||||
m_host.SetFaceColorAlpha(face, color, null);
|
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)
|
public void SetTexGen(SceneObjectPart part, int face,int style)
|
||||||
{
|
{
|
||||||
Primitive.TextureEntry tex = part.Shape.Textures;
|
Primitive.TextureEntry tex = part.Shape.Textures;
|
||||||
|
|
|
@ -338,6 +338,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
|
||||||
void llSetCameraParams(LSL_List rules);
|
void llSetCameraParams(LSL_List rules);
|
||||||
void llSetClickAction(int action);
|
void llSetClickAction(int action);
|
||||||
void llSetColor(LSL_Vector color, int face);
|
void llSetColor(LSL_Vector color, int face);
|
||||||
|
void llSetContentType(LSL_Key id, LSL_Integer type);
|
||||||
void llSetDamage(double damage);
|
void llSetDamage(double damage);
|
||||||
void llSetForce(LSL_Vector force, int local);
|
void llSetForce(LSL_Vector force, int local);
|
||||||
void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local);
|
void llSetForceAndTorque(LSL_Vector force, LSL_Vector torque, int local);
|
||||||
|
|
|
@ -359,6 +359,17 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
public const int HTTP_CUSTOM_HEADER = 5;
|
public const int HTTP_CUSTOM_HEADER = 5;
|
||||||
public const int HTTP_PRAGMA_NO_CACHE = 6;
|
public const int HTTP_PRAGMA_NO_CACHE = 6;
|
||||||
|
|
||||||
|
// llSetContentType
|
||||||
|
public const int CONTENT_TYPE_TEXT = 0; //text/plain
|
||||||
|
public const int CONTENT_TYPE_HTML = 1; //text/html
|
||||||
|
public const int CONTENT_TYPE_XML = 2; //application/xml
|
||||||
|
public const int CONTENT_TYPE_XHTML = 3; //application/xhtml+xml
|
||||||
|
public const int CONTENT_TYPE_ATOM = 4; //application/atom+xml
|
||||||
|
public const int CONTENT_TYPE_JSON = 5; //application/json
|
||||||
|
public const int CONTENT_TYPE_LLSD = 6; //application/llsd+xml
|
||||||
|
public const int CONTENT_TYPE_FORM = 7; //application/x-www-form-urlencoded
|
||||||
|
public const int CONTENT_TYPE_RSS = 8; //application/rss+xml
|
||||||
|
|
||||||
public const int PRIM_MATERIAL = 2;
|
public const int PRIM_MATERIAL = 2;
|
||||||
public const int PRIM_PHYSICS = 3;
|
public const int PRIM_PHYSICS = 3;
|
||||||
public const int PRIM_TEMP_ON_REZ = 4;
|
public const int PRIM_TEMP_ON_REZ = 4;
|
||||||
|
|
|
@ -1528,6 +1528,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
||||||
m_LSL_Functions.llSetColor(color, face);
|
m_LSL_Functions.llSetColor(color, face);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void llSetContentType(LSL_Key id, LSL_Integer type)
|
||||||
|
{
|
||||||
|
m_LSL_Functions.llSetContentType(id, type);
|
||||||
|
}
|
||||||
|
|
||||||
public void llSetDamage(double damage)
|
public void llSetDamage(double damage)
|
||||||
{
|
{
|
||||||
m_LSL_Functions.llSetDamage(damage);
|
m_LSL_Functions.llSetDamage(damage);
|
||||||
|
|
Loading…
Reference in New Issue