OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* 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.
afrisby
Adam Frisby 2007-12-18 08:41:23 +00:00
parent 03635aa336
commit 7948033565
5 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenSim/Grid/AssetServer/RestService.cs
View File

@ -54,14 +54,7 @@ namespace OpenSim.Grid.AssetServer
if (p.Length > 0) if (p.Length > 0)
{ {
LLUUID assetID; LLUUID assetID = LLUUID.Parse(p[0]);
bool isTexture = false;
LLUUID.TryParse(p[0], out assetID);
if (p.Length > 1)
{
if (string.Compare(p[1], "texture", true) == 0)
isTexture = true;
}
MainLog.Instance.Verbose("REST", "GET:/asset fetch param={0} UUID={1}", param, assetID); MainLog.Instance.Verbose("REST", "GET:/asset fetch param={0} UUID={1}", param, assetID);
AssetBase asset = m_assetProvider.FetchAsset(assetID); AssetBase asset = m_assetProvider.FetchAsset(assetID);

2
OpenSim/Region/Environment/Modules/ScriptsHttpRequests.cs
View File

@ -342,7 +342,7 @@ namespace OpenSim.Region.Environment.Modules
{ {
httpThread.Abort(); httpThread.Abort();
} }
catch (Exception e) { } catch (Exception) { }
} }
} }

4
OpenSim/Region/Environment/Modules/XMLRPCModule.cs
View File

@ -100,11 +100,9 @@ namespace OpenSim.Region.Environment.Modules
{ {
try try
{ {
m_remoteDataPort = config.Configs["Network"].GetInt("remoteDataPort", m_remoteDataPort); m_remoteDataPort = config.Configs["Network"].GetInt("remoteDataPort", m_remoteDataPort);
} }
catch (Exception e) catch (Exception)
{ {
} }

3
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -63,7 +63,6 @@ namespace OpenSim.Region.Environment.Scenes
// Agent moves with a PID controller causing a force to be exerted. // Agent moves with a PID controller causing a force to be exerted.
private bool m_newForce = false; private bool m_newForce = false;
private bool m_newAvatar = false;
private bool m_newCoarseLocations = true; private bool m_newCoarseLocations = true;
private bool m_gotAllObjectsInScene = false; private bool m_gotAllObjectsInScene = false;
@ -457,7 +456,6 @@ namespace OpenSim.Region.Environment.Scenes
/// </summary> /// </summary>
public void MakeRootAgent(LLVector3 pos, bool isFlying) public void MakeRootAgent(LLVector3 pos, bool isFlying)
{ {
m_newAvatar = true;
m_isChildAgent = false; m_isChildAgent = false;
AbsolutePosition = pos; AbsolutePosition = pos;
@ -1104,7 +1102,6 @@ namespace OpenSim.Region.Environment.Scenes
if (!m_isChildAgent) if (!m_isChildAgent)
{ {
m_scene.InformClientOfNeighbours(this); m_scene.InformClientOfNeighbours(this);
m_newAvatar = false;
} }
SendFullUpdateToAllClients(); SendFullUpdateToAllClients();

2
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -46,7 +46,7 @@ namespace SimpleApp
internal class Program : RegionApplicationBase, conscmd_callback internal class Program : RegionApplicationBase, conscmd_callback
{ {
private ModuleLoader m_moduleLoader; private ModuleLoader m_moduleLoader;
private IConfigSource m_config; private IConfigSource m_config = null;
private string m_userPlugin = "OpenSim.Framework.Data.SQLite.dll"; private string m_userPlugin = "OpenSim.Framework.Data.SQLite.dll";
private string m_inventoryPlugin = "OpenSim.Framework.Data.SQLite.dll"; private string m_inventoryPlugin = "OpenSim.Framework.Data.SQLite.dll";