From 2bc8dcfdbd987ca4a47270c62b77a7eb9ac0f851 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 10 Jun 2011 02:27:45 +0100
Subject: minor: add method doc to make it clear that click action is fired
 when the click action is changed, not when a prim is clicked

---
 OpenSim/Region/Framework/Scenes/SceneGraph.cs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index cdb4e41..a078291 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -1504,7 +1504,7 @@ namespace OpenSim.Region.Framework.Scenes
         }
 
         /// <summary>
-        ///
+        /// Handle a prim description set request from a viewer.
         /// </summary>
         /// <param name="primLocalID"></param>
         /// <param name="description"></param>
@@ -1521,8 +1521,17 @@ namespace OpenSim.Region.Framework.Scenes
             }
         }
 
+        /// <summary>
+        /// Set a click action for the prim.
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="primLocalID"></param>
+        /// <param name="clickAction"></param>
         protected internal void PrimClickAction(IClientAPI remoteClient, uint primLocalID, string clickAction)
         {
+//            m_log.DebugFormat(
+//                "[SCENEGRAPH]: User {0} set click action for {1} to {2}", remoteClient.Name, primLocalID, clickAction);
+
             SceneObjectGroup group = GetGroupByPrim(primLocalID);
             if (group != null)
             {
-- 
cgit v1.1


From b5518dc90631014a4aa3dbb6c27fd5d4c9f612c9 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 10 Jun 2011 20:40:14 +0100
Subject: minor: Add some commented out destructor logging messages for
 potential future use.

At the moment, client and scene objects are being garbage collected as expected, at least in simple scenarios.
---
 OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | 5 +++++
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs  | 7 +++++++
 2 files changed, 12 insertions(+)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
index 9b9374b..79660a3 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
@@ -469,6 +469,11 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
+//        ~SceneObjectGroup()
+//        {
+//            m_log.DebugFormat("[SCENE OBJECT GROUP]: Destructor called for {0}, local id {1}", Name, LocalId);
+//        }
+
         #region Constructors
 
         /// <summary>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index 331abb2..a215b20 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -346,6 +346,13 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion Fields
 
+//        ~SceneObjectPart()
+//        {
+//            m_log.DebugFormat(
+//                "[SCENE OBJECT PART]: Destructor called for {0}, local id {1}, parent {2} {3}",
+//                Name, LocalId, ParentGroup.Name, ParentGroup.LocalId);
+//        }
+
         #region Constructors
 
         /// <summary>
-- 
cgit v1.1


From fc7e17baf74a4b3ce4c47480f24266180dd4353d Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 10 Jun 2011 21:49:25 +0100
Subject: When serializing objects, stop accidentally using the green text
 colour value for alpha

This addresses http://opensimulator.org/mantis/view.php?id=5111
---
 OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/Framework/Scenes')

diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index 6ae4f38..fcf7e0c 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -1171,7 +1171,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
             writer.WriteElementString("R", sop.Color.R.ToString(Utils.EnUsCulture));
             writer.WriteElementString("G", sop.Color.G.ToString(Utils.EnUsCulture));
             writer.WriteElementString("B", sop.Color.B.ToString(Utils.EnUsCulture));
-            writer.WriteElementString("A", sop.Color.G.ToString(Utils.EnUsCulture));
+            writer.WriteElementString("A", sop.Color.A.ToString(Utils.EnUsCulture));
             writer.WriteEndElement();
 
             writer.WriteElementString("Text", sop.Text);
-- 
cgit v1.1