aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-08-27 10:34:28 +0000
committerMW2007-08-27 10:34:28 +0000
commit4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec (patch)
tree6b52cb7da598ce859a0ed1dc72a77ba31fda1354
parentHere is your ocean back. You will probably need to delete your regionassets.y... (diff)
downloadopensim-SC_OLD-4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec.zip
opensim-SC_OLD-4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec.tar.gz
opensim-SC_OLD-4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec.tar.bz2
opensim-SC_OLD-4c3be4e91f25d9d89b5adadd1eea3cf0b0d5cfec.tar.xz
Another small tweak to image sending.
Implemented a few ll Functions, llSetObjectName llGetObjectName, llLoadURL (all currently untested).
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs3
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs9
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs1
-rw-r--r--OpenSim/Region/ScriptEngine/DotNetEngine/Compiler/Server_API/LSL_BuiltIn_Commands.cs10
5 files changed, 20 insertions, 5 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index d06582e..322cd6a 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -230,7 +230,7 @@ namespace OpenSim.Framework.Communications.Caches
230 UsersSent.Add(sender.request.ImageInfo.FullID, 1); 230 UsersSent.Add(sender.request.ImageInfo.FullID, 1);
231 231
232 } 232 }
233 if (TimesTextureSent[sender.request.RequestUser.AgentId][sender.request.ImageInfo.FullID] < 1000) 233 if (TimesTextureSent[sender.request.RequestUser.AgentId][sender.request.ImageInfo.FullID] < 1200)
234 { 234 {
235 bool finished = sender.SendTexture(); 235 bool finished = sender.SendTexture();
236 if (finished) 236 if (finished)
@@ -699,6 +699,7 @@ namespace OpenSim.Framework.Communications.Caches
699 { 699 {
700 SendPacket(); 700 SendPacket();
701 counter++; 701 counter++;
702
702 if ((request.PacketCounter >= request.NumPackets) | counter > 100 | (request.NumPackets == 1)) 703 if ((request.PacketCounter >= request.NumPackets) | counter > 100 | (request.NumPackets == 1))
703 { 704 {
704 return true; 705 return true;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index dcc3e16..49ba655 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -1099,6 +1099,14 @@ namespace OpenSim.Region.Environment.Scenes
1099 1099
1100 #endregion 1100 #endregion
1101 1101
1102 public void SendUrlToUser(LLUUID avatarID, string objectname, LLUUID objectID, LLUUID ownerID, bool groupOwned, string message, string url)
1103 {
1104 if (Avatars.ContainsKey(avatarID))
1105 {
1106 Avatars[avatarID].ControllingClient.SendLoadURL(objectname, objectID, ownerID, groupOwned, message, url);
1107 }
1108 }
1109
1102 #region Alert Methods 1110 #region Alert Methods
1103 1111
1104 void SendPermissionAlert(LLUUID user, string reason) 1112 void SendPermissionAlert(LLUUID user, string reason)
@@ -1106,6 +1114,7 @@ namespace OpenSim.Region.Environment.Scenes
1106 SendAlertToUser(user, reason, false); 1114 SendAlertToUser(user, reason, false);
1107 } 1115 }
1108 1116
1117
1109 public void SendGeneralAlert(string message) 1118 public void SendGeneralAlert(string message)
1110 { 1119 {
1111 foreach (ScenePresence presence in this.Avatars.Values) 1120 foreach (ScenePresence presence in this.Avatars.Values)
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
index 5d5f698..d2ca529 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
@@ -7,7 +7,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
7{ 7{
8 public interface IScriptHost 8 public interface IScriptHost
9 { 9 {
10 string Name { get; } 10 string Name { get; set;}
11 LLUUID UUID { get; } 11 LLUUID UUID { get; }
12 LLVector3 AbsolutePosition { get; } 12 LLVector3 AbsolutePosition { get; }
13 void SetText(string text, Axiom.Math.Vector3 color, double alpha); 13 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 62c84a6..a9147fb1 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/NullScriptHost.cs
@@ -12,6 +12,7 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
12 public string Name 12 public string Name
13 { 13 {
14 get { return "Object"; } 14 get { return "Object"; }
15 set { }
15 } 16 }
16 17
17 public LLUUID UUID 18 public LLUUID UUID
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 0256f29..92024b6 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
@@ -458,8 +458,8 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
458 public List<string> llListInsertList(List<string> dest, List<string> src, int start) 458 public List<string> llListInsertList(List<string> dest, List<string> src, int start)
459 { return new List<string>(); } 459 { return new List<string>(); }
460 public int llListFindList(List<string> src, List<string> test) { return 0; } 460 public int llListFindList(List<string> src, List<string> test) { return 0; }
461 public string llGetObjectName() { return ""; } 461 public string llGetObjectName() { return m_host.Name; }
462 public void llSetObjectName(string name) { } 462 public void llSetObjectName(string name) { m_host.Name = name; }
463 463
464 public string llGetDate() 464 public string llGetDate()
465 { 465 {
@@ -584,7 +584,11 @@ namespace OpenSim.Region.ScriptEngine.DotNetEngine.Compiler
584 public void llForceMouselook(int mouselook) { } 584 public void llForceMouselook(int mouselook) { }
585 public double llGetObjectMass(string id) { return 0; } 585 public double llGetObjectMass(string id) { return 0; }
586 public void llListReplaceList() { } 586 public void llListReplaceList() { }
587 public void llLoadURL(string avatar_id, string message, string url) { } 587 public void llLoadURL(string avatar_id, string message, string url)
588 {
589 LLUUID avatarId = new LLUUID(avatar_id);
590 m_ScriptEngine.World.SendUrlToUser(avatarId, m_host.Name, m_host.UUID, LLUUID.Zero, false, message, url);
591 }
588 public void llParcelMediaCommandList(List<string> commandList) { } 592 public void llParcelMediaCommandList(List<string> commandList) { }
589 public void llParcelMediaQuery() { } 593 public void llParcelMediaQuery() { }
590 594