diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
index 4abc2158f9..d68c683143 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
{
if (s.RegionInfo.RegionHandle == regionHandle)
{
- m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
+ //m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
if (isLocalCall)
{
// We need to make a local copy of the object
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index f556b35ac7..a2634f7bec 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -2449,8 +2449,6 @@ namespace OpenSim.Region.Framework.Scenes
return;
}
- m_log.DebugFormat("[SCENE INVENTORY]: {0} {1} IsAttachment={2}", att.Name, att.LocalId, att.IsAttachment);
- Console.WriteLine("HERE X");
ScenePresence presence;
if (TryGetAvatar(remoteClient.AgentId, out presence))
{
@@ -2458,12 +2456,9 @@ namespace OpenSim.Region.Framework.Scenes
InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
item = InventoryService.GetItem(item);
presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/);
- Console.WriteLine("HERE Y");
if (m_AvatarFactory != null)
m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
-
- Console.WriteLine("HERE Z");
}
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
index d8e604ff9b..ac04dc795b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
@@ -124,7 +124,6 @@ namespace OpenSim.Region.Framework.Scenes
{
if (((SceneObjectGroup)ent).LocalId == primLocalID)
{
- m_log.DebugFormat("[SCENE]: Received full update request for {0} from {1}", primLocalID, remoteClient.Name);
((SceneObjectGroup)ent).SendFullUpdateToClient(remoteClient);
return;
}
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f8ca0479ef..e8c49786ca 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1833,28 +1833,6 @@ namespace OpenSim.Region.Framework.Scenes
return sceneObject;
}
- ///
- /// Add an object into the scene that has come from storage
- ///
- ///
- ///
- ///
- /// If true, changes to the object will be reflected in its persisted data
- /// If false, the persisted data will not be changed even if the object in the scene is changed
- ///
- ///
- /// If true, we won't persist this object until it changes
- /// If false, we'll persist this object immediately
- ///
- ///
- /// true if the object was added, false if an object with the same uuid was already in the scene
- ///
- public bool AddRestoredSceneObject(
- SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
- {
- return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, sendClientUpdates);
- }
-
///
/// Add an object into the scene that has come from storage
///
@@ -1874,7 +1852,7 @@ namespace OpenSim.Region.Framework.Scenes
public bool AddRestoredSceneObject(
SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
{
- return AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true);
+ return m_sceneGraph.AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted);
}
///
@@ -2487,7 +2465,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public bool IncomingCreateObject(ISceneObject sog)
{
- m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
+ //m_log.Debug(" >>> IncomingCreateObject(sog) <<< " + ((SceneObjectGroup)sog).AbsolutePosition + " deleted? " + ((SceneObjectGroup)sog).IsDeleted);
SceneObjectGroup newObject;
try
{
@@ -2559,12 +2537,10 @@ namespace OpenSim.Region.Framework.Scenes
if (sceneObject.IsAttachmentCheckFull()) // Attachment
{
- m_log.DebugFormat("[SCENE]: Adding attachment {0} {1}", sceneObject.Name, sceneObject.LocalId);
-
sceneObject.RootPart.AddFlag(PrimFlags.TemporaryOnRez);
sceneObject.RootPart.AddFlag(PrimFlags.Phantom);
- AddRestoredSceneObject(sceneObject, false, false, false);
+ AddRestoredSceneObject(sceneObject, false, false);
// Handle attachment special case
SceneObjectPart RootPrim = sceneObject.RootPart;
@@ -2572,8 +2548,6 @@ namespace OpenSim.Region.Framework.Scenes
// Fix up attachment Parent Local ID
ScenePresence sp = GetScenePresence(sceneObject.OwnerID);
- Console.WriteLine("AAAA");
-
//uint parentLocalID = 0;
if (sp != null)
{
@@ -2592,25 +2566,20 @@ namespace OpenSim.Region.Framework.Scenes
//grp.SetFromAssetID(grp.RootPart.LastOwnerID);
m_log.DebugFormat(
"[ATTACHMENT]: Attach to avatar {0} at position {1}", sp.UUID, grp.AbsolutePosition);
-
- RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
+
AttachObject(
sp.ControllingClient, grp.LocalId, (uint)0, grp.GroupRotation, grp.AbsolutePosition, false);
-
- //grp.SendGroupFullUpdate();
+ RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
+ grp.SendGroupFullUpdate();
}
else
{
RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
RootPrim.AddFlag(PrimFlags.TemporaryOnRez);
}
-
- Console.WriteLine("BBBB");
}
else
{
- m_log.DebugFormat("[SCENE]: Adding ordinary object {0} {1}", sceneObject.Name, sceneObject.LocalId);
-
AddRestoredSceneObject(sceneObject, true, false);
if (!Permissions.CanObjectEntry(sceneObject.UUID,
diff --git a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
index 50feb17cc4..2f6a0dbb98 100644
--- a/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
@@ -1383,9 +1383,7 @@ namespace OpenSim.Region.Framework.Scenes
// now we have a child agent in this region. Request all interesting data about other (root) agents
agent.SendInitialFullUpdateToAllClients();
- Console.WriteLine("SCS 1");
agent.CrossAttachmentsIntoNewRegion(neighbourHandle, true);
- Console.WriteLine("SCS 2");
// m_scene.SendKillObject(m_localId);
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index fa3c5eb5f1..59a2f41218 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -216,15 +216,11 @@ namespace OpenSim.Region.Framework.Scenes
/// If true, we won't persist this object until it changes
/// If false, we'll persist this object immediately
///
- ///
- /// If true, we send updates to the client to tell it about this object
- /// If false, we leave it up to the caller to do this
- ///
///
/// true if the object was added, false if an object with the same uuid was already in the scene
///
protected internal bool AddRestoredSceneObject(
- SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted, bool sendClientUpdates)
+ SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
{
if (!alreadyPersisted)
{
@@ -232,29 +228,8 @@ namespace OpenSim.Region.Framework.Scenes
sceneObject.HasGroupChanged = true;
}
- return AddSceneObject(sceneObject, attachToBackup, sendClientUpdates);
+ return AddSceneObject(sceneObject, attachToBackup, true);
}
-
-// ///
-// /// Add an object into the scene that has come from storage
-// ///
-// ///
-// ///
-// /// If true, changes to the object will be reflected in its persisted data
-// /// If false, the persisted data will not be changed even if the object in the scene is changed
-// ///
-// ///
-// /// If true, we won't persist this object until it changes
-// /// If false, we'll persist this object immediately
-// ///
-// ///
-// /// true if the object was added, false if an object with the same uuid was already in the scene
-// ///
-// protected internal bool AddRestoredSceneObject(
-// SceneObjectGroup sceneObject, bool attachToBackup, bool alreadyPersisted)
-// {
-// AddRestoredSceneObject(sceneObject, attachToBackup, alreadyPersisted, true);
-// }
///
/// Add a newly created object to the scene. This will both update the scene, and send information about the
@@ -636,13 +611,11 @@ namespace OpenSim.Region.Framework.Scenes
protected internal bool AttachObject(
IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
{
- Console.WriteLine("HERE A");
SceneObjectGroup group = GetGroupByPrim(objectLocalID);
if (group != null)
{
if (m_parentScene.Permissions.CanTakeObject(group.UUID, remoteClient.AgentId))
{
- Console.WriteLine("HERE -1");
// If the attachment point isn't the same as the one previously used
// set it's offset position = 0 so that it appears on the attachment point
// and not in a weird location somewhere unknown.
@@ -681,12 +654,9 @@ namespace OpenSim.Region.Framework.Scenes
itemId = group.GetFromItemID();
}
- Console.WriteLine("HERE 0");
m_parentScene.AttachObject(remoteClient, AttachmentPt, itemId, group);
- Console.WriteLine("HERE 1");
group.AttachToAgent(remoteClient.AgentId, AttachmentPt, attachPos, silent);
- Console.WriteLine("HERE 2");
// In case it is later dropped again, don't let
// it get cleaned up
//
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index ba3fde7d92..602b811fe9 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1494,10 +1494,6 @@ namespace OpenSim.Region.Framework.Scenes
public void SendFullUpdateToClient(IClientAPI remoteClient)
{
- if (IsAttachment)
- m_log.DebugFormat(
- "[SOG]: Sending full update to client {0} for {1} {2}", remoteClient.Name, Name, LocalId);
-
SendPartFullUpdate(remoteClient, RootPart, m_scene.Permissions.GenerateClientFlags(remoteClient.AgentId, RootPart.UUID));
lock (m_parts)
@@ -1517,9 +1513,8 @@ namespace OpenSim.Region.Framework.Scenes
///
internal void SendPartFullUpdate(IClientAPI remoteClient, SceneObjectPart part, uint clientFlags)
{
- if (IsAttachment)
- m_log.DebugFormat(
- "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
+// m_log.DebugFormat(
+// "[SOG]: Sending part full update to {0} for {1} {2}", remoteClient.Name, part.Name, part.LocalId);
if (m_rootPart.UUID == part.UUID)
{
@@ -1999,8 +1994,7 @@ namespace OpenSim.Region.Framework.Scenes
public void ScheduleFullUpdateToAvatar(ScenePresence presence)
{
- if (IsAttachment)
- m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name);
+// m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1} just to avatar {2}", Name, UUID, presence.Name);
RootPart.AddFullUpdateToAvatar(presence);
@@ -2032,8 +2026,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public void ScheduleGroupForFullUpdate()
{
- if (IsAttachment)
- m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID);
+// m_log.DebugFormat("[SOG]: Scheduling full update for {0} {1}", Name, UUID);
checkAtTargets();
RootPart.ScheduleFullUpdate();
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index ffbb4274b1..a85a4b3179 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1259,17 +1259,16 @@ namespace OpenSim.Region.Framework.Scenes
/// Tell all scene presences that they should send updates for this part to their clients
///
public void AddFullUpdateToAllAvatars()
- {
+ {
ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
for (int i = 0; i < avatars.Length; i++)
- AddFullUpdateToAvatar(avatars[i]);
+ {
+ avatars[i].SceneViewer.QueuePartForUpdate(this);
+ }
}
public void AddFullUpdateToAvatar(ScenePresence presence)
{
- if (IsAttachment)
- m_log.DebugFormat("AddFullUpdateToAllAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
-
presence.SceneViewer.QueuePartForUpdate(this);
}
@@ -1288,14 +1287,13 @@ namespace OpenSim.Region.Framework.Scenes
{
ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
for (int i = 0; i < avatars.Length; i++)
- AddTerseUpdateToAvatar(avatars[i]);
+ {
+ avatars[i].SceneViewer.QueuePartForUpdate(this);
+ }
}
public void AddTerseUpdateToAvatar(ScenePresence presence)
{
- if (IsAttachment)
- m_log.DebugFormat("AddTerseUpdateToAvatar() {0} for {1} {2}", presence.Name, Name, LocalId);
-
presence.SceneViewer.QueuePartForUpdate(this);
}
@@ -2729,8 +2727,7 @@ namespace OpenSim.Region.Framework.Scenes
///
public void ScheduleFullUpdate()
{
- if (IsAttachment)
- m_log.DebugFormat("[SOP]: Scheduling full update for {0} {1}", Name, LocalId);
+// m_log.DebugFormat("[SCENE OBJECT PART]: Scheduling full update for {0} {1}", Name, LocalId);
if (m_parentGroup != null)
{
@@ -2843,10 +2840,6 @@ namespace OpenSim.Region.Framework.Scenes
///
public void SendFullUpdate(IClientAPI remoteClient, uint clientFlags)
{
- if (IsAttachment)
- m_log.DebugFormat(
- "[SCENE OBJECT PART]: Sending part full update to {0} for {1} {2}", remoteClient.Name, Name, LocalId);
-
m_parentGroup.SendPartFullUpdate(remoteClient, this, clientFlags);
}
@@ -2855,10 +2848,6 @@ namespace OpenSim.Region.Framework.Scenes
///
public void SendFullUpdateToAllClients()
{
- if (IsAttachment)
- m_log.DebugFormat(
- "[SCENE OBJECT PART]: Sending full update for {0} {1} for all clients", Name, LocalId);
-
ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
for (int i = 0; i < avatars.Length; i++)
{
@@ -2870,10 +2859,6 @@ namespace OpenSim.Region.Framework.Scenes
public void SendFullUpdateToAllClientsExcept(UUID agentID)
{
- if (IsAttachment)
- m_log.DebugFormat(
- "[SCENE OBJECT PART]: Sending full update for {0} {1} to all clients except {2}", Name, LocalId, agentID);
-
ScenePresence[] avatars = m_parentGroup.Scene.GetScenePresences();
for (int i = 0; i < avatars.Length; i++)
{
@@ -2980,9 +2965,6 @@ namespace OpenSim.Region.Framework.Scenes
{
if (m_updateFlag == 2) // is a new prim, just created/reloaded or has major changes
{
- if (IsAttachment)
- m_log.DebugFormat("[SOP]: Sending scheduled full update for {0} {1}", Name, LocalId);
-
AddFullUpdateToAllAvatars();
ClearUpdateSchedule();
}
diff --git a/OpenSim/Region/Framework/Scenes/SceneViewer.cs b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
index 6f2bef982e..e4296ef66c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneViewer.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneViewer.cs
@@ -27,7 +27,6 @@
using System;
using System.Collections.Generic;
-using System.Reflection;
using OpenMetaverse;
using log4net;
using OpenSim.Framework;
@@ -40,8 +39,6 @@ namespace OpenSim.Region.Framework.Scenes
{
public class SceneViewer : ISceneViewer
{
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
protected ScenePresence m_presence;
protected UpdateQueue m_partsUpdateQueue = new UpdateQueue();
protected Queue m_pendingObjects;
@@ -63,9 +60,6 @@ namespace OpenSim.Region.Framework.Scenes
///
public void QueuePartForUpdate(SceneObjectPart part)
{
- if (part.IsAttachment)
- m_log.DebugFormat("[SCENE VIEWER]: Queueing part {0} {1} for update", part.Name, part.LocalId);
-
lock (m_partsUpdateQueue)
{
m_partsUpdateQueue.Enqueue(part);
@@ -140,7 +134,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else if (update.LastTerseUpdateTime <= part.TimeStampTerse)
{
-// m_log.DebugFormat(AddFullUpdateToAvatar
+// m_log.DebugFormat(
// "[SCENE PRESENCE]: Tersely updating prim {0}, {1} - part timestamp {2}",
// part.Name, part.UUID, part.TimeStampTerse);
diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 4e7ef51bd8..3c7adf5419 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -12,7 +12,7 @@
-
+