aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorAdam Frisby2007-12-18 08:41:23 +0000
committerAdam Frisby2007-12-18 08:41:23 +0000
commit7948033565a106395eb10ae3e169c9c4fa6cbdba (patch)
treee56441fb7d8544932fd3b1763f636852b1e868ae /OpenSim/Region
parent* Renamed AgentWearable to AvatarWearable (diff)
downloadopensim-SC_OLD-7948033565a106395eb10ae3e169c9c4fa6cbdba.zip
opensim-SC_OLD-7948033565a106395eb10ae3e169c9c4fa6cbdba.tar.gz
opensim-SC_OLD-7948033565a106395eb10ae3e169c9c4fa6cbdba.tar.bz2
opensim-SC_OLD-7948033565a106395eb10ae3e169c9c4fa6cbdba.tar.xz
* Removed redundant code in RestService.cs
* Removed unchecked TryParse, replaced with Parse as we were not checking for success and could lead to weirdness if an exception is ignored. * Removed unused variable m_newAvatar * Removed several unused try{}catch(Exception e){}'s. * Added null assignment in simpleapp to prevent warning.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs2
-rw-r--r--OpenSim/Region/Environment/Modules/XMLRPCModule.cs4
-rw-r--r--OpenSim/Region/Environment/Scenes/ScenePresence.cs3
-rw-r--r--OpenSim/Region/Examples/SimpleApp/Program.cs2
4 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
index dc4ef35..d47004b 100644
--- a/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
+++ b/OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Region.Environment.Modules
342 { 342 {
343 httpThread.Abort(); 343 httpThread.Abort();
344 } 344 }
345 catch (Exception e) { } 345 catch (Exception) { }
346 } 346 }
347 } 347 }
348 348
diff --git a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
index f139d64..f13b2bb 100644
--- a/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/XMLRPCModule.cs
@@ -100,11 +100,9 @@ namespace OpenSim.Region.Environment.Modules
100 { 100 {
101 try 101 try
102 { 102 {
103
104 m_remoteDataPort = config.Configs["Network"].GetInt("remoteDataPort", m_remoteDataPort); 103 m_remoteDataPort = config.Configs["Network"].GetInt("remoteDataPort", m_remoteDataPort);
105
106 } 104 }
107 catch (Exception e) 105 catch (Exception)
108 { 106 {
109 } 107 }
110 108
diff --git a/OpenSim/Region/Environment/Scenes/ScenePresence.cs b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
index bf47277..86ff65e 100644
--- a/OpenSim/Region/Environment/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Environment/Scenes/ScenePresence.cs
@@ -63,7 +63,6 @@ namespace OpenSim.Region.Environment.Scenes
63 63
64 // Agent moves with a PID controller causing a force to be exerted. 64 // Agent moves with a PID controller causing a force to be exerted.
65 private bool m_newForce = false; 65 private bool m_newForce = false;
66 private bool m_newAvatar = false;
67 private bool m_newCoarseLocations = true; 66 private bool m_newCoarseLocations = true;
68 private bool m_gotAllObjectsInScene = false; 67 private bool m_gotAllObjectsInScene = false;
69 68
@@ -457,7 +456,6 @@ namespace OpenSim.Region.Environment.Scenes
457 /// </summary> 456 /// </summary>
458 public void MakeRootAgent(LLVector3 pos, bool isFlying) 457 public void MakeRootAgent(LLVector3 pos, bool isFlying)
459 { 458 {
460 m_newAvatar = true;
461 m_isChildAgent = false; 459 m_isChildAgent = false;
462 460
463 AbsolutePosition = pos; 461 AbsolutePosition = pos;
@@ -1104,7 +1102,6 @@ namespace OpenSim.Region.Environment.Scenes
1104 if (!m_isChildAgent) 1102 if (!m_isChildAgent)
1105 { 1103 {
1106 m_scene.InformClientOfNeighbours(this); 1104 m_scene.InformClientOfNeighbours(this);
1107 m_newAvatar = false;
1108 } 1105 }
1109 1106
1110 SendFullUpdateToAllClients(); 1107 SendFullUpdateToAllClients();
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs
index a86946e..02108d0 100644
--- a/OpenSim/Region/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Region/Examples/SimpleApp/Program.cs
@@ -46,7 +46,7 @@ namespace SimpleApp
46 internal class Program : RegionApplicationBase, conscmd_callback 46 internal class Program : RegionApplicationBase, conscmd_callback
47 { 47 {
48 private ModuleLoader m_moduleLoader; 48 private ModuleLoader m_moduleLoader;
49 private IConfigSource m_config; 49 private IConfigSource m_config = null;
50 50
51 private string m_userPlugin = "OpenSim.Framework.Data.SQLite.dll"; 51 private string m_userPlugin = "OpenSim.Framework.Data.SQLite.dll";
52 private string m_inventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; 52 private string m_inventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";