Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2015-01-22 10:45:46 -0800
committer: Diva Canto 2015-01-22 10:45:46 -0800
commit: edc155c6367bdc81303b56aee0c724ce7aeaa0d8 (patch)
tree: 33ddce1499ec22dab20935148cacc24f9dc2031c /OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
parent: On the GridService, the central simulator features: ensure that the map tile ... (diff)
parent: Stop currently unsettable display names from appearing when [ClientStack.Lind... (diff)
download: opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.zip
opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.gz
opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.bz2
opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 07e8025..e258bcb 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -235,7 +235,7 @@ namespace OpenSim.Region.ClientStack.Linden
        private Hashtable HandleSimulatorFeaturesRequest(Hashtable mDhttpMethod, UUID agentID)
        {
-            m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: SimulatorFeatures request");
+//            m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: SimulatorFeatures request");
            OSDMap copy = DeepCopy();
author	Diva Canto	2015-01-22 10:45:46 -0800
committer	Diva Canto	2015-01-22 10:45:46 -0800
commit	edc155c6367bdc81303b56aee0c724ce7aeaa0d8 (patch)
tree	33ddce1499ec22dab20935148cacc24f9dc2031c /OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
parent	On the GridService, the central simulator features: ensure that the map tile ... (diff)
parent	Stop currently unsettable display names from appearing when [ClientStack.Lind... (diff)
download	opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.zip opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.gz opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.bz2 opensim-SC_OLD-edc155c6367bdc81303b56aee0c724ce7aeaa0d8.tar.xz

diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs index 07e8025..e258bcb 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -235,7 +235,7 @@ namespace OpenSim.Region.ClientStack.Linden
235		235
236	private Hashtable HandleSimulatorFeaturesRequest(Hashtable mDhttpMethod, UUID agentID)	236	private Hashtable HandleSimulatorFeaturesRequest(Hashtable mDhttpMethod, UUID agentID)
237	{	237	{
238	m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: SimulatorFeatures request");	238	// m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: SimulatorFeatures request");
239		239
240	OSDMap copy = DeepCopy();	240	OSDMap copy = DeepCopy();
241		241