OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Stopped EntityBase from implementing IScriptHost, as don't think it should, multiple objects are based on entitybase and they all don't want the baggage from IScriptHost. SceneObjectPart already implements it anyway. 

Added llGetOwner function, and tested the ll functions that I added in last commit.
afrisby
MW 2007-08-27 11:18:50 +00:00
parent 4c3be4e91f
commit 6181191a03
6 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@ -230,7 +230,7 @@ namespace OpenSim.Framework.Communications.Caches
UsersSent.Add(sender.request.ImageInfo.FullID, 1); UsersSent.Add(sender.request.ImageInfo.FullID, 1);
} }
if (TimesTextureSent[sender.request.RequestUser.AgentId][sender.request.ImageInfo.FullID] < 1200) if (TimesTextureSent[sender.request.RequestUser.AgentId][sender.request.ImageInfo.FullID] < 1000)
{ {
bool finished = sender.SendTexture(); bool finished = sender.SendTexture();
if (finished) if (finished)

2
OpenSim/Region/Environment/Scenes/EntityBase.cs
View File

@ -5,7 +5,7 @@ using OpenSim.Region.Environment.Scenes.Scripting;
namespace OpenSim.Region.Environment.Scenes namespace OpenSim.Region.Environment.Scenes
{ {
public abstract class EntityBase : IScriptHost public abstract class EntityBase
{ {
protected List<EntityBase> m_children; protected List<EntityBase> m_children;

5
OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
View File

@ -201,6 +201,11 @@ namespace OpenSim.Region.Environment.Scenes
} }
#endregion #endregion
public LLUUID ObjectOwner
{
get { return OwnerID; }
}
#region Constructors #region Constructors
/// <summary> /// <summary>
/// ///

1
OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
View File

@ -9,6 +9,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
{ {
string Name { get; set;} string Name { get; set;}
LLUUID UUID { get; } LLUUID UUID { get; }
LLUUID ObjectOwner { get;}
LLVector3 AbsolutePosition { get; } LLVector3 AbsolutePosition { get; }
void SetText(string text, Axiom.Math.Vector3 color, double alpha); void SetText(string text, Axiom.Math.Vector3 color, double alpha);
} }

3
OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
View File

@ -20,6 +20,9 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
get { return LLUUID.Zero; } get { return LLUUID.Zero; }
} }
public LLUUID ObjectOwner
{ get { return LLUUID.Zero; } }
public LLVector3 AbsolutePosition public LLVector3 AbsolutePosition
{ {
get { return m_pos; } get { return m_pos; }

4
OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
View File

@ -293,7 +293,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
public void llDetachFromAvatar() { } public void llDetachFromAvatar() { }
public void llTakeCamera() { } public void llTakeCamera() { }
public void llReleaseCamera() { } public void llReleaseCamera() { }
public string llGetOwner() { return ""; } public string llGetOwner() { return m_host.ObjectOwner.ToStringHyphenated(); }
public void llInstantMessage(string user, string message) { } public void llInstantMessage(string user, string message) { }
public void llEmail(string address, string subject, string message) { } public void llEmail(string address, string subject, string message) { }
public void llGetNextEmail(string address, string subject) { } public void llGetNextEmail(string address, string subject) { }
@ -587,7 +587,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
public void llLoadURL(string avatar_id, string message, string url) public void llLoadURL(string avatar_id, string message, string url)
{ {
LLUUID avatarId = new LLUUID(avatar_id); LLUUID avatarId = new LLUUID(avatar_id);
m_ScriptEngine.World.SendUrlToUser(avatarId, m_host.Name, m_host.UUID, LLUUID.Zero, false, message, url); m_ScriptEngine.World.SendUrlToUser(avatarId, m_host.Name, m_host.UUID, m_host.ObjectOwner, false, message, url);
} }
public void llParcelMediaCommandList(List<string> commandList) { } public void llParcelMediaCommandList(List<string> commandList) { }
public void llParcelMediaQuery() { } public void llParcelMediaQuery() { }