Revert "Merge master into teravuswork", it should have been avination, not master.

This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.

4 files changed, 4 insertions, 56 deletions

diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs
index 3c469c6..80494f1 100644
--- a/OpenSim/Services/Interfaces/IAssetService.cs
+++ b/OpenSim/Services/Interfaces/IAssetService.cs
@@ -68,11 +68,7 @@ namespace OpenSim.Services.Interfaces
         /// </summary>
         /// <param name="id">The asset id</param>
         /// <param name="sender">Represents the requester.  Passed back via the handler</param>
-        /// <param name="handler">
-        /// The handler to call back once the asset has been retrieved.  This will be called back with a null AssetBase
-        /// if the asset could not be found for some reason (e.g. if it does not exist, if a remote asset service
-        /// was not contactable, if it is not in the database, etc.).
-        /// </param>
+        /// <param name="handler">The handler to call back once the asset has been retrieved</param>
         /// <returns>True if the id was parseable, false otherwise</returns>
         bool Get(string id, Object sender, AssetRetrieved handler);
 
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs
index 3f4c958..cdcb961 100644
--- a/OpenSim/Services/Interfaces/IGridService.cs
+++ b/OpenSim/Services/Interfaces/IGridService.cs
@@ -100,19 +100,6 @@ namespace OpenSim.Services.Interfaces
         List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y);
         List<GridRegion> GetHyperlinks(UUID scopeID);
 
-        /// <summary>
-        /// Get internal OpenSimulator region flags.
-        /// </summary>
-        /// <remarks>
-        /// See OpenSimulator.Framework.RegionFlags.  These are not returned in the GridRegion structure -
-        /// they currently need to be requested separately.  Possibly this should change to avoid multiple service calls
-        /// in some situations.
-        /// </remarks>
-        /// <returns>
-        /// The region flags.
-        /// </returns>
-        /// <param name='scopeID'></param>
-        /// <param name='regionID'></param>
         int GetRegionFlags(UUID scopeID, UUID regionID);
     }
 
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 2e7237e..0a52bfa 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Interfaces
 
         }
 
-        public virtual Dictionary<string, object> ToKeyValuePairs()
+        public Dictionary<string, object> ToKeyValuePairs()
         {
             Dictionary<string, object> result = new Dictionary<string, object>();
             result["UserID"] = UserID;
@@ -96,6 +96,7 @@ namespace OpenSim.Services.Interfaces
             result["Online"] = Online.ToString();
             result["Login"] = Login.ToString();
             result["Logout"] = Logout.ToString();
+
             
             return result;
         }
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs
index 90f9842..8d583ff 100644
--- a/OpenSim/Services/Interfaces/IPresenceService.cs
+++ b/OpenSim/Services/Interfaces/IPresenceService.cs
@@ -61,49 +61,13 @@ namespace OpenSim.Services.Interfaces
 
     public interface IPresenceService
     {
-        /// <summary>
-        /// Store session information.
-        /// </summary>
-        /// <returns>/returns>
-        /// <param name='userID'></param>
-        /// <param name='sessionID'></param>
-        /// <param name='secureSessionID'></param>
         bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID);
-
-        /// <summary>
-        /// Remove session information.
-        /// </summary>
-        /// <returns></returns>
-        /// <param name='sessionID'></param>
         bool LogoutAgent(UUID sessionID);
-
-        /// <summary>
-        /// Remove session information for all agents in the given region.
-        /// </summary>
-        /// <returns></returns>
-        /// <param name='regionID'></param>
         bool LogoutRegionAgents(UUID regionID);
 
-        /// <summary>
-        /// Update data for an existing session.
-        /// </summary>
-        /// <returns></returns>
-        /// <param name='sessionID'></param>
-        /// <param name='regionID'></param>
         bool ReportAgent(UUID sessionID, UUID regionID);
 
-        /// <summary>
-        /// Get session information for a given session ID.
-        /// </summary>
-        /// <returns></returns>
-        /// <param name='sessionID'></param>
         PresenceInfo GetAgent(UUID sessionID);
-
-        /// <summary>
-        /// Get session information for a collection of users.
-        /// </summary>
-        /// <returns>Session information for the users.</returns>
-        /// <param name='userIDs'></param>
         PresenceInfo[] GetAgents(string[] userIDs);
     }
-}
\ No newline at end of file
+}