aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes
diff options
context:
space:
mode:
authoronefang2019-06-04 00:50:59 +1000
committeronefang2019-06-04 00:50:59 +1000
commitcdb1851f438349a8721c0d9cef54837d0b302189 (patch)
tree1a1c7255ac4343ecf44bdd5387903f467a6b7626 /OpenSim/Region/Framework/Scenes
parentAdjust [AuthorizationService] sections to use the new DefaultRegionAccess. (diff)
downloadopensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.zip
opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.tar.gz
opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.tar.bz2
opensim-SC_OLD-cdb1851f438349a8721c0d9cef54837d0b302189.tar.xz
Warnings--
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r--OpenSim/Region/Framework/Scenes/KeyframeMotion.cs6
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneManager.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs6
5 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
index 80ee510..e2786da 100644
--- a/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
+++ b/OpenSim/Region/Framework/Scenes/KeyframeMotion.cs
@@ -669,7 +669,7 @@ namespace OpenSim.Region.Framework.Scenes
669 if (m_group == null) 669 if (m_group == null)
670 return; 670 return;
671 671
672 bool update = false; 672// bool update = false;
673 673
674 if (m_selected) 674 if (m_selected)
675 { 675 {
@@ -724,7 +724,7 @@ namespace OpenSim.Region.Framework.Scenes
724 724
725 m_currentFrame.TimeMS += (int)tickDuration; 725 m_currentFrame.TimeMS += (int)tickDuration;
726 m_lasttickMS = nowMS - 50f; 726 m_lasttickMS = nowMS - 50f;
727 update = true; 727// update = true;
728 } 728 }
729 729
730 int elapsed = (int)(nowMS - m_lasttickMS); 730 int elapsed = (int)(nowMS - m_lasttickMS);
@@ -761,7 +761,7 @@ namespace OpenSim.Region.Framework.Scenes
761 else 761 else
762 m_group.RootPart.Velocity = Vector3.Zero; 762 m_group.RootPart.Velocity = Vector3.Zero;
763 } 763 }
764 update = true; 764// update = true;
765 } 765 }
766 else 766 else
767 { 767 {
diff --git a/OpenSim/Region/Framework/Scenes/SceneManager.cs b/OpenSim/Region/Framework/Scenes/SceneManager.cs
index 1e418df..1fea656 100644
--- a/OpenSim/Region/Framework/Scenes/SceneManager.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneManager.cs
@@ -196,7 +196,7 @@ namespace OpenSim.Region.Framework.Scenes
196 196
197 public void SendSimOnlineNotification(ulong regionHandle) 197 public void SendSimOnlineNotification(ulong regionHandle)
198 { 198 {
199 RegionInfo Result = null; 199// RegionInfo Result = null;
200 200
201 Scene s = m_localScenes.FindValue(delegate(Scene x) 201 Scene s = m_localScenes.FindValue(delegate(Scene x)
202 { 202 {
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 74f765d..8055f92 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Scenes
77 public class ScenePresence : EntityBase, IScenePresence 77 public class ScenePresence : EntityBase, IScenePresence
78 { 78 {
79 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 79 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
80 private static readonly String LogHeader = "[SCENE PRESENCE]"; 80// private static readonly String LogHeader = "[SCENE PRESENCE]";
81 81
82// ~ScenePresence() 82// ~ScenePresence()
83// { 83// {
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
index 4024fea..8fa4409 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/CoalescedSceneObjectsSerializer.cs
@@ -179,7 +179,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
179 i++; 179 i++;
180 } 180 }
181 } 181 }
182 catch (Exception e) 182 catch /*(Exception e)*/
183 { 183 {
184 m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed "); 184 m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ");
185//// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e); 185//// m_log.Error("[COALESCED SCENE OBJECTS SERIALIZER]: Deserialization of xml failed ", e);
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
index c2b075c..ab70010 100644
--- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
+++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
@@ -69,7 +69,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
69 { 69 {
70 return FromOriginalXmlFormat(reader); 70 return FromOriginalXmlFormat(reader);
71 } 71 }
72 catch (Exception e) 72 catch /*(Exception e)*/
73 { 73 {
74 m_log.Error("[SERIALIZER]: Deserialization of xml failed "); 74 m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
75//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); 75//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
@@ -314,7 +314,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
314// sceneObject.AggregatePerms(); 314// sceneObject.AggregatePerms();
315 return sceneObject; 315 return sceneObject;
316 } 316 }
317 catch (Exception e) 317 catch /*(Exception e)*/
318 { 318 {
319 m_log.Error("[SERIALIZER]: Deserialization of xml failed "); 319 m_log.Error("[SERIALIZER]: Deserialization of xml failed ");
320//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e); 320//// m_log.Error("[SERIALIZER]: Deserialization of xml failed ", e);
@@ -1402,7 +1402,7 @@ namespace OpenSim.Region.Framework.Scenes.Serialization
1402 value = reader.ReadElementContentAsString("Media", String.Empty); 1402 value = reader.ReadElementContentAsString("Media", String.Empty);
1403 shp.Media = PrimitiveBaseShape.MediaList.FromXml(value); 1403 shp.Media = PrimitiveBaseShape.MediaList.FromXml(value);
1404 } 1404 }
1405 catch (XmlException e) 1405 catch (XmlException)
1406 { 1406 {
1407 // There are versions of OAR files that contain unquoted XML. 1407 // There are versions of OAR files that contain unquoted XML.
1408 // ie ONE comercial fork that never wanted their oars to be read by our code 1408 // ie ONE comercial fork that never wanted their oars to be read by our code