aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/ScenePresence.cs
diff options
context:
space:
mode:
authorAdam Frisby2008-04-21 07:09:17 +0000
committerAdam Frisby2008-04-21 07:09:17 +0000
commitfef3b3689492dea63693c964bcdbec9f5137eb5e (patch)
tree7791eef001d85d3e1de863a68f26ff9434d062ca /OpenSim/Region/Environment/Scenes/ScenePresence.cs
parent* Terrain Module code has been reformatted to comply with guidelines. (diff)
downloadopensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.zip
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.gz
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.bz2
opensim-SC_OLD-fef3b3689492dea63693c964bcdbec9f5137eb5e.tar.xz
* Optimised using statements and namespace references across entire project (this took a while to run).
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/ScenePresence.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs20
1 files changed, 10 insertions, 10 deletions
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index 8b8373d..d85eea6 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -27,16 +27,16 @@
27 27
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection;
31using System.Runtime.Serialization;
32using System.Security.Permissions;
30using Axiom.Math; 33using Axiom.Math;
31using libsecondlife; 34using libsecondlife;
32using libsecondlife.Packets; 35using libsecondlife.Packets;
36using log4net;
33using OpenSim.Framework; 37using OpenSim.Framework;
34using OpenSim.Framework.Console;
35using OpenSim.Region.Environment.Types; 38using OpenSim.Region.Environment.Types;
36using OpenSim.Region.Physics.Manager; 39using OpenSim.Region.Physics.Manager;
37using OpenSim.Region.Environment.Interfaces;
38using System.Runtime.Serialization;
39using System.Security.Permissions;
40 40
41namespace OpenSim.Region.Environment.Scenes 41namespace OpenSim.Region.Environment.Scenes
42{ 42{
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Scenes
48// System.Console.WriteLine("[ScenePresence] Destructor called"); 48// System.Console.WriteLine("[ScenePresence] Destructor called");
49// } 49// }
50 50
51 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52 52
53 public static AvatarAnimations Animations = new AvatarAnimations(); 53 public static AvatarAnimations Animations = new AvatarAnimations();
54 public static byte[] DefaultTexture; 54 public static byte[] DefaultTexture;
@@ -1746,7 +1746,7 @@ namespace OpenSim.Region.Environment.Scenes
1746 movementvector.Z = force.Z; 1746 movementvector.Z = force.Z;
1747 Velocity = movementvector; 1747 Velocity = movementvector;
1748 } 1748 }
1749 catch (System.NullReferenceException) 1749 catch (NullReferenceException)
1750 { 1750 {
1751 // Under extreme load, this returns a NullReference Exception that we can ignore. 1751 // Under extreme load, this returns a NullReference Exception that we can ignore.
1752 // Ignoring this causes no movement to be sent to the physics engine... 1752 // Ignoring this causes no movement to be sent to the physics engine...
@@ -1800,7 +1800,7 @@ namespace OpenSim.Region.Environment.Scenes
1800 1800
1801 if (info == null) 1801 if (info == null)
1802 { 1802 {
1803 throw new System.ArgumentNullException("info"); 1803 throw new ArgumentNullException("info");
1804 } 1804 }
1805 1805
1806 FullID = new LLUUID((Guid)info.GetValue("FullID", typeof(Guid))); 1806 FullID = new LLUUID((Guid)info.GetValue("FullID", typeof(Guid)));
@@ -1817,7 +1817,7 @@ namespace OpenSim.Region.Environment.Scenes
1817 { 1817 {
1818 if (info == null) 1818 if (info == null)
1819 { 1819 {
1820 throw new System.ArgumentNullException("info"); 1820 throw new ArgumentNullException("info");
1821 } 1821 }
1822 1822
1823 info.AddValue("FullID", FullID.UUID); 1823 info.AddValue("FullID", FullID.UUID);
@@ -1928,7 +1928,7 @@ namespace OpenSim.Region.Environment.Scenes
1928 1928
1929 if (info == null) 1929 if (info == null)
1930 { 1930 {
1931 throw new System.ArgumentNullException("info"); 1931 throw new ArgumentNullException("info");
1932 } 1932 }
1933/* JB 1933/* JB
1934 if (Animations == null) 1934 if (Animations == null)
@@ -2100,7 +2100,7 @@ namespace OpenSim.Region.Environment.Scenes
2100 { 2100 {
2101 if (info == null) 2101 if (info == null)
2102 { 2102 {
2103 throw new System.ArgumentNullException("info"); 2103 throw new ArgumentNullException("info");
2104 } 2104 }
2105 2105
2106 base.GetObjectData(info, context); 2106 base.GetObjectData(info, context);