From b16abc8166c29585cb76cc55c3bdd76e5833cb4f Mon Sep 17 00:00:00 2001 From: Melanie Thielker Date: Thu, 5 Jan 2017 19:07:37 +0000 Subject: Massive tab and trailing space cleanup --- .../Interfaces/IAgentPreferencesService.cs | 2 +- OpenSim/Services/Interfaces/IAssetService.cs | 6 ++-- .../Services/Interfaces/IAuthenticationService.cs | 2 +- .../Services/Interfaces/IAuthorizationService.cs | 24 +++++++-------- OpenSim/Services/Interfaces/IAvatarService.cs | 8 ++--- OpenSim/Services/Interfaces/IEstateDataService.cs | 34 +++++++++++----------- OpenSim/Services/Interfaces/IGridService.cs | 14 ++++----- OpenSim/Services/Interfaces/IGridUserService.cs | 14 ++++----- OpenSim/Services/Interfaces/IHypergridServices.cs | 6 ++-- OpenSim/Services/Interfaces/IInventoryService.cs | 6 ++-- OpenSim/Services/Interfaces/IOfflineIMService.cs | 4 +-- OpenSim/Services/Interfaces/ISimulationService.cs | 2 +- .../Services/Interfaces/IUserProfilesService.cs | 8 ++--- OpenSim/Services/Interfaces/OpenProfileClient.cs | 4 +-- .../Services/Interfaces/Properties/AssemblyInfo.cs | 8 ++--- 15 files changed, 71 insertions(+), 71 deletions(-) (limited to 'OpenSim/Services/Interfaces') diff --git a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs index ae2c5ac..af92326 100644 --- a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs +++ b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs @@ -33,7 +33,7 @@ namespace OpenSim.Services.Interfaces { public class AgentPrefs { - public AgentPrefs(UUID principalID) + public AgentPrefs(UUID principalID) { PrincipalID = principalID; } diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs index 28c3315..170dc97 100644 --- a/OpenSim/Services/Interfaces/IAssetService.cs +++ b/OpenSim/Services/Interfaces/IAssetService.cs @@ -47,7 +47,7 @@ namespace OpenSim.Services.Interfaces /// /// AssetMetadata GetMetadata(string id); - + /// /// Get an asset's data, ignoring the metadata. /// @@ -63,7 +63,7 @@ namespace OpenSim.Services.Interfaces AssetBase GetCached(string id); /// - /// Get an asset synchronously or asynchronously (depending on whether + /// Get an asset synchronously or asynchronously (depending on whether /// it is locally cached) and fire a callback with the fetched asset /// /// The asset id @@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces /// /// True if the id was parseable, false otherwise bool Get(string id, Object sender, AssetRetrieved handler); - + /// /// Check if assets exist in the database. /// diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs index cdcfad9..1ff092f 100644 --- a/OpenSim/Services/Interfaces/IAuthenticationService.cs +++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs @@ -55,7 +55,7 @@ namespace OpenSim.Services.Interfaces // Generic Authentication service used for identifying // and authenticating principals. // Principals may be clients acting on users' behalf, - // or any other components that need + // or any other components that need // verifiable identification. // public interface IAuthenticationService diff --git a/OpenSim/Services/Interfaces/IAuthorizationService.cs b/OpenSim/Services/Interfaces/IAuthorizationService.cs index e5c68f6..d4c697a 100644 --- a/OpenSim/Services/Interfaces/IAuthorizationService.cs +++ b/OpenSim/Services/Interfaces/IAuthorizationService.cs @@ -31,7 +31,7 @@ using OpenSim.Framework; namespace OpenSim.Services.Interfaces { // Generic Authorization service used for authorizing principals in a particular region - + public interface IAuthorizationService { /// @@ -50,7 +50,7 @@ namespace OpenSim.Services.Interfaces bool IsAuthorizedForRegion( string userID, string firstName, string lastName, string regionID, out string message); } - + public class AuthorizationRequest { private string m_userID; @@ -69,7 +69,7 @@ namespace OpenSim.Services.Interfaces m_userID = ID; m_regionID = RegionID; } - + public AuthorizationRequest( string ID, string FirstName, string SurName, string Email, string RegionName, string RegionID) { @@ -80,44 +80,44 @@ namespace OpenSim.Services.Interfaces m_regionName = RegionName; m_regionID = RegionID; } - + public string ID { get { return m_userID; } set { m_userID = value; } } - + public string FirstName { get { return m_firstname; } set { m_firstname = value; } } - + public string SurName { get { return m_surname; } set { m_surname = value; } } - + public string Email { get { return m_email; } set { m_email = value; } } - + public string RegionName { get { return m_regionName; } set { m_regionName = value; } } - + public string RegionID { get { return m_regionID; } set { m_regionID = value; } } } - + public class AuthorizationResponse { private bool m_isAuthorized; @@ -132,13 +132,13 @@ namespace OpenSim.Services.Interfaces m_isAuthorized = isAuthorized; m_message = message; } - + public bool IsAuthorized { get { return m_isAuthorized; } set { m_isAuthorized = value; } } - + public string Message { get { return m_message; } diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs index 99b71b9..b4dc511 100644 --- a/OpenSim/Services/Interfaces/IAvatarService.cs +++ b/OpenSim/Services/Interfaces/IAvatarService.cs @@ -51,7 +51,7 @@ namespace OpenSim.Services.Interfaces /// /// bool SetAppearance(UUID userID, AvatarAppearance appearance); - + /// /// Called by the login service /// @@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces bool ResetAvatar(UUID userID); /// - /// These methods raison d'etre: + /// These methods raison d'etre: /// No need to send the entire avatar data (SetAvatar) for changing attachments /// /// @@ -291,8 +291,8 @@ namespace OpenSim.Services.Interfaces byte[] binary = new byte[vps.Length]; for (int i = 0; i < vps.Length; i++) - binary[i] = (byte)Convert.ToInt32(vps[i]); - + binary[i] = (byte)Convert.ToInt32(vps[i]); + appearance.VisualParams = binary; } diff --git a/OpenSim/Services/Interfaces/IEstateDataService.cs b/OpenSim/Services/Interfaces/IEstateDataService.cs index 719563d..9b64a39 100644 --- a/OpenSim/Services/Interfaces/IEstateDataService.cs +++ b/OpenSim/Services/Interfaces/IEstateDataService.cs @@ -39,14 +39,14 @@ namespace OpenSim.Services.Interfaces /// /// /// If true, then an estate is created if one is not found. - /// + /// EstateSettings LoadEstateSettings(UUID regionID, bool create); - + /// /// Load estate settings for an estate ID. /// /// - /// + /// EstateSettings LoadEstateSettings(int estateID); /// @@ -56,60 +56,60 @@ namespace OpenSim.Services.Interfaces /// A /// EstateSettings CreateNewEstate(); - + /// /// Load/Get all estate settings. /// /// An empty list if no estates were found. List LoadEstateSettingsAll(); - + /// /// Store estate settings. /// /// /// This is also called by EstateSettings.Save() - /// + /// void StoreEstateSettings(EstateSettings es); - + /// /// Get estate IDs. /// /// Name of estate to search for. This is the exact name, no parttern matching is done. - /// + /// List GetEstates(string search); - + /// /// Get the IDs of all estates owned by the given user. /// /// An empty list if no estates were found. - List GetEstatesByOwner(UUID ownerID); - + List GetEstatesByOwner(UUID ownerID); + /// /// Get the IDs of all estates. /// /// An empty list if no estates were found. List GetEstatesAll(); - + /// /// Link a region to an estate. /// /// /// - /// true if the link succeeded, false otherwise + /// true if the link succeeded, false otherwise bool LinkRegion(UUID regionID, int estateID); - + /// /// Get the UUIDs of all the regions in an estate. /// /// - /// + /// List GetRegions(int estateID); - + /// /// Delete an estate /// /// - /// true if the delete succeeded, false otherwise + /// true if the delete succeeded, false otherwise bool DeleteEstate(int estateID); } } \ No newline at end of file diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index 63c6e5f..66e5870 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs @@ -85,7 +85,7 @@ namespace OpenSim.Services.Interfaces GridRegion GetRegionByName(UUID scopeID, string regionName); /// - /// Get information about regions starting with the provided name. + /// Get information about regions starting with the provided name. /// /// /// The name to match against. @@ -95,7 +95,7 @@ namespace OpenSim.Services.Interfaces /// /// /// A list of s of regions with matching name. If the - /// grid-server couldn't be contacted or returned an error, return null. + /// grid-server couldn't be contacted or returned an error, return null. /// List GetRegionsByName(UUID scopeID, string name, int maxNumber); @@ -139,7 +139,7 @@ namespace OpenSim.Services.Interfaces #pragma warning restore 414 /// - /// The port by which http communication occurs with the region + /// The port by which http communication occurs with the region /// public uint HttpPort { get; set; } @@ -148,7 +148,7 @@ namespace OpenSim.Services.Interfaces /// public string ServerURI { - get { + get { if (!String.IsNullOrEmpty(m_serverURI)) { return m_serverURI; } else { @@ -158,7 +158,7 @@ namespace OpenSim.Services.Interfaces return "http://" + m_externalHostName + ":" + HttpPort + "/"; } } - set { + set { if ( value == null) { m_serverURI = String.Empty; @@ -344,7 +344,7 @@ namespace OpenSim.Services.Interfaces RegionSecret = ConvertFrom.RegionSecret; EstateOwner = ConvertFrom.EstateOwner; } - + public GridRegion(Dictionary kvp) { if (kvp.ContainsKey("uuid")) @@ -424,7 +424,7 @@ namespace OpenSim.Services.Interfaces // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>", // LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY); } - + public Dictionary ToKeyValuePairs() { Dictionary kvp = new Dictionary(); diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs index 2e7237e..6ad0f42 100644 --- a/OpenSim/Services/Interfaces/IGridUserService.cs +++ b/OpenSim/Services/Interfaces/IGridUserService.cs @@ -37,7 +37,7 @@ namespace OpenSim.Services.Interfaces public class GridUserInfo { public string UserID; - + public UUID HomeRegionID; public Vector3 HomePosition; public Vector3 HomeLookAt; @@ -45,13 +45,13 @@ namespace OpenSim.Services.Interfaces public UUID LastRegionID; public Vector3 LastPosition; public Vector3 LastLookAt; - + public bool Online; public DateTime Login; public DateTime Logout; public GridUserInfo() {} - + public GridUserInfo(Dictionary kvp) { if (kvp.ContainsKey("UserID")) @@ -96,11 +96,11 @@ namespace OpenSim.Services.Interfaces result["Online"] = Online.ToString(); result["Login"] = Login.ToString(); result["Logout"] = Logout.ToString(); - + return result; } } - + public interface IGridUserService { GridUserInfo LoggedIn(string userID); @@ -115,7 +115,7 @@ namespace OpenSim.Services.Interfaces /// Last normalized look direction for the user /// True if the logout request was successfully processed, otherwise false bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); - + bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt); /// @@ -128,7 +128,7 @@ namespace OpenSim.Services.Interfaces /// Normalized look direction /// True if the user's last position was successfully updated, otherwise false bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); - + GridUserInfo GetGridUserInfo(string userID); GridUserInfo[] GetGridUserInfo(string[] userID); } diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs index 1815e6c..e0a63ca 100644 --- a/OpenSim/Services/Interfaces/IHypergridServices.cs +++ b/OpenSim/Services/Interfaces/IHypergridServices.cs @@ -37,7 +37,7 @@ namespace OpenSim.Services.Interfaces public interface IGatekeeperService { bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason, out int sizeX, out int sizeY); - + /// /// Returns the region a Hypergrid visitor should enter. /// @@ -59,7 +59,7 @@ namespace OpenSim.Services.Interfaces public interface IUserAgentService { bool LoginAgentToGrid(GridRegion source, AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason); - + void LogoutAgent(UUID userID, UUID sessionID); /// @@ -89,7 +89,7 @@ namespace OpenSim.Services.Interfaces /// On success: the user's Server URLs. If the user doesn't exist: "". /// Throws an exception if an error occurs (e.g., can't contact the server). string LocateUser(UUID userID); - + /// /// Returns the Universal User Identifier for 'targetUserID' on behalf of 'userID'. /// diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs index c0c9ba8..582ea90 100644 --- a/OpenSim/Services/Interfaces/IInventoryService.cs +++ b/OpenSim/Services/Interfaces/IInventoryService.cs @@ -84,7 +84,7 @@ namespace OpenSim.Services.Interfaces /// /// Inventory content. InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs); - + /// /// Gets the items inside a folder /// @@ -193,11 +193,11 @@ namespace OpenSim.Services.Interfaces /// /// Get the union of permissions of all inventory items - /// that hold the given assetID. + /// that hold the given assetID. /// /// /// - /// The permissions or 0 if no such asset is found in + /// The permissions or 0 if no such asset is found in /// the user's inventory int GetAssetPermissions(UUID userID, UUID assetID); } diff --git a/OpenSim/Services/Interfaces/IOfflineIMService.cs b/OpenSim/Services/Interfaces/IOfflineIMService.cs index 588aaaf..db501fd 100644 --- a/OpenSim/Services/Interfaces/IOfflineIMService.cs +++ b/OpenSim/Services/Interfaces/IOfflineIMService.cs @@ -35,9 +35,9 @@ namespace OpenSim.Services.Interfaces public interface IOfflineIMService { List GetMessages(UUID principalID); - + bool StoreMessage(GridInstantMessage im, out string reason); - + /// /// Delete messages to or from this user (or group). /// diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index d89f6ff..a01897a 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs @@ -59,7 +59,7 @@ namespace OpenSim.Services.Interfaces /// /// /// - /// Reason message in the event of a failure. + /// Reason message in the event of a failure. bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason); /// diff --git a/OpenSim/Services/Interfaces/IUserProfilesService.cs b/OpenSim/Services/Interfaces/IUserProfilesService.cs index 121baa8..867c623 100644 --- a/OpenSim/Services/Interfaces/IUserProfilesService.cs +++ b/OpenSim/Services/Interfaces/IUserProfilesService.cs @@ -40,19 +40,19 @@ namespace OpenSim.Services.Interfaces bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result); bool ClassifiedDelete(UUID recordId); #endregion Classifieds - + #region Picks OSD AvatarPicksRequest(UUID creatorId); bool PickInfoRequest(ref UserProfilePick pick, ref string result); bool PicksUpdate(ref UserProfilePick pick, ref string result); bool PicksDelete(UUID pickId); #endregion Picks - + #region Notes bool AvatarNotesRequest(ref UserProfileNotes note); bool NotesUpdate(ref UserProfileNotes note, ref string result); #endregion Notes - + #region Profile Properties bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result); bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result); @@ -62,7 +62,7 @@ namespace OpenSim.Services.Interfaces bool UserPreferencesRequest(ref UserPreferences pref, ref string result); bool UserPreferencesUpdate(ref UserPreferences pref, ref string result); #endregion User Preferences - + #region Interests bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result); #endregion Interests diff --git a/OpenSim/Services/Interfaces/OpenProfileClient.cs b/OpenSim/Services/Interfaces/OpenProfileClient.cs index bda8151..8c4d14b 100644 --- a/OpenSim/Services/Interfaces/OpenProfileClient.cs +++ b/OpenSim/Services/Interfaces/OpenProfileClient.cs @@ -49,7 +49,7 @@ namespace OpenSim.Services.UserProfilesService public class OpenProfileClient { // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - + private string m_serverURI; /// @@ -60,7 +60,7 @@ namespace OpenSim.Services.UserProfilesService { m_serverURI = serverURI; } - + /// /// Gets an avatar's profile using the OpenProfile protocol. /// diff --git a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs index 115afa2..6c683b4 100644 --- a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs @@ -2,7 +2,7 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following +// General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OpenSim.Services.Interfaces")] @@ -14,8 +14,8 @@ using System.Runtime.InteropServices; [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from // COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] @@ -25,7 +25,7 @@ using System.Runtime.InteropServices; // Version information for an assembly consists of the following four values: // // Major Version -// Minor Version +// Minor Version // Build Number // Revision // -- cgit v1.1