From d01b8e163d14ee76c291565b5630d5049cde9b95 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Wed, 3 Jul 2013 00:27:22 +0100
Subject: minor: Correct typo of "Descrition" to "Description" in "show object
 *" console commands

Thanks to Ai Austin for pointing this out.
---
 .../Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/World')

diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
index e434b2e..0e79733 100644
--- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs
@@ -546,7 +546,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands
         {
             ConsoleDisplayList cdl = new ConsoleDisplayList();
             cdl.AddRow("Name", so.Name);
-            cdl.AddRow("Descrition", so.Description);
+            cdl.AddRow("Description", so.Description);
             cdl.AddRow("Local ID", so.LocalId);
             cdl.AddRow("UUID", so.UUID);
             cdl.AddRow("Location", string.Format("{0} @ {1}", so.AbsolutePosition, so.Scene.Name));
-- 
cgit v1.1


From ca380ec0397b28a3d7a3f2c60aeb6eaf1153be31 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 12:41:45 -0700
Subject: Same freeze issue, now checking if it's in estate

---
 OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Region/CoreModules/World')

diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
index 73e706c..d23e51a 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
@@ -130,6 +130,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void SendToEstate(uint EstateID, Dictionary<string, object> sendData)
         {
+            m_log.DebugFormat("[XESTATE CONNECTOR]: SendToEstate");
             List<UUID> regions = m_EstateModule.Scenes[0].GetEstateRegions((int)EstateID);
 
             UUID ScopeID = UUID.Zero;
-- 
cgit v1.1


From 38a04ff993052980a2dfbfbdbe0d2853e2d8950e Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Thu, 4 Jul 2013 13:00:06 -0700
Subject: Revert "Same freeze issue, now checking if it's in estate"

This reverts commit ca380ec0397b28a3d7a3f2c60aeb6eaf1153be31.
---
 OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs | 1 -
 1 file changed, 1 deletion(-)

(limited to 'OpenSim/Region/CoreModules/World')

diff --git a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
index d23e51a..73e706c 100644
--- a/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/XEstateConnector.cs
@@ -130,7 +130,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
 
         private void SendToEstate(uint EstateID, Dictionary<string, object> sendData)
         {
-            m_log.DebugFormat("[XESTATE CONNECTOR]: SendToEstate");
             List<UUID> regions = m_EstateModule.Scenes[0].GetEstateRegions((int)EstateID);
 
             UUID ScopeID = UUID.Zero;
-- 
cgit v1.1