aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/SceneEvents.cs
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-07 19:41:03 +0000
committerTeravus Ovares2008-05-07 19:41:03 +0000
commit86669a1664310d16da0cbb8f3a8e034464f16d3a (patch)
treedd6f779548d7e12fd2261afad71b8ed1072c2452 /OpenSim/Region/Environment/Scenes/SceneEvents.cs
parentcheck in a new approach to this (diff)
downloadopensim-SC_OLD-86669a1664310d16da0cbb8f3a8e034464f16d3a.zip
opensim-SC_OLD-86669a1664310d16da0cbb8f3a8e034464f16d3a.tar.gz
opensim-SC_OLD-86669a1664310d16da0cbb8f3a8e034464f16d3a.tar.bz2
opensim-SC_OLD-86669a1664310d16da0cbb8f3a8e034464f16d3a.tar.xz
* Other then the prim update experiments that are going on now, llTakeControls works now along with the 'release controls button'. llReleaseControls() works mostly :D.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneEvents.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneEvents.cs13
1 files changed, 11 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneEvents.cs b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
index d409f4e..65dca95 100644
--- a/OpenSim/Region/Environment/Scenes/SceneEvents.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneEvents.cs
@@ -137,6 +137,10 @@ namespace OpenSim.Region.Environment.Scenes
137 137
138 public event ScriptChangedEvent OnScriptChangedEvent; 138 public event ScriptChangedEvent OnScriptChangedEvent;
139 139
140 public delegate void ScriptControlEvent(uint localID, LLUUID item, LLUUID avatarID, uint held, uint changed);
141
142 public event ScriptControlEvent OnScriptControlEvent;
143
140 public delegate void ScriptAtTargetEvent(uint localID, uint handle, LLVector3 targetpos, LLVector3 atpos); 144 public delegate void ScriptAtTargetEvent(uint localID, uint handle, LLVector3 targetpos, LLVector3 atpos);
141 145
142 public event ScriptAtTargetEvent OnScriptAtTargetEvent; 146 public event ScriptAtTargetEvent OnScriptAtTargetEvent;
@@ -274,6 +278,7 @@ namespace OpenSim.Region.Environment.Scenes
274 private DeregisterCapsEvent handlerDeregisterCaps = null; // OnDeregisterCaps; 278 private DeregisterCapsEvent handlerDeregisterCaps = null; // OnDeregisterCaps;
275 private NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = null; 279 private NewInventoryItemUploadComplete handlerNewInventoryItemUpdateComplete = null;
276 private RequestChangeWaterHeight handlerRequestChangeWaterHeight = null; //OnRequestChangeWaterHeight 280 private RequestChangeWaterHeight handlerRequestChangeWaterHeight = null; //OnRequestChangeWaterHeight
281 private ScriptControlEvent handlerScriptControlEvent = null;
277 282
278 private LandBuy handlerLandBuy = null; 283 private LandBuy handlerLandBuy = null;
279 private LandBuy handlerValidateLandBuy = null; 284 private LandBuy handlerValidateLandBuy = null;
@@ -603,9 +608,13 @@ namespace OpenSim.Region.Environment.Scenes
603 } 608 }
604 } 609 }
605 610
606 internal void TriggerControlEvent(uint p, LLUUID scriptUUID, uint p_3, uint p_4) 611 internal void TriggerControlEvent(uint p, LLUUID scriptUUID, LLUUID avatarID, uint held, uint _changed)
607 { 612 {
608 throw new Exception("The method or operation is not implemented."); 613 handlerScriptControlEvent = OnScriptControlEvent;
614 if (handlerScriptControlEvent != null)
615 {
616 handlerScriptControlEvent(p, scriptUUID, avatarID, held, _changed);
617 }
609 } 618 }
610 } 619 }
611} 620}