6 files changed, 13 insertions, 4 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 322cd6a..1b3bb18 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -230,7 +230,7 @@ namespace OpenSim.Framework.Communications.Caches
                     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();
                     if (finished)
diff --git a/OpenSim/Region/Environment/Scenes/EntityBase.cs b/OpenSim/Region/Environment/Scenes/EntityBase.cs
index 6d933e6..a7b9d75 100644
--- a/OpenSim/Region/Environment/Scenes/EntityBase.cs
+++ b/OpenSim/Region/Environment/Scenes/EntityBase.cs
@@ -5,7 +5,7 @@ using OpenSim.Region.Environment.Scenes.Scripting;
 
 namespace OpenSim.Region.Environment.Scenes
 {
-    public abstract class EntityBase : IScriptHost
+    public abstract class EntityBase 
     {
         protected List<EntityBase> m_children;
 
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index b77da3a..a621632 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -201,6 +201,11 @@ namespace OpenSim.Region.Environment.Scenes
         }
         #endregion
 
+        public LLUUID ObjectOwner
+        {
+            get { return OwnerID; }
+        }
+
         #region Constructors
         /// <summary>
         /// 
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
index d2ca529..e7d0570 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
@@ -9,6 +9,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
     {

         string Name { get; set;}

         LLUUID UUID { get; }

+        LLUUID ObjectOwner { get;}

         LLVector3 AbsolutePosition { get; }

         void SetText(string text, Axiom.Math.Vector3 color, double alpha);

     }

diff --git a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
index a9147fb1..a50b142 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -20,6 +20,9 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
             get { return LLUUID.Zero; }

         }

 

+        public LLUUID ObjectOwner

+        { get { return LLUUID.Zero; } }

+

         public LLVector3 AbsolutePosition

         {

             get { return m_pos; }

diff --git a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
index 92024b6..493a063 100644
--- a/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
+++ b/OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs
@@ -293,7 +293,7 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
         public void llDetachFromAvatar() { }

         public void llTakeCamera() { }

         public void llReleaseCamera() { }

-        public string llGetOwner() { return ""; }

+        public string llGetOwner() { return m_host.ObjectOwner.ToStringHyphenated(); }

         public void llInstantMessage(string user, string message) { }

         public void llEmail(string address, string subject, string message) { }

         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) 

         {

             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 llParcelMediaQuery() { }