Merge branch 'master' of /home/opensim/var/repo/opensim

OpenSim/Framework/Servers/BaseOpenSimServer.cs

@@ -43,7 +43,6 @@ using OpenSim.Framework.Console;
 using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using OpenSim.Framework.Servers.HttpServer;
-using OpenSim.Framework.Monitoring;
 using Timer=System.Timers.Timer;
 
 using OpenMetaverse;

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs

@@ -3242,8 +3242,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                     ((LSL_Api)m_LSL_Api).llSay(0, string.Format("Unable to attach, item '{0}' is not an object.", itemName));
 
                 throw new Exception(String.Format("The inventory item '{0}' is not an object", itemName));
-
-                return;
             }
 
             ScenePresence sp = World.GetScenePresence(avatarId);