aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
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/Grid
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/Grid')
-rw-r--r--OpenSim/Grid/AssetServer/RestService.cs9
1 files changed, 1 insertions, 8 deletions
diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs
index 29def9e..1f44686 100644
--- a/OpenSim/Grid/AssetServer/RestService.cs
+++ b/OpenSim/Grid/AssetServer/RestService.cs
@@ -54,14 +54,7 @@ namespace OpenSim.Grid.AssetServer
54 54
55 if (p.Length > 0) 55 if (p.Length > 0)
56 { 56 {
57 LLUUID assetID; 57 LLUUID assetID = LLUUID.Parse(p[0]);
58 bool isTexture = false;
59 LLUUID.TryParse(p[0], out assetID);
60 if (p.Length > 1)
61 {
62 if (string.Compare(p[1], "texture", true) == 0)
63 isTexture = true;
64 }
65 58
66 MainLog.Instance.Verbose("REST", "GET:/asset fetch param={0} UUID={1}", param, assetID); 59 MainLog.Instance.Verbose("REST", "GET:/asset fetch param={0} UUID={1}", param, assetID);
67 AssetBase asset = m_assetProvider.FetchAsset(assetID); 60 AssetBase asset = m_assetProvider.FetchAsset(assetID);