aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
authorCharles Krinke2008-03-08 18:06:10 +0000
committerCharles Krinke2008-03-08 18:06:10 +0000
commit3151e302caa804222206dc85579bb4c2ed9181ac (patch)
tree239b419547331c5843b5023efbe319bb012e395e /OpenSim/Region/Environment
parent* Made a change to the loading mechanism to fix it's operation. (diff)
downloadopensim-SC-3151e302caa804222206dc85579bb4c2ed9181ac.zip
opensim-SC-3151e302caa804222206dc85579bb4c2ed9181ac.tar.gz
opensim-SC-3151e302caa804222206dc85579bb4c2ed9181ac.tar.bz2
opensim-SC-3151e302caa804222206dc85579bb4c2ed9181ac.tar.xz
Thank you kindly, Ldviopeng for:
Patch to implement the following LSL / OS functions llParcelPrimCount(60%) osSetParcelMediaURL
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.cs16
-rw-r--r--OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs8
2 files changed, 21 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 2ede245..cc97988 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -2414,6 +2414,22 @@ namespace OpenSim.Region.Environment.Scenes
2414 } 2414 }
2415 } 2415 }
2416 2416
2417 public void SetLandMediaURL(float x, float y, string url)
2418 {
2419 Land land = LandManager.getLandObject(x, y);
2420
2421 if (land == null)
2422 {
2423 return;
2424 }
2425
2426 else
2427 {
2428 land.landData.mediaURL = url;
2429 return;
2430 }
2431 }
2432
2417 #endregion 2433 #endregion
2418 2434
2419 #region Script Engine 2435 #region Script Engine
diff --git a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
index b4e2a13..f385106 100644
--- a/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
+++ b/OpenSim/Region/Environment/Scenes/Scripting/IScriptHost.cs
@@ -34,13 +34,15 @@ namespace OpenSim.Region.Environment.Scenes.Scripting
34 public interface IScriptHost 34 public interface IScriptHost
35 { 35 {
36 string Name { get; set; } 36 string Name { get; set; }
37 string SitName { get; set; }
38 string TouchName { get; set; }
39 string Description { get; set; } 37 string Description { get; set; }
38
40 LLUUID UUID { get; } 39 LLUUID UUID { get; }
41 LLUUID ObjectOwner { get; } 40 LLUUID ObjectOwner { get; }
42 LLUUID ObjectCreator { get; } 41 LLUUID ObjectCreator { get; }
43 LLVector3 AbsolutePosition { get; } 42 LLVector3 AbsolutePosition { get; }
43
44 string SitName { get; set; }
45 string TouchName { get; set; }
44 void SetText(string text, Vector3 color, double alpha); 46 void SetText(string text, Vector3 color, double alpha);
45 } 47 }
46} \ No newline at end of file 48}