aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/ChatModule.cs4
-rw-r--r--OpenSim/Region/Environment/Modules/SunModule.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/XMLRPCModule.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneObjectPart.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs5
5 files changed, 6 insertions, 9 deletions
diff --git a/OpenSim/Region/Environment/Modules/ChatModule.cs b/OpenSim/Region/Environment/Modules/ChatModule.cs
index d5edc6d..a78e4f6 100644
--- a/OpenSim/Region/Environment/Modules/ChatModule.cs
+++ b/OpenSim/Region/Environment/Modules/ChatModule.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Region.Environment.Modules
67 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance); 67 m_saydistance = config.Configs["Chat"].GetInt("say_distance", m_saydistance);
68 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance); 68 m_shoutdistance = config.Configs["Chat"].GetInt("shout_distance", m_shoutdistance);
69 } 69 }
70 catch (Exception e) 70 catch (Exception)
71 { 71 {
72 } 72 }
73 73
@@ -304,7 +304,7 @@ namespace OpenSim.Region.Environment.Modules
304 m_enabled = true; 304 m_enabled = true;
305 } 305 }
306 } 306 }
307 catch (Exception e) 307 catch (Exception)
308 { 308 {
309 Console.WriteLine("No IRC config information, skipping IRC bridge configuration"); 309 Console.WriteLine("No IRC config information, skipping IRC bridge configuration");
310 } 310 }
diff --git a/OpenSim/Region/Environment/Modules/SunModule.cs b/OpenSim/Region/Environment/Modules/SunModule.cs
index 3598798..c941b1e 100644
--- a/OpenSim/Region/Environment/Modules/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/SunModule.cs
@@ -59,7 +59,7 @@ namespace OpenSim.Region.Environment.Modules
59 try { 59 try {
60 m_day_length = config.Configs["Sun"].GetDouble("day_length", 0.5); 60 m_day_length = config.Configs["Sun"].GetDouble("day_length", 0.5);
61 m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", 100); 61 m_frame_mod = config.Configs["Sun"].GetInt("frame_rate", 100);
62 } catch (Exception e) { 62 } catch (Exception) {
63 m_day_length = 0.5; 63 m_day_length = 0.5;
64 m_frame_mod = 100; 64 m_frame_mod = 100;
65 } 65 }
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index 434c92f..1223f5c 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -153,7 +153,7 @@ namespace OpenSim.Region.Environment.Modules
153 } 153 }
154 } 154 }
155 155
156 if ((channel == null) || (channel.Equals(LLUUID.Zero))) 156 if ((channel.Equals(null)) || (channel.Equals(LLUUID.Zero)))
157 { 157 {
158 channel = LLUUID.Random(); 158 channel = LLUUID.Random();
159 RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel); 159 RPCChannelInfo rpcChanInfo = new RPCChannelInfo(localID, itemID, channel);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index 18fe785..76fe4b6 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -841,7 +841,7 @@ namespace OpenSim.Region.Environment.Scenes
841 IsPhantom = (data[i++] != 0) ? true : false; 841 IsPhantom = (data[i++] != 0) ? true : false;
842 CastsShadows = (data[i++] != 0) ? true : false; 842 CastsShadows = (data[i++] != 0) ? true : false;
843 } 843 }
844 catch (Exception e) 844 catch (Exception)
845 { 845 {
846 Console.WriteLine("Ignoring invalid Packet:"); 846 Console.WriteLine("Ignoring invalid Packet:");
847 //Silently ignore it - TODO: FIXME Quick 847 //Silently ignore it - TODO: FIXME Quick
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index b6daad6..38523e0 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -439,7 +439,6 @@ namespace OpenSim.Region.Environment.Scenes
439 /// </summary> 439 /// </summary>
440 public void StopMovement() 440 public void StopMovement()
441 { 441 {
442 int x = 0;
443 } 442 }
444 443
445 public void AddNeighbourRegion(ulong regionHandle) 444 public void AddNeighbourRegion(ulong regionHandle)
@@ -624,8 +623,6 @@ namespace OpenSim.Region.Environment.Scenes
624 { 623 {
625 pos = part.AbsolutePosition + offset; 624 pos = part.AbsolutePosition + offset;
626 625
627 double dist = AbsolutePosition.GetDistanceTo(pos);
628
629 if (m_physicsActor != null) 626 if (m_physicsActor != null)
630 { 627 {
631 m_sitAvatarHeight = m_physicsActor.Size.Z; 628 m_sitAvatarHeight = m_physicsActor.Size.Z;
@@ -633,7 +630,7 @@ namespace OpenSim.Region.Environment.Scenes
633 630
634// this doesn't seem to quite work yet.... 631// this doesn't seem to quite work yet....
635// // if we're close, set the avatar position to the target position and forgo autopilot 632// // if we're close, set the avatar position to the target position and forgo autopilot
636// if (dist < 2.5) 633// if (AbsolutePosition.GetDistanceTo(pos) < 2.5)
637// { 634// {
638// autopilot = false; 635// autopilot = false;
639// AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight); 636// AbsolutePosition = pos + new LLVector3(0.0f, 0.0f, m_sitAvatarHeight);