Merge branch 'master' into careminster

OpenSim/Framework/Serialization/External/LandDataSerializer.cs

@@ -42,7 +42,7 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class LandDataSerializer
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         protected static UTF8Encoding m_utf8Encoding = new UTF8Encoding();
 

OpenSim/Framework/Serialization/External/UserInventoryItemSerializer.cs

@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Serialization.External
     /// </summary>
     public class UserInventoryItemSerializer
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private static Dictionary<string, Action<InventoryItemBase, XmlTextReader>> m_InventoryItemXmlProcessors
             = new Dictionary<string, Action<InventoryItemBase, XmlTextReader>>();

OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs

@@ -354,24 +354,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-        public bool CreateObject(GridRegion destination, UUID userID, UUID itemID)
-        {
-            if (destination == null)
-                return false;
-
-            if (m_scenes.ContainsKey(destination.RegionID))
-            {
-//                    m_log.DebugFormat(
-//                        "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
-//                        s.RegionInfo.RegionName, destination.RegionHandle);
-
-                return m_scenes[destination.RegionID].IncomingCreateObject(userID, itemID);
-            }
-
-            return false;
-        }
-
-
         #endregion /* IInterregionComms */
 
         #region Misc

OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs

@@ -315,13 +315,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
             return false;
         }
 
-        public bool CreateObject(GridRegion destination, UUID userID, UUID itemID)
-        {
-            // Not Implemented
-            return false;
-        }
-
         #endregion /* IInterregionComms */
-
     }
-}
+}

OpenSim/Region/Framework/Scenes/Scene.cs

@@ -2596,22 +2596,6 @@ namespace OpenSim.Region.Framework.Scenes
                 newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
                 newObject.ResumeScripts();
             }
-            else
-            {
-                ScenePresence sp;
-                if (TryGetScenePresence(newObject.OwnerID, out sp))
-                {
-                    // If the scene presence is here and already a root
-                    // agent, we came from a ;egacy region. Start the scripts
-                    // here as they used to start.
-                    // TODO: Remove in 0.7.3
-                    if (!sp.IsChildAgent)
-                    {
-                        newObject.RootPart.ParentGroup.CreateScriptInstances(0, false, DefaultScriptEngine, GetStateSource(newObject));
-                        newObject.ResumeScripts();
-                    }
-                }
-            }
 
             // Do this as late as possible so that listeners have full access to the incoming object
             EventManager.TriggerOnIncomingSceneObject(newObject);
@@ -2619,28 +2603,6 @@ namespace OpenSim.Region.Framework.Scenes
             return true;
         }
 
-        /// <summary>
-        /// Attachment rezzing
-        /// </summary>
-        /// <param name="userID">Agent Unique ID</param>
-        /// <param name="itemID">Object ID</param>
-        /// <returns>False</returns>
-        public virtual bool IncomingCreateObject(UUID userID, UUID itemID)
-        {
-            m_log.DebugFormat(" >>> IncomingCreateObject(userID, itemID) <<< {0} {1}", userID, itemID);
-
-            // Commented out since this is as yet unused and is arguably not the appropriate place to do this, as
-            // attachments are being rezzed elsewhere in AddNewClient()
-//            ScenePresence sp = GetScenePresence(userID);
-//            if (sp != null && AttachmentsModule != null)
-//            {
-//                uint attPt = (uint)sp.Appearance.GetAttachpoint(itemID);
-//                AttachmentsModule.RezSingleAttachmentFromInventory(sp.ControllingClient, itemID, attPt);
-//            }
-
-            return false;
-        }
-
         /// <summary>
         /// Adds a Scene Object group to the Scene.
         /// Verifies that the creator of the object is not banned from the simulator.

OpenSim/Region/Physics/BasicPhysicsPlugin/BasicPhysicsPrim.cs

@@ -37,7 +37,7 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
     public class BasicPhysicsPrim : PhysicsActor
     {
         private Vector3 _size;
-        private PrimitiveBaseShape _shape;
+//        private PrimitiveBaseShape _shape;
 
         public BasicPhysicsPrim(
             string name, uint localId, Vector3 position, Vector3 size, Quaternion orientation, PrimitiveBaseShape shape)
@@ -136,7 +136,8 @@ namespace OpenSim.Region.Physics.BasicPhysicsPlugin
 
         public override PrimitiveBaseShape Shape
         {
-            set { _shape = value; }
+//            set { _shape = value; }
+            set {}
         }
 
         public override float Mass

OpenSim/Server/Base/HttpServerBase.cs

@@ -40,9 +40,7 @@ namespace OpenSim.Server.Base
 {
     public class HttpServerBase : ServicesServerBase
     {
-        // Logger
+//        private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-        //
-        private static readonly ILog m_Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         private uint m_consolePort;
 

OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs

@@ -93,11 +93,6 @@ namespace OpenSim.Server.Handlers.Simulation
                     DoObjectPost(request, responsedata, regionID);
                     return responsedata;
                 }
-                else if (method.Equals("PUT"))
-                {
-                    DoObjectPut(request, responsedata, regionID);
-                    return responsedata;
-                }
                 //else if (method.Equals("DELETE"))
                 //{
                 //    DoObjectDelete(request, responsedata, agentID, action, regionHandle);
@@ -219,48 +214,5 @@ namespace OpenSim.Server.Handlers.Simulation
         {
             return m_SimulationService.CreateObject(destination, newPosition, sog, false);
         }
-
-        protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, UUID regionID)
-        {
-            OSDMap args = Utils.GetOSDMap((string)request["body"]);
-            if (args == null)
-            {
-                responsedata["int_response_code"] = 400;
-                responsedata["str_response_string"] = "false";
-                return;
-            }
-
-            // retrieve the input arguments
-            int x = 0, y = 0;
-            UUID uuid = UUID.Zero;
-            string regionname = string.Empty;
-            if (args.ContainsKey("destination_x") && args["destination_x"] != null)
-                Int32.TryParse(args["destination_x"].AsString(), out x);
-            if (args.ContainsKey("destination_y") && args["destination_y"] != null)
-                Int32.TryParse(args["destination_y"].AsString(), out y);
-            if (args.ContainsKey("destination_uuid") && args["destination_uuid"] != null)
-                UUID.TryParse(args["destination_uuid"].AsString(), out uuid);
-            if (args.ContainsKey("destination_name") && args["destination_name"] != null)
-                regionname = args["destination_name"].ToString();
-
-            GridRegion destination = new GridRegion();
-            destination.RegionID = uuid;
-            destination.RegionLocX = x;
-            destination.RegionLocY = y;
-            destination.RegionName = regionname;
-
-            UUID userID = UUID.Zero, itemID = UUID.Zero;
-            if (args.ContainsKey("userid") && args["userid"] != null)
-                userID = args["userid"].AsUUID();
-            if (args.ContainsKey("itemid") && args["itemid"] != null)
-                itemID = args["itemid"].AsUUID();
-
-            // This is the meaning of PUT object
-            bool result = m_SimulationService.CreateObject(destination, userID, itemID);
-
-            responsedata["int_response_code"] = 200;
-            responsedata["str_response_string"] = result.ToString();
-        }
-
     }
 }

OpenSim/Services/HypergridService/GatekeeperService.cs

@@ -370,8 +370,6 @@ namespace OpenSim.Services.HypergridService
                     return false;
                 }
             }
-
-            return false;
         }
 
         // Check that the service token was generated for *this* grid.

OpenSim/Services/HypergridService/HGFriendsService.cs

@@ -276,19 +276,19 @@ namespace OpenSim.Services.HypergridService
                 }
             }
 
-            // Lastly, let's notify the rest who may be online somewhere else
+//            // Lastly, let's notify the rest who may be online somewhere else
-            foreach (string user in usersToBeNotified)
+//            foreach (string user in usersToBeNotified)
-            {
+//            {
-                UUID id = new UUID(user);
+//                UUID id = new UUID(user);
-                //m_UserAgentService.LocateUser(id);
+//                //m_UserAgentService.LocateUser(id);
-                //etc...
+//                //etc...
-                //if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName)
+//                //if (m_TravelingAgents.ContainsKey(id) && m_TravelingAgents[id].GridExternalName != m_GridName)
-                //{
+//                //{
-                //    string url = m_TravelingAgents[id].GridExternalName;
+//                //    string url = m_TravelingAgents[id].GridExternalName;
-                //    // forward
+//                //    // forward
-                //}
+//                //}
-                //m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user);
+//                //m_log.WarnFormat("[HGFRIENDS SERVICE]: User {0} is visiting another grid. HG Status notifications still not implemented.", user);
-            }
+//            }
 
             // and finally, let's send the online friends
             if (online)

OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs

@@ -57,7 +57,7 @@ namespace OpenSim.Services.HypergridService
         private string m_HomeURL;
         private IUserAccountService m_UserAccountService;
 
-        private UserAccountCache m_Cache;
+//        private UserAccountCache m_Cache;
 
         private ExpiringCache<UUID, List<XInventoryFolder>> m_SuitcaseTrees = new ExpiringCache<UUID, List<XInventoryFolder>>();
 
@@ -92,7 +92,7 @@ namespace OpenSim.Services.HypergridService
                 // Preferred
                 m_HomeURL = invConfig.GetString("HomeURI", m_HomeURL);
 
-                m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
+//                m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
             }
 
             m_log.Debug("[HG SUITCASE INVENTORY SERVICE]: Starting...");

OpenSim/Services/Interfaces/ISimulationService.cs

@@ -118,16 +118,6 @@ namespace OpenSim.Services.Interfaces
         /// <returns></returns>
         bool CreateObject(GridRegion destination, Vector3 newPosition, ISceneObject sog, bool isLocalCall);
 
-        /// <summary>
-        /// Create an object from the user's inventory in the destination region. 
-        /// This message is used primarily by clients.
-        /// </summary>
-        /// <param name="regionHandle"></param>
-        /// <param name="userID"></param>
-        /// <param name="itemID"></param>
-        /// <returns></returns>
-        bool CreateObject(GridRegion destination, UUID userID, UUID itemID);
-
         #endregion Objects
 
     }