aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-12 20:16:46 +0000
committerJustin Clarke Casey2008-11-12 20:16:46 +0000
commitcec112c87a0e9b259ddff215422bde3fc5dd4dc2 (patch)
treefac2489ef1c8d3ec0e0acaf0533e4db46575f170 /OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
parent* Update Mono.Addins.dll to 0.4, as per sdague's suggestion (diff)
downloadopensim-SC-cec112c87a0e9b259ddff215422bde3fc5dd4dc2.zip
opensim-SC-cec112c87a0e9b259ddff215422bde3fc5dd4dc2.tar.gz
opensim-SC-cec112c87a0e9b259ddff215422bde3fc5dd4dc2.tar.bz2
opensim-SC-cec112c87a0e9b259ddff215422bde3fc5dd4dc2.tar.xz
* refactor: as per a recent opensim-dev thread, rename InnerScene to SceneGraph to make it more descriptive of its intended function
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 7e32086..c6ad94c 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -2342,7 +2342,7 @@ namespace OpenSim.Region.Environment.Scenes
2342 public UUID RezSingleAttachment(IClientAPI remoteClient, UUID itemID, 2342 public UUID RezSingleAttachment(IClientAPI remoteClient, UUID itemID,
2343 uint AttachmentPt) 2343 uint AttachmentPt)
2344 { 2344 {
2345 SceneObjectGroup att = m_innerScene.RezSingleAttachment(remoteClient, itemID, AttachmentPt); 2345 SceneObjectGroup att = m_sceneGraph.RezSingleAttachment(remoteClient, itemID, AttachmentPt);
2346 2346
2347 if (att == null) 2347 if (att == null)
2348 { 2348 {
@@ -2375,7 +2375,7 @@ namespace OpenSim.Region.Environment.Scenes
2375 2375
2376 public void AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent) 2376 public void AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent)
2377 { 2377 {
2378 m_innerScene.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent); 2378 m_sceneGraph.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent);
2379 } 2379 }
2380 2380
2381 public void AttachObject(IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att) 2381 public void AttachObject(IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att)
@@ -2455,7 +2455,8 @@ namespace OpenSim.Region.Environment.Scenes
2455 } 2455 }
2456 2456
2457 } 2457 }
2458 m_innerScene.DetachSingleAttachmentToInv(itemID, remoteClient); 2458
2459 m_sceneGraph.DetachSingleAttachmentToInv(itemID, remoteClient);
2459 } 2460 }
2460 2461
2461 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) 2462 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)