aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorMelanie Thielker2008-09-25 05:13:44 +0000
committerMelanie Thielker2008-09-25 05:13:44 +0000
commitf3c8963c86dbc969541ede80ae37eb59d26b7809 (patch)
treeff1e5cea74e9d5c2b73c476320a7bddf11d93766 /OpenSim/Region/Environment/Scenes
parentMantis#2123. Thank you kindly, Idb for a patch that solves: (diff)
downloadopensim-SC_OLD-f3c8963c86dbc969541ede80ae37eb59d26b7809.zip
opensim-SC_OLD-f3c8963c86dbc969541ede80ae37eb59d26b7809.tar.gz
opensim-SC_OLD-f3c8963c86dbc969541ede80ae37eb59d26b7809.tar.bz2
opensim-SC_OLD-f3c8963c86dbc969541ede80ae37eb59d26b7809.tar.xz
Convergence is almost complete. This brings the diff between the API to < 10k
and makes it use a common set of types in both engine. Fixes the issues with running both engines and HTTP requests / listens / timers etc.. Also fixes a couple of minor Scene issues and a CTB by nullref.
Diffstat (limited to 'OpenSim/Region/Environment/Scenes')
-rw-r--r--OpenSim/Region/Environment/Scenes/EventManager.cs11
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs19
2 files changed, 19 insertions, 11 deletions
diff --git a/OpenSim/Region/Environment/Scenes/EventManager.cs b/OpenSim/Region/Environment/Scenes/EventManager.cs
index 42cbdfc..87f3de1 100644
--- a/OpenSim/Region/Environment/Scenes/EventManager.cs
+++ b/OpenSim/Region/Environment/Scenes/EventManager.cs
@@ -192,6 +192,8 @@ namespace OpenSim.Region.Environment.Scenes
192 public event ScriptTimerEvent OnScriptTimerEvent; 192 public event ScriptTimerEvent OnScriptTimerEvent;
193 193
194 public delegate void EstateToolsTimeUpdate(ulong regionHandle, bool FixedTime, bool EstateSun, float LindenHour); 194 public delegate void EstateToolsTimeUpdate(ulong regionHandle, bool FixedTime, bool EstateSun, float LindenHour);
195 public delegate void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID);
196
195 public event EstateToolsTimeUpdate OnEstateToolsTimeUpdate; 197 public event EstateToolsTimeUpdate OnEstateToolsTimeUpdate;
196 198
197 public delegate void ObjectBeingRemovedFromScene(SceneObjectGroup obj); 199 public delegate void ObjectBeingRemovedFromScene(SceneObjectGroup obj);
@@ -211,6 +213,7 @@ namespace OpenSim.Region.Environment.Scenes
211 213
212 public delegate void ParcelPrimCountTainted(); 214 public delegate void ParcelPrimCountTainted();
213 public event ParcelPrimCountTainted OnParcelPrimCountTainted; 215 public event ParcelPrimCountTainted OnParcelPrimCountTainted;
216 public event GetScriptRunning OnGetScriptRunning;
214 217
215 /// <summary> 218 /// <summary>
216 /// RegisterCapsEvent is called by Scene after the Caps object 219 /// RegisterCapsEvent is called by Scene after the Caps object
@@ -368,9 +371,17 @@ namespace OpenSim.Region.Environment.Scenes
368 private ScriptColliding handlerCollidingStart = null; 371 private ScriptColliding handlerCollidingStart = null;
369 private ScriptColliding handlerColliding = null; 372 private ScriptColliding handlerColliding = null;
370 private ScriptColliding handlerCollidingEnd = null; 373 private ScriptColliding handlerCollidingEnd = null;
374 private GetScriptRunning handlerGetScriptRunning = null;
371 375
372 private SunLindenHour handlerSunGetLindenHour = null; 376 private SunLindenHour handlerSunGetLindenHour = null;
373 377
378 public void TriggerGetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
379 {
380 handlerGetScriptRunning = OnGetScriptRunning;
381 if (handlerGetScriptRunning != null)
382 handlerGetScriptRunning(controllingClient, objectID, itemID);
383 }
384
374 public void TriggerOnScriptChangedEvent(uint localID, uint change) 385 public void TriggerOnScriptChangedEvent(uint localID, uint change)
375 { 386 {
376 handlerScriptChangedEvent = OnScriptChangedEvent; 387 handlerScriptChangedEvent = OnScriptChangedEvent;
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 015b140..2a9be81 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -445,7 +445,6 @@ namespace OpenSim.Region.Environment.Scenes
445 } 445 }
446 else 446 else
447 { 447 {
448 Console.WriteLine("Non-Prim item ==>");
449 itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions; 448 itemCopy.BasePermissions = item.BasePermissions & item.NextPermissions;
450 } 449 }
451 450
@@ -896,6 +895,9 @@ namespace OpenSim.Region.Environment.Scenes
896 if (group != null) 895 if (group != null)
897 { 896 {
898 TaskInventoryItem item = group.GetInventoryItem(localID, itemID); 897 TaskInventoryItem item = group.GetInventoryItem(localID, itemID);
898 if (item == null)
899 return;
900
899 if (item.Type == 10) 901 if (item.Type == 10)
900 { 902 {
901 EventManager.TriggerRemoveScript(localID, itemID); 903 EventManager.TriggerRemoveScript(localID, itemID);
@@ -2311,16 +2313,6 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T
2311 2313
2312 } 2314 }
2313 2315
2314 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
2315 {
2316 IScriptModule scriptModule = RequestModuleInterface<IScriptModule>();
2317 if (scriptModule == null)
2318 return;
2319
2320 controllingClient.SendScriptRunningReply(objectID, itemID,
2321 scriptModule.GetScriptRunning(objectID, itemID));
2322 }
2323
2324 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running) 2316 public void SetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID, bool running)
2325 { 2317 {
2326 SceneObjectPart part = GetSceneObjectPart(objectID); 2318 SceneObjectPart part = GetSceneObjectPart(objectID);
@@ -2388,5 +2380,10 @@ System.Console.WriteLine("Item asset {0}, request asset {1}", prevItem.AssetID.T
2388 } 2380 }
2389 m_innerScene.DetachSingleAttachmentToInv(itemID, remoteClient); 2381 m_innerScene.DetachSingleAttachmentToInv(itemID, remoteClient);
2390 } 2382 }
2383
2384 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
2385 {
2386 EventManager.TriggerGetScriptRunning(controllingClient, objectID, itemID);
2387 }
2391 } 2388 }
2392} 2389}