diff options
author | Justin Clark-Casey (justincc) | 2012-07-27 20:40:25 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2012-07-27 20:40:25 +0100 |
commit | 1133f81dce840e394763a4eea03067fa8d18f0e1 (patch) | |
tree | 20b61b688e46440e331ead3150a25cb2a401c8aa | |
parent | Update libopenmetaverse to commit 6212cbd (Wed Jul 25 20:11:47 2012) (diff) | |
download | opensim-SC_OLD-1133f81dce840e394763a4eea03067fa8d18f0e1.zip opensim-SC_OLD-1133f81dce840e394763a4eea03067fa8d18f0e1.tar.gz opensim-SC_OLD-1133f81dce840e394763a4eea03067fa8d18f0e1.tar.bz2 opensim-SC_OLD-1133f81dce840e394763a4eea03067fa8d18f0e1.tar.xz |
Remove a couple of compiler warnings pointed out by SignpostMarv
-rw-r--r-- | OpenSim/Framework/Servers/BaseOpenSimServer.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs index 2a8ae38..7a5c16d 100644 --- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs +++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs | |||
@@ -43,7 +43,6 @@ using OpenSim.Framework.Console; | |||
43 | using OpenSim.Framework.Monitoring; | 43 | using OpenSim.Framework.Monitoring; |
44 | using OpenSim.Framework.Servers; | 44 | using OpenSim.Framework.Servers; |
45 | using OpenSim.Framework.Servers.HttpServer; | 45 | using OpenSim.Framework.Servers.HttpServer; |
46 | using OpenSim.Framework.Monitoring; | ||
47 | using Timer=System.Timers.Timer; | 46 | using Timer=System.Timers.Timer; |
48 | 47 | ||
49 | using OpenMetaverse; | 48 | using OpenMetaverse; |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index e0b4db6..faad75d 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -3242,8 +3242,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
3242 | ((LSL_Api)m_LSL_Api).llSay(0, string.Format("Unable to attach, item '{0}' is not an object.", itemName)); | 3242 | ((LSL_Api)m_LSL_Api).llSay(0, string.Format("Unable to attach, item '{0}' is not an object.", itemName)); |
3243 | 3243 | ||
3244 | throw new Exception(String.Format("The inventory item '{0}' is not an object", itemName)); | 3244 | throw new Exception(String.Format("The inventory item '{0}' is not an object", itemName)); |
3245 | |||
3246 | return; | ||
3247 | } | 3245 | } |
3248 | 3246 | ||
3249 | ScenePresence sp = World.GetScenePresence(avatarId); | 3247 | ScenePresence sp = World.GetScenePresence(avatarId); |