From ae58cf42242433c786162b53a2724962f4a8380b Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Tue, 25 Sep 2012 20:03:49 -0700 Subject: TOS module. WARNING: migration in GridUser table. --- OpenSim/Services/Interfaces/IGridUserService.cs | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'OpenSim/Services/Interfaces') diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs index 0a52bfa..620ed3a 100644 --- a/OpenSim/Services/Interfaces/IGridUserService.cs +++ b/OpenSim/Services/Interfaces/IGridUserService.cs @@ -50,6 +50,8 @@ namespace OpenSim.Services.Interfaces public DateTime Login; public DateTime Logout; + public string TOS = string.Empty; + public GridUserInfo() {} public GridUserInfo(Dictionary kvp) @@ -78,6 +80,11 @@ namespace OpenSim.Services.Interfaces if (kvp.ContainsKey("Online")) Boolean.TryParse(kvp["Online"].ToString(), out Online); + if (kvp.ContainsKey("TOS")) + TOS = kvp["TOS"].ToString(); + else + TOS = string.Empty; + } public Dictionary ToKeyValuePairs() @@ -97,6 +104,7 @@ namespace OpenSim.Services.Interfaces result["Login"] = Login.ToString(); result["Logout"] = Logout.ToString(); + result["TOS"] = TOS; return result; } -- cgit v1.1 From 7a5070518833a29252fc638f9dd216040bcfad7a Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Thu, 27 Sep 2012 16:43:18 -0700 Subject: Removed the bits about the TOSModule. That module doesn't go into core. WARNING: migration on GridUser withdrawn too, but left the migration number there. --- OpenSim/Services/Interfaces/IGridUserService.cs | 9 --------- 1 file changed, 9 deletions(-) (limited to 'OpenSim/Services/Interfaces') diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs index 620ed3a..8b738ab 100644 --- a/OpenSim/Services/Interfaces/IGridUserService.cs +++ b/OpenSim/Services/Interfaces/IGridUserService.cs @@ -50,8 +50,6 @@ namespace OpenSim.Services.Interfaces public DateTime Login; public DateTime Logout; - public string TOS = string.Empty; - public GridUserInfo() {} public GridUserInfo(Dictionary kvp) @@ -80,11 +78,6 @@ namespace OpenSim.Services.Interfaces if (kvp.ContainsKey("Online")) Boolean.TryParse(kvp["Online"].ToString(), out Online); - if (kvp.ContainsKey("TOS")) - TOS = kvp["TOS"].ToString(); - else - TOS = string.Empty; - } public Dictionary ToKeyValuePairs() @@ -103,8 +96,6 @@ namespace OpenSim.Services.Interfaces result["Online"] = Online.ToString(); result["Login"] = Login.ToString(); result["Logout"] = Logout.ToString(); - - result["TOS"] = TOS; return result; } -- cgit v1.1 From 0b9bf236dd336c66542215bbc8f4a1eb85c646ee Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Mon, 1 Oct 2012 15:55:24 -0700 Subject: On more virtual method --- OpenSim/Services/Interfaces/IGridUserService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'OpenSim/Services/Interfaces') diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs index 8b738ab..2e7237e 100644 --- a/OpenSim/Services/Interfaces/IGridUserService.cs +++ b/OpenSim/Services/Interfaces/IGridUserService.cs @@ -80,7 +80,7 @@ namespace OpenSim.Services.Interfaces } - public Dictionary ToKeyValuePairs() + public virtual Dictionary ToKeyValuePairs() { Dictionary result = new Dictionary(); result["UserID"] = UserID; -- cgit v1.1 From ef3cc2e507a545bfcffc804015ee3ec5b8a260e0 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 9 Oct 2012 01:40:40 +0100 Subject: minor: Add documentation to IGridService.GetRegionFlags() --- OpenSim/Services/Interfaces/IGridService.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'OpenSim/Services/Interfaces') diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index d809996..d7da056 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs @@ -100,6 +100,19 @@ namespace OpenSim.Services.Interfaces List GetFallbackRegions(UUID scopeID, int x, int y); List GetHyperlinks(UUID scopeID); + /// + /// Get internal OpenSimulator region flags. + /// + /// + /// 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. + /// + /// + /// The region flags. + /// + /// + /// int GetRegionFlags(UUID scopeID, UUID regionID); } -- cgit v1.1 From ac037dfe210f416e6355bd7c1210f25d6cb90f63 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Sat, 20 Oct 2012 02:26:08 +0100 Subject: Add method doc for IPresenceService --- OpenSim/Services/Interfaces/IPresenceService.cs | 38 ++++++++++++++++++++++++- 1 file changed, 37 insertions(+), 1 deletion(-) (limited to 'OpenSim/Services/Interfaces') diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs index 8d583ff..90f9842 100644 --- a/OpenSim/Services/Interfaces/IPresenceService.cs +++ b/OpenSim/Services/Interfaces/IPresenceService.cs @@ -61,13 +61,49 @@ namespace OpenSim.Services.Interfaces public interface IPresenceService { + /// + /// Store session information. + /// + /// /returns> + /// + /// + /// bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID); + + /// + /// Remove session information. + /// + /// + /// bool LogoutAgent(UUID sessionID); + + /// + /// Remove session information for all agents in the given region. + /// + /// + /// bool LogoutRegionAgents(UUID regionID); + /// + /// Update data for an existing session. + /// + /// + /// + /// bool ReportAgent(UUID sessionID, UUID regionID); + /// + /// Get session information for a given session ID. + /// + /// + /// PresenceInfo GetAgent(UUID sessionID); + + /// + /// Get session information for a collection of users. + /// + /// Session information for the users. + /// PresenceInfo[] GetAgents(string[] userIDs); } -} +} \ No newline at end of file -- cgit v1.1 From 9bc4dc6c5f7c8d1430db31a657399d0bf794a7f7 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Tue, 30 Oct 2012 01:19:32 +0000 Subject: Add method doc to IAssetService.Get(string, object, AssetRetrieved) outlining the situations in which AssetRetrieved may be called back with a null AssetBase. These situations include asset not found and remote service not responding. --- OpenSim/Services/Interfaces/IAssetService.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'OpenSim/Services/Interfaces') diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs index 80494f1..3c469c6 100644 --- a/OpenSim/Services/Interfaces/IAssetService.cs +++ b/OpenSim/Services/Interfaces/IAssetService.cs @@ -68,7 +68,11 @@ namespace OpenSim.Services.Interfaces /// /// The asset id /// Represents the requester. Passed back via the handler - /// The handler to call back once the asset has been retrieved + /// + /// 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.). + /// /// True if the id was parseable, false otherwise bool Get(string id, Object sender, AssetRetrieved handler); -- cgit v1.1 From df62d113abf5d9264caca7f2e554d061c260e522 Mon Sep 17 00:00:00 2001 From: Diva Canto Date: Wed, 14 Nov 2012 21:18:18 -0800 Subject: The last few AssemblyInfos. Finished! --- .../Services/Interfaces/Properties/AssemblyInfo.cs | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs (limited to 'OpenSim/Services/Interfaces') diff --git a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..4723553 --- /dev/null +++ b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// 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")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("http://opensimulator.org")] +[assembly: AssemblyProduct("OpenSim")] +[assembly: AssemblyCopyright("OpenSimulator developers")] +[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 +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("39091de1-1c4c-4ebe-bb01-31551ec1749d")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("0.7.5.*")] +[assembly: AssemblyFileVersion("1.0.0.0")] -- cgit v1.1