aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorMW2007-08-22 14:47:01 +0000
committerMW2007-08-22 14:47:01 +0000
commitf02ebb6476eeef56f2b790d6b7f472fb84c5fa69 (patch)
treef15bdc0b5fabb9e282feeea9548a1c59329fb6b1 /OpenSim/Region/Environment/Scenes
parentStart of Task Inventory (ie prim's inventory). For now, you can only move scr... (diff)
downloadopensim-SC-f02ebb6476eeef56f2b790d6b7f472fb84c5fa69.zip
opensim-SC-f02ebb6476eeef56f2b790d6b7f472fb84c5fa69.tar.gz
opensim-SC-f02ebb6476eeef56f2b790d6b7f472fb84c5fa69.tar.bz2
opensim-SC-f02ebb6476eeef56f2b790d6b7f472fb84c5fa69.tar.xz
Added forgotten file.
Made a change to the Scene.EventManager OnRezScript event, it now includes the itemID as a param. This uuid is unique to each instance of a script, so can be used for tracking changes/editing, stopping and deleting a script.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs6
2 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index bf7bb7e..fa1b865 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -229,7 +229,7 @@ namespace OpenSim.Region.Environment.Scenes
229 { 229 {
230 string script = Util.FieldToString(rezAsset.Data); 230 string script = Util.FieldToString(rezAsset.Data);
231 //Console.WriteLine("rez script "+script); 231 //Console.WriteLine("rez script "+script);
232 this.EventManager.TriggerRezScript(localID, script); 232 this.EventManager.TriggerRezScript(localID, itemID, script);
233 rezzed = true; 233 rezzed = true;
234 } 234 }
235 else 235 else
@@ -240,7 +240,7 @@ namespace OpenSim.Region.Environment.Scenes
240 { 240 {
241 string script = Util.FieldToString(rezAsset.Data); 241 string script = Util.FieldToString(rezAsset.Data);
242 // Console.WriteLine("rez script " + script); 242 // Console.WriteLine("rez script " + script);
243 this.EventManager.TriggerRezScript(localID, script); 243 this.EventManager.TriggerRezScript(localID, itemID, script);
244 rezzed = true; 244 rezzed = true;
245 } 245 }
246 } 246 }
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index 89aeda6..09a7f21 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Region.Environment.Scenes
37 public event ObjectGrabDelegate OnObjectGrab; 37 public event ObjectGrabDelegate OnObjectGrab;
38 public event OnPermissionErrorDelegate OnPermissionError; 38 public event OnPermissionErrorDelegate OnPermissionError;
39 39
40 public delegate void NewRezScript(uint localID, string script); 40 public delegate void NewRezScript(uint localID, LLUUID itemID, string script);
41 public event NewRezScript OnRezScript; 41 public event NewRezScript OnRezScript;
42 42
43 43
@@ -110,11 +110,11 @@ namespace OpenSim.Region.Environment.Scenes
110 OnObjectGrab(localID, offsetPos, remoteClient); 110 OnObjectGrab(localID, offsetPos, remoteClient);
111 } 111 }
112 112
113 public void TriggerRezScript(uint localID, string script) 113 public void TriggerRezScript(uint localID, LLUUID itemID, string script)
114 { 114 {
115 if (OnRezScript != null) 115 if (OnRezScript != null)
116 { 116 {
117 OnRezScript(localID, script); 117 OnRezScript(localID, itemID, script);
118 } 118 }
119 } 119 }
120 } 120 }