aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-09-13 20:25:32 +0100
committerJustin Clark-Casey (justincc)2011-09-13 20:25:32 +0100
commit618277e797c7d501f98e884e50abd313498cf00b (patch)
tree7854d60ddb9d0ac5957194f274a41b44cfd636d7 /OpenSim/Region/Framework/Scenes/Scene.cs
parentstop the duplicate remove of the root part ids from the full part and local p... (diff)
downloadopensim-SC-618277e797c7d501f98e884e50abd313498cf00b.zip
opensim-SC-618277e797c7d501f98e884e50abd313498cf00b.tar.gz
opensim-SC-618277e797c7d501f98e884e50abd313498cf00b.tar.bz2
opensim-SC-618277e797c7d501f98e884e50abd313498cf00b.tar.xz
Comment out attachments code in Scene.IncomingCreateObject(UUID userID, UUID itemID) for now
As far as I can see, this is only invoked by a PUT request to ObjectHandlers, which is not being used anyway. Invoking attachments code at this point is probably inappropriate since it would still be invoked when the client entered the scene. Being commented to simplify analysis of attachments issues. Can be uncommented when in use. Also, small tweak to lock and log removal of a SOG from the SceneObjectGroupsByLocalPartID collection in SceneGraph.GetGroupByPrim() if an inconsistency is found.
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs18
1 files changed, 10 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index a0a2624..c5c9260 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2461,14 +2461,16 @@ namespace OpenSim.Region.Framework.Scenes
2461 /// <returns>False</returns> 2461 /// <returns>False</returns>
2462 public virtual bool IncomingCreateObject(UUID userID, UUID itemID) 2462 public virtual bool IncomingCreateObject(UUID userID, UUID itemID)
2463 { 2463 {
2464 //m_log.DebugFormat(" >>> IncomingCreateObject(userID, itemID) <<< {0} {1}", userID, itemID); 2464 m_log.DebugFormat(" >>> IncomingCreateObject(userID, itemID) <<< {0} {1}", userID, itemID);
2465 2465
2466 ScenePresence sp = GetScenePresence(userID); 2466 // Commented out since this is as yet unused and is arguably not the appropriate place to do this, as
2467 if (sp != null && AttachmentsModule != null) 2467 // attachments are being rezzed elsewhere in AddNewClient()
2468 { 2468// ScenePresence sp = GetScenePresence(userID);
2469 uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID); 2469// if (sp != null && AttachmentsModule != null)
2470 AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt); 2470// {
2471 } 2471// uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID);
2472// AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt);
2473// }
2472 2474
2473 return false; 2475 return false;
2474 } 2476 }