aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-09-13 23:35:27 +0100
committerMelanie2010-09-13 23:35:27 +0100
commitb2e50474dcc0e6c762cd3455fef73874e5ce4906 (patch)
treed0cca66cc22920d9b012e883f30c7a40ab5e05c2 /OpenSim
parentAdd a missing parenthesis (diff)
parentComment out SOG storing debug log message (diff)
downloadopensim-SC_OLD-b2e50474dcc0e6c762cd3455fef73874e5ce4906.zip
opensim-SC_OLD-b2e50474dcc0e6c762cd3455fef73874e5ce4906.tar.gz
opensim-SC_OLD-b2e50474dcc0e6c762cd3455fef73874e5ce4906.tar.bz2
opensim-SC_OLD-b2e50474dcc0e6c762cd3455fef73874e5ce4906.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs6
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs10
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs34
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs2
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs11
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs10
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs14
9 files changed, 45 insertions, 52 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index f35691a..0aa670a 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -5199,11 +5199,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
5199 } 5199 }
5200 catch (Exception e) 5200 catch (Exception e)
5201 { 5201 {
5202 m_log.Error("[GENERICMESSAGE] " + e); 5202 m_log.ErrorFormat(
5203 "[LLCLIENTVIEW]: Exeception when handling generic message {0}{1}", e.Message, e.StackTrace);
5203 } 5204 }
5204 } 5205 }
5205 } 5206 }
5206 m_log.Error("[GENERICMESSAGE] Not handling GenericMessage with method-type of: " + method); 5207
5208 //m_log.Debug("[LLCLIENTVIEW]: Not handling GenericMessage with method-type of: " + method);
5207 return false; 5209 return false;
5208 } 5210 }
5209 5211
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index ca5a297..56e8c9b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -695,9 +695,13 @@ namespace OpenSim.Region.ClientStack.LindenUDP
695 if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence)) 695 if (packet.Header.Reliable && !udpClient.PacketArchive.TryEnqueue(packet.Header.Sequence))
696 { 696 {
697 if (packet.Header.Resent) 697 if (packet.Header.Resent)
698 m_log.Debug("[LLUDPSERVER]: Received a resend of already processed packet #" + packet.Header.Sequence + ", type: " + packet.Type); 698 m_log.DebugFormat(
699 else 699 "[LLUDPSERVER]: Received a resend of already processed packet #{0}, type {1} from {2}",
700 m_log.Warn("[LLUDPSERVER]: Received a duplicate (not marked as resend) of packet #" + packet.Header.Sequence + ", type: " + packet.Type); 700 packet.Header.Sequence, packet.Type, client.Name);
701 else
702 m_log.WarnFormat(
703 "[LLUDPSERVER]: Received a duplicate (not marked as resend) of packet #{0}, type {1} from {2}",
704 packet.Header.Sequence, packet.Type, client.Name);
701 705
702 // Avoid firing a callback twice for the same packet 706 // Avoid firing a callback twice for the same packet
703 return; 707 return;
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 5604f49..1ebac42 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
190 itemID = group.GetFromItemID(); 190 itemID = group.GetFromItemID();
191 } 191 }
192 192
193 SetAttachmentInventoryStatus(remoteClient, AttachmentPt, itemID, group); 193 ShowAttachInUserInventory(remoteClient, AttachmentPt, itemID, group);
194 194
195 AttachToAgent(sp, group, AttachmentPt, attachPos, silent); 195 AttachToAgent(sp, group, AttachmentPt, attachPos, silent);
196 } 196 }
@@ -218,24 +218,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
218 218
219 public UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt) 219 public UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
220 { 220 {
221 m_log.DebugFormat("[ATTACHMENTS MODULE]: Rezzing single attachment from item {0} for {1}", itemID, remoteClient.Name);
222
223 return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true); 221 return RezSingleAttachmentFromInventory(remoteClient, itemID, AttachmentPt, true);
224 } 222 }
225 223
226 public UUID RezSingleAttachmentFromInventory( 224 public UUID RezSingleAttachmentFromInventory(
227 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus) 225 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus)
228 { 226 {
227 m_log.DebugFormat(
228 "[ATTACHMENTS MODULE]: Rezzing attachment to point {0} from item {1} for {2}",
229 (AttachmentPoint)AttachmentPt, itemID, remoteClient.Name);
230
229 SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt); 231 SceneObjectGroup att = RezSingleAttachmentFromInventoryInternal(remoteClient, itemID, AttachmentPt);
230 232
231 if (updateInventoryStatus) 233 if (updateInventoryStatus)
232 { 234 {
233 if (att == null) 235 if (att == null)
234 {
235 ShowDetachInUserInventory(itemID, remoteClient); 236 ShowDetachInUserInventory(itemID, remoteClient);
236 } 237 else
237 238 ShowAttachInUserInventory(att, remoteClient, itemID, AttachmentPt);
238 SetAttachmentInventoryStatus(att, remoteClient, itemID, AttachmentPt);
239 } 239 }
240 240
241 if (null == att) 241 if (null == att)
@@ -300,12 +300,20 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
300 return null; 300 return null;
301 } 301 }
302 302
303 public UUID SetAttachmentInventoryStatus( 303 /// <summary>
304 /// Update the user inventory to the attachment of an item
305 /// </summary>
306 /// <param name="att"></param>
307 /// <param name="remoteClient"></param>
308 /// <param name="itemID"></param>
309 /// <param name="AttachmentPt"></param>
310 /// <returns></returns>
311 protected UUID ShowAttachInUserInventory(
304 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt) 312 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
305 { 313 {
306 m_log.DebugFormat( 314// m_log.DebugFormat(
307 "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} (item ID {2})", 315// "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} (item ID {2})",
308 remoteClient.Name, att.Name, itemID); 316// remoteClient.Name, att.Name, itemID);
309 317
310 if (!att.IsDeleted) 318 if (!att.IsDeleted)
311 AttachmentPt = att.RootPart.AttachmentPoint; 319 AttachmentPt = att.RootPart.AttachmentPoint;
@@ -329,7 +337,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
329 /// <param name="AttachmentPt"></param> 337 /// <param name="AttachmentPt"></param>
330 /// <param name="itemID"></param> 338 /// <param name="itemID"></param>
331 /// <param name="att"></param> 339 /// <param name="att"></param>
332 public void SetAttachmentInventoryStatus( 340 protected void ShowAttachInUserInventory(
333 IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att) 341 IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att)
334 { 342 {
335// m_log.DebugFormat( 343// m_log.DebugFormat(
@@ -387,7 +395,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
387 // Save avatar attachment information 395 // Save avatar attachment information
388 if (m_scene.AvatarFactory != null) 396 if (m_scene.AvatarFactory != null)
389 { 397 {
390 m_log.Debug("[ATTACHMENTS MODULE]: Dettaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID); 398 m_log.Debug("[ATTACHMENTS MODULE]: Detaching from UserID: " + remoteClient.AgentId + ", ItemID: " + itemID);
391 m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); 399 m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
392 } 400 }
393 } 401 }
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 7e5a8ec..22c8937 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -198,7 +198,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
198 198
199 public void UpdateDatabase(UUID user, AvatarAppearance appearance) 199 public void UpdateDatabase(UUID user, AvatarAppearance appearance)
200 { 200 {
201 m_log.DebugFormat("[APPEARANCE]: UpdateDatabase"); 201 //m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
202 AvatarData adata = new AvatarData(appearance); 202 AvatarData adata = new AvatarData(appearance);
203 m_scene.AvatarService.SetAvatar(user, adata); 203 m_scene.AvatarService.SetAvatar(user, adata);
204 } 204 }
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 1140b9b..24e481b 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -109,17 +109,6 @@ namespace OpenSim.Region.Framework.Interfaces
109 /// <param name="itemID"></param> 109 /// <param name="itemID"></param>
110 /// <param name="remoteClient"></param> 110 /// <param name="remoteClient"></param>
111 void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient); 111 void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient);
112
113 /// <summary>
114 /// Update the user inventory to the attachment of an item
115 /// </summary>
116 /// <param name="att"></param>
117 /// <param name="remoteClient"></param>
118 /// <param name="itemID"></param>
119 /// <param name="AttachmentPt"></param>
120 /// <returns></returns>
121 UUID SetAttachmentInventoryStatus(
122 SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
123 112
124 /// <summary> 113 /// <summary>
125 /// Update the user inventory to show a detach. 114 /// Update the user inventory to show a detach.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 6d2ae5a..ef97dfc 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -1319,6 +1319,7 @@ namespace OpenSim.Region.Framework.Scenes
1319 if (m_frame % m_update_presences == 0) 1319 if (m_frame % m_update_presences == 0)
1320 m_sceneGraph.UpdatePresences(); 1320 m_sceneGraph.UpdatePresences();
1321 1321
1322 // Coarse locations relate to positions of green dots on the mini-map (on a SecondLife client)
1322 if (m_frame % m_update_coarse_locations == 0) 1323 if (m_frame % m_update_coarse_locations == 0)
1323 { 1324 {
1324 List<Vector3> coarseLocations; 1325 List<Vector3> coarseLocations;
@@ -1336,9 +1337,12 @@ namespace OpenSim.Region.Framework.Scenes
1336 m_sceneGraph.UpdatePreparePhysics(); 1337 m_sceneGraph.UpdatePreparePhysics();
1337 physicsMS2 = Util.EnvironmentTickCountSubtract(tmpPhysicsMS2); 1338 physicsMS2 = Util.EnvironmentTickCountSubtract(tmpPhysicsMS2);
1338 1339
1340 // Apply any pending avatar force input to the avatar's velocity
1339 if (m_frame % m_update_entitymovement == 0) 1341 if (m_frame % m_update_entitymovement == 0)
1340 m_sceneGraph.UpdateScenePresenceMovement(); 1342 m_sceneGraph.UpdateScenePresenceMovement();
1341 1343
1344 // Perform the main physics update. This will do the actual work of moving objects and avatars according to their
1345 // velocity
1342 int tmpPhysicsMS = Util.EnvironmentTickCount(); 1346 int tmpPhysicsMS = Util.EnvironmentTickCount();
1343 if (m_frame % m_update_physics == 0) 1347 if (m_frame % m_update_physics == 0)
1344 { 1348 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 5ac8ff5..85ff32e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -522,16 +522,6 @@ namespace OpenSim.Region.Framework.Scenes
522 m_parentScene.AttachmentsModule.DetachSingleAttachmentToGround(group.UUID, remoteClient); 522 m_parentScene.AttachmentsModule.DetachSingleAttachmentToGround(group.UUID, remoteClient);
523 } 523 }
524 524
525 protected internal void DetachObject(uint objectLocalID, IClientAPI remoteClient)
526 {
527 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
528 if (group != null)
529 {
530 //group.DetachToGround();
531 m_parentScene.AttachmentsModule.ShowDetachInUserInventory(group.GetFromItemID(), remoteClient);
532 }
533 }
534
535 protected internal void HandleUndo(IClientAPI remoteClient, UUID primId) 525 protected internal void HandleUndo(IClientAPI remoteClient, UUID primId)
536 { 526 {
537 if (primId != UUID.Zero) 527 if (primId != UUID.Zero)
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 2c1f207..dc6509d 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -1430,9 +1430,9 @@ namespace OpenSim.Region.Framework.Scenes
1430 // don't backup while it's selected or you're asking for changes mid stream. 1430 // don't backup while it's selected or you're asking for changes mid stream.
1431 if (isTimeToPersist() || forcedBackup) 1431 if (isTimeToPersist() || forcedBackup)
1432 { 1432 {
1433 m_log.DebugFormat( 1433// m_log.DebugFormat(
1434 "[SCENE]: Storing {0}, {1} in {2}", 1434// "[SCENE]: Storing {0}, {1} in {2}",
1435 Name, UUID, m_scene.RegionInfo.RegionName); 1435// Name, UUID, m_scene.RegionInfo.RegionName);
1436 1436
1437 SceneObjectGroup backup_group = Copy(false); 1437 SceneObjectGroup backup_group = Copy(false);
1438 backup_group.RootPart.Velocity = RootPart.Velocity; 1438 backup_group.RootPart.Velocity = RootPart.Velocity;
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 177cf1e..a77f38c 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -1522,6 +1522,8 @@ namespace OpenSim.Region.Framework.Scenes
1522 } 1522 }
1523 } 1523 }
1524 1524
1525 // If the agent update does move the avatar, then calculate the force ready for the velocity update,
1526 // which occurs later in the main scene loop
1525 if (update_movementflag || (update_rotation && DCFlagKeyPressed)) 1527 if (update_movementflag || (update_rotation && DCFlagKeyPressed))
1526 { 1528 {
1527 // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed)); 1529 // m_log.DebugFormat("{0} {1}", update_movementflag, (update_rotation && DCFlagKeyPressed));
@@ -3727,8 +3729,8 @@ namespace OpenSim.Region.Framework.Scenes
3727 return; 3729 return;
3728 3730
3729 UUID itemID = m_appearance.GetAttachedItem(p); 3731 UUID itemID = m_appearance.GetAttachedItem(p);
3730 UUID assetID = m_appearance.GetAttachedAsset(p);
3731 3732
3733 //UUID assetID = m_appearance.GetAttachedAsset(p);
3732 // For some reason assetIDs are being written as Zero's in the DB -- need to track tat down 3734 // For some reason assetIDs are being written as Zero's in the DB -- need to track tat down
3733 // But they're not used anyway, the item is being looked up for now, so let's proceed. 3735 // But they're not used anyway, the item is being looked up for now, so let's proceed.
3734 //if (UUID.Zero == assetID) 3736 //if (UUID.Zero == assetID)
@@ -3739,17 +3741,11 @@ namespace OpenSim.Region.Framework.Scenes
3739 3741
3740 try 3742 try
3741 { 3743 {
3742 // Rez from inventory 3744 m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p);
3743 UUID asset
3744 = m_scene.AttachmentsModule.RezSingleAttachmentFromInventory(ControllingClient, itemID, (uint)p);
3745
3746 m_log.InfoFormat(
3747 "[ATTACHMENT]: Rezzed attachment in point {0} from item {1} and asset {2} ({3})",
3748 p, itemID, assetID, asset);
3749 } 3745 }
3750 catch (Exception e) 3746 catch (Exception e)
3751 { 3747 {
3752 m_log.ErrorFormat("[ATTACHMENT]: Unable to rez attachment: {0}", e.ToString()); 3748 m_log.ErrorFormat("[ATTACHMENT]: Unable to rez attachment: {0}{1}", e.Message, e.StackTrace);
3753 } 3749 }
3754 } 3750 }
3755 } 3751 }