diff options
author | onefang | 2019-09-11 16:36:50 +1000 |
---|---|---|
committer | onefang | 2019-09-11 16:36:50 +1000 |
commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Services/Interfaces | |
parent | Renamed branch to SledjChisl. (diff) | |
parent | Bump to release flavour, build 0. (diff) | |
download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Services/Interfaces')
22 files changed, 210 insertions, 168 deletions
diff --git a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs index 3b4fda2..af92326 100644 --- a/OpenSim/Services/Interfaces/IAgentPreferencesService.cs +++ b/OpenSim/Services/Interfaces/IAgentPreferencesService.cs | |||
@@ -33,7 +33,7 @@ namespace OpenSim.Services.Interfaces | |||
33 | { | 33 | { |
34 | public class AgentPrefs | 34 | public class AgentPrefs |
35 | { | 35 | { |
36 | public AgentPrefs(UUID principalID) | 36 | public AgentPrefs(UUID principalID) |
37 | { | 37 | { |
38 | PrincipalID = principalID; | 38 | PrincipalID = principalID; |
39 | } | 39 | } |
@@ -101,7 +101,7 @@ namespace OpenSim.Services.Interfaces | |||
101 | // DefaultObjectPermMasks | 101 | // DefaultObjectPermMasks |
102 | public int PermEveryone = 0; | 102 | public int PermEveryone = 0; |
103 | public int PermGroup = 0; | 103 | public int PermGroup = 0; |
104 | public int PermNextOwner = 532480; | 104 | public int PermNextOwner = 0; // Illegal value by design |
105 | } | 105 | } |
106 | 106 | ||
107 | public interface IAgentPreferencesService | 107 | public interface IAgentPreferencesService |
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 | |||
47 | /// <param name="id"></param> | 47 | /// <param name="id"></param> |
48 | /// <returns></returns> | 48 | /// <returns></returns> |
49 | AssetMetadata GetMetadata(string id); | 49 | AssetMetadata GetMetadata(string id); |
50 | 50 | ||
51 | /// <summary> | 51 | /// <summary> |
52 | /// Get an asset's data, ignoring the metadata. | 52 | /// Get an asset's data, ignoring the metadata. |
53 | /// </summary> | 53 | /// </summary> |
@@ -63,7 +63,7 @@ namespace OpenSim.Services.Interfaces | |||
63 | AssetBase GetCached(string id); | 63 | AssetBase GetCached(string id); |
64 | 64 | ||
65 | /// <summary> | 65 | /// <summary> |
66 | /// Get an asset synchronously or asynchronously (depending on whether | 66 | /// Get an asset synchronously or asynchronously (depending on whether |
67 | /// it is locally cached) and fire a callback with the fetched asset | 67 | /// it is locally cached) and fire a callback with the fetched asset |
68 | /// </summary> | 68 | /// </summary> |
69 | /// <param name="id">The asset id</param> | 69 | /// <param name="id">The asset id</param> |
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces | |||
75 | /// </param> | 75 | /// </param> |
76 | /// <returns>True if the id was parseable, false otherwise</returns> | 76 | /// <returns>True if the id was parseable, false otherwise</returns> |
77 | bool Get(string id, Object sender, AssetRetrieved handler); | 77 | bool Get(string id, Object sender, AssetRetrieved handler); |
78 | 78 | ||
79 | /// <summary> | 79 | /// <summary> |
80 | /// Check if assets exist in the database. | 80 | /// Check if assets exist in the database. |
81 | /// </summary> | 81 | /// </summary> |
diff --git a/OpenSim/Services/Interfaces/IAttachmentsService.cs b/OpenSim/Services/Interfaces/IAttachmentsService.cs new file mode 100644 index 0000000..7d33662 --- /dev/null +++ b/OpenSim/Services/Interfaces/IAttachmentsService.cs | |||
@@ -0,0 +1,38 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using Nini.Config; | ||
30 | |||
31 | namespace OpenSim.Services.Interfaces | ||
32 | { | ||
33 | public interface IAttachmentsService | ||
34 | { | ||
35 | string Get(string id); | ||
36 | void Store(string id, string data); | ||
37 | } | ||
38 | } | ||
diff --git a/OpenSim/Services/Interfaces/IAuthenticationService.cs b/OpenSim/Services/Interfaces/IAuthenticationService.cs index cee8bc0..1ff092f 100644 --- a/OpenSim/Services/Interfaces/IAuthenticationService.cs +++ b/OpenSim/Services/Interfaces/IAuthenticationService.cs | |||
@@ -55,7 +55,7 @@ namespace OpenSim.Services.Interfaces | |||
55 | // Generic Authentication service used for identifying | 55 | // Generic Authentication service used for identifying |
56 | // and authenticating principals. | 56 | // and authenticating principals. |
57 | // Principals may be clients acting on users' behalf, | 57 | // Principals may be clients acting on users' behalf, |
58 | // or any other components that need | 58 | // or any other components that need |
59 | // verifiable identification. | 59 | // verifiable identification. |
60 | // | 60 | // |
61 | public interface IAuthenticationService | 61 | public interface IAuthenticationService |
@@ -67,6 +67,7 @@ namespace OpenSim.Services.Interfaces | |||
67 | // various services. | 67 | // various services. |
68 | // | 68 | // |
69 | string Authenticate(UUID principalID, string password, int lifetime); | 69 | string Authenticate(UUID principalID, string password, int lifetime); |
70 | string Authenticate(UUID principalID, string password, int lifetime, out UUID realID); | ||
70 | 71 | ||
71 | ////////////////////////////////////////////////////// | 72 | ////////////////////////////////////////////////////// |
72 | // Verification | 73 | // Verification |
diff --git a/OpenSim/Services/Interfaces/IAuthorizationService.cs b/OpenSim/Services/Interfaces/IAuthorizationService.cs index e5c68f6..1974234 100644 --- a/OpenSim/Services/Interfaces/IAuthorizationService.cs +++ b/OpenSim/Services/Interfaces/IAuthorizationService.cs | |||
@@ -31,7 +31,7 @@ using OpenSim.Framework; | |||
31 | namespace OpenSim.Services.Interfaces | 31 | namespace OpenSim.Services.Interfaces |
32 | { | 32 | { |
33 | // Generic Authorization service used for authorizing principals in a particular region | 33 | // Generic Authorization service used for authorizing principals in a particular region |
34 | 34 | ||
35 | public interface IAuthorizationService | 35 | public interface IAuthorizationService |
36 | { | 36 | { |
37 | /// <summary> | 37 | /// <summary> |
@@ -48,9 +48,9 @@ namespace OpenSim.Services.Interfaces | |||
48 | /// <param name="message"></param> | 48 | /// <param name="message"></param> |
49 | /// <returns></returns> | 49 | /// <returns></returns> |
50 | bool IsAuthorizedForRegion( | 50 | bool IsAuthorizedForRegion( |
51 | string userID, string firstName, string lastName, string regionID, out string message); | 51 | string userID, string firstName, string lastName, string regionID, out string message, out bool isLocal); |
52 | } | 52 | } |
53 | 53 | ||
54 | public class AuthorizationRequest | 54 | public class AuthorizationRequest |
55 | { | 55 | { |
56 | private string m_userID; | 56 | private string m_userID; |
@@ -69,7 +69,7 @@ namespace OpenSim.Services.Interfaces | |||
69 | m_userID = ID; | 69 | m_userID = ID; |
70 | m_regionID = RegionID; | 70 | m_regionID = RegionID; |
71 | } | 71 | } |
72 | 72 | ||
73 | public AuthorizationRequest( | 73 | public AuthorizationRequest( |
74 | string ID, string FirstName, string SurName, string Email, string RegionName, string RegionID) | 74 | string ID, string FirstName, string SurName, string Email, string RegionName, string RegionID) |
75 | { | 75 | { |
@@ -80,44 +80,44 @@ namespace OpenSim.Services.Interfaces | |||
80 | m_regionName = RegionName; | 80 | m_regionName = RegionName; |
81 | m_regionID = RegionID; | 81 | m_regionID = RegionID; |
82 | } | 82 | } |
83 | 83 | ||
84 | public string ID | 84 | public string ID |
85 | { | 85 | { |
86 | get { return m_userID; } | 86 | get { return m_userID; } |
87 | set { m_userID = value; } | 87 | set { m_userID = value; } |
88 | } | 88 | } |
89 | 89 | ||
90 | public string FirstName | 90 | public string FirstName |
91 | { | 91 | { |
92 | get { return m_firstname; } | 92 | get { return m_firstname; } |
93 | set { m_firstname = value; } | 93 | set { m_firstname = value; } |
94 | } | 94 | } |
95 | 95 | ||
96 | public string SurName | 96 | public string SurName |
97 | { | 97 | { |
98 | get { return m_surname; } | 98 | get { return m_surname; } |
99 | set { m_surname = value; } | 99 | set { m_surname = value; } |
100 | } | 100 | } |
101 | 101 | ||
102 | public string Email | 102 | public string Email |
103 | { | 103 | { |
104 | get { return m_email; } | 104 | get { return m_email; } |
105 | set { m_email = value; } | 105 | set { m_email = value; } |
106 | } | 106 | } |
107 | 107 | ||
108 | public string RegionName | 108 | public string RegionName |
109 | { | 109 | { |
110 | get { return m_regionName; } | 110 | get { return m_regionName; } |
111 | set { m_regionName = value; } | 111 | set { m_regionName = value; } |
112 | } | 112 | } |
113 | 113 | ||
114 | public string RegionID | 114 | public string RegionID |
115 | { | 115 | { |
116 | get { return m_regionID; } | 116 | get { return m_regionID; } |
117 | set { m_regionID = value; } | 117 | set { m_regionID = value; } |
118 | } | 118 | } |
119 | } | 119 | } |
120 | 120 | ||
121 | public class AuthorizationResponse | 121 | public class AuthorizationResponse |
122 | { | 122 | { |
123 | private bool m_isAuthorized; | 123 | private bool m_isAuthorized; |
@@ -132,13 +132,13 @@ namespace OpenSim.Services.Interfaces | |||
132 | m_isAuthorized = isAuthorized; | 132 | m_isAuthorized = isAuthorized; |
133 | m_message = message; | 133 | m_message = message; |
134 | } | 134 | } |
135 | 135 | ||
136 | public bool IsAuthorized | 136 | public bool IsAuthorized |
137 | { | 137 | { |
138 | get { return m_isAuthorized; } | 138 | get { return m_isAuthorized; } |
139 | set { m_isAuthorized = value; } | 139 | set { m_isAuthorized = value; } |
140 | } | 140 | } |
141 | 141 | ||
142 | public string Message | 142 | public string Message |
143 | { | 143 | { |
144 | get { return m_message; } | 144 | get { return m_message; } |
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs index 892e0b4..b4dc511 100644 --- a/OpenSim/Services/Interfaces/IAvatarService.cs +++ b/OpenSim/Services/Interfaces/IAvatarService.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Services.Interfaces | |||
51 | /// <param name="appearance"></param> | 51 | /// <param name="appearance"></param> |
52 | /// <returns></returns> | 52 | /// <returns></returns> |
53 | bool SetAppearance(UUID userID, AvatarAppearance appearance); | 53 | bool SetAppearance(UUID userID, AvatarAppearance appearance); |
54 | 54 | ||
55 | /// <summary> | 55 | /// <summary> |
56 | /// Called by the login service | 56 | /// Called by the login service |
57 | /// </summary> | 57 | /// </summary> |
@@ -75,7 +75,7 @@ namespace OpenSim.Services.Interfaces | |||
75 | bool ResetAvatar(UUID userID); | 75 | bool ResetAvatar(UUID userID); |
76 | 76 | ||
77 | /// <summary> | 77 | /// <summary> |
78 | /// These methods raison d'etre: | 78 | /// These methods raison d'etre: |
79 | /// No need to send the entire avatar data (SetAvatar) for changing attachments | 79 | /// No need to send the entire avatar data (SetAvatar) for changing attachments |
80 | /// </summary> | 80 | /// </summary> |
81 | /// <param name="userID"></param> | 81 | /// <param name="userID"></param> |
@@ -150,7 +150,8 @@ namespace OpenSim.Services.Interfaces | |||
150 | // Wearables | 150 | // Wearables |
151 | Data["AvatarHeight"] = appearance.AvatarHeight.ToString(); | 151 | Data["AvatarHeight"] = appearance.AvatarHeight.ToString(); |
152 | 152 | ||
153 | for (int i = 0 ; i < AvatarWearable.MAX_WEARABLES ; i++) | 153 | // TODO: With COF, is this even needed? |
154 | for (int i = 0 ; i < AvatarWearable.LEGACY_VERSION_MAX_WEARABLES ; i++) | ||
154 | { | 155 | { |
155 | for (int j = 0 ; j < appearance.Wearables[i].Count ; j++) | 156 | for (int j = 0 ; j < appearance.Wearables[i].Count ; j++) |
156 | { | 157 | { |
@@ -211,8 +212,8 @@ namespace OpenSim.Services.Interfaces | |||
211 | float h = float.Parse(Data["AvatarHeight"]); | 212 | float h = float.Parse(Data["AvatarHeight"]); |
212 | if( h == 0f) | 213 | if( h == 0f) |
213 | h = 1.9f; | 214 | h = 1.9f; |
214 | 215 | appearance.SetSize(new Vector3(0.45f, 0.6f, h )); | |
215 | appearance.AvatarHeight = h; | 216 | // appearance.AvatarHeight = float.Parse(Data["AvatarHeight"]); |
216 | } | 217 | } |
217 | 218 | ||
218 | // Legacy Wearables | 219 | // Legacy Wearables |
@@ -287,12 +288,11 @@ namespace OpenSim.Services.Interfaces | |||
287 | //byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT]; | 288 | //byte[] binary = new byte[AvatarAppearance.VISUALPARAM_COUNT]; |
288 | 289 | ||
289 | //for (int i = 0 ; i < vps.Length && i < binary.Length ; i++) | 290 | //for (int i = 0 ; i < vps.Length && i < binary.Length ; i++) |
290 | |||
291 | byte[] binary = new byte[vps.Length]; | 291 | byte[] binary = new byte[vps.Length]; |
292 | 292 | ||
293 | for (int i = 0; i < vps.Length; i++) | 293 | for (int i = 0; i < vps.Length; i++) |
294 | binary[i] = (byte)Convert.ToInt32(vps[i]); | 294 | binary[i] = (byte)Convert.ToInt32(vps[i]); |
295 | 295 | ||
296 | appearance.VisualParams = binary; | 296 | appearance.VisualParams = binary; |
297 | } | 297 | } |
298 | 298 | ||
@@ -357,6 +357,7 @@ namespace OpenSim.Services.Interfaces | |||
357 | appearance.Wearables[AvatarWearable.EYES].Wear( | 357 | appearance.Wearables[AvatarWearable.EYES].Wear( |
358 | AvatarWearable.DefaultWearables[ | 358 | AvatarWearable.DefaultWearables[ |
359 | AvatarWearable.EYES][0]); | 359 | AvatarWearable.EYES][0]); |
360 | |||
360 | } | 361 | } |
361 | catch | 362 | catch |
362 | { | 363 | { |
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 | |||
39 | /// </summary> | 39 | /// </summary> |
40 | /// <param name="regionID"></param> | 40 | /// <param name="regionID"></param> |
41 | /// <param name="create">If true, then an estate is created if one is not found.</param> | 41 | /// <param name="create">If true, then an estate is created if one is not found.</param> |
42 | /// <returns></returns> | 42 | /// <returns></returns> |
43 | EstateSettings LoadEstateSettings(UUID regionID, bool create); | 43 | EstateSettings LoadEstateSettings(UUID regionID, bool create); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Load estate settings for an estate ID. | 46 | /// Load estate settings for an estate ID. |
47 | /// </summary> | 47 | /// </summary> |
48 | /// <param name="estateID"></param> | 48 | /// <param name="estateID"></param> |
49 | /// <returns></returns> | 49 | /// <returns></returns> |
50 | EstateSettings LoadEstateSettings(int estateID); | 50 | EstateSettings LoadEstateSettings(int estateID); |
51 | 51 | ||
52 | /// <summary> | 52 | /// <summary> |
@@ -56,60 +56,60 @@ namespace OpenSim.Services.Interfaces | |||
56 | /// A <see cref="EstateSettings"/> | 56 | /// A <see cref="EstateSettings"/> |
57 | /// </returns> | 57 | /// </returns> |
58 | EstateSettings CreateNewEstate(); | 58 | EstateSettings CreateNewEstate(); |
59 | 59 | ||
60 | /// <summary> | 60 | /// <summary> |
61 | /// Load/Get all estate settings. | 61 | /// Load/Get all estate settings. |
62 | /// </summary> | 62 | /// </summary> |
63 | /// <returns>An empty list if no estates were found.</returns> | 63 | /// <returns>An empty list if no estates were found.</returns> |
64 | List<EstateSettings> LoadEstateSettingsAll(); | 64 | List<EstateSettings> LoadEstateSettingsAll(); |
65 | 65 | ||
66 | /// <summary> | 66 | /// <summary> |
67 | /// Store estate settings. | 67 | /// Store estate settings. |
68 | /// </summary> | 68 | /// </summary> |
69 | /// <remarks> | 69 | /// <remarks> |
70 | /// This is also called by EstateSettings.Save()</remarks> | 70 | /// This is also called by EstateSettings.Save()</remarks> |
71 | /// <param name="es"></param> | 71 | /// <param name="es"></param> |
72 | void StoreEstateSettings(EstateSettings es); | 72 | void StoreEstateSettings(EstateSettings es); |
73 | 73 | ||
74 | /// <summary> | 74 | /// <summary> |
75 | /// Get estate IDs. | 75 | /// Get estate IDs. |
76 | /// </summary> | 76 | /// </summary> |
77 | /// <param name="search">Name of estate to search for. This is the exact name, no parttern matching is done.</param> | 77 | /// <param name="search">Name of estate to search for. This is the exact name, no parttern matching is done.</param> |
78 | /// <returns></returns> | 78 | /// <returns></returns> |
79 | List<int> GetEstates(string search); | 79 | List<int> GetEstates(string search); |
80 | 80 | ||
81 | /// <summary> | 81 | /// <summary> |
82 | /// Get the IDs of all estates owned by the given user. | 82 | /// Get the IDs of all estates owned by the given user. |
83 | /// </summary> | 83 | /// </summary> |
84 | /// <returns>An empty list if no estates were found.</returns> | 84 | /// <returns>An empty list if no estates were found.</returns> |
85 | List<int> GetEstatesByOwner(UUID ownerID); | 85 | List<int> GetEstatesByOwner(UUID ownerID); |
86 | 86 | ||
87 | /// <summary> | 87 | /// <summary> |
88 | /// Get the IDs of all estates. | 88 | /// Get the IDs of all estates. |
89 | /// </summary> | 89 | /// </summary> |
90 | /// <returns>An empty list if no estates were found.</returns> | 90 | /// <returns>An empty list if no estates were found.</returns> |
91 | List<int> GetEstatesAll(); | 91 | List<int> GetEstatesAll(); |
92 | 92 | ||
93 | /// <summary> | 93 | /// <summary> |
94 | /// Link a region to an estate. | 94 | /// Link a region to an estate. |
95 | /// </summary> | 95 | /// </summary> |
96 | /// <param name="regionID"></param> | 96 | /// <param name="regionID"></param> |
97 | /// <param name="estateID"></param> | 97 | /// <param name="estateID"></param> |
98 | /// <returns>true if the link succeeded, false otherwise</returns> | 98 | /// <returns>true if the link succeeded, false otherwise</returns> |
99 | bool LinkRegion(UUID regionID, int estateID); | 99 | bool LinkRegion(UUID regionID, int estateID); |
100 | 100 | ||
101 | /// <summary> | 101 | /// <summary> |
102 | /// Get the UUIDs of all the regions in an estate. | 102 | /// Get the UUIDs of all the regions in an estate. |
103 | /// </summary> | 103 | /// </summary> |
104 | /// <param name="estateID"></param> | 104 | /// <param name="estateID"></param> |
105 | /// <returns></returns> | 105 | /// <returns></returns> |
106 | List<UUID> GetRegions(int estateID); | 106 | List<UUID> GetRegions(int estateID); |
107 | 107 | ||
108 | /// <summary> | 108 | /// <summary> |
109 | /// Delete an estate | 109 | /// Delete an estate |
110 | /// </summary> | 110 | /// </summary> |
111 | /// <param name="estateID"></param> | 111 | /// <param name="estateID"></param> |
112 | /// <returns>true if the delete succeeded, false otherwise</returns> | 112 | /// <returns>true if the delete succeeded, false otherwise</returns> |
113 | bool DeleteEstate(int estateID); | 113 | bool DeleteEstate(int estateID); |
114 | } | 114 | } |
115 | } \ No newline at end of file | 115 | } \ No newline at end of file |
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index f5f1f75..ead5d3c 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -85,7 +85,7 @@ namespace OpenSim.Services.Interfaces | |||
85 | GridRegion GetRegionByName(UUID scopeID, string regionName); | 85 | GridRegion GetRegionByName(UUID scopeID, string regionName); |
86 | 86 | ||
87 | /// <summary> | 87 | /// <summary> |
88 | /// Get information about regions starting with the provided name. | 88 | /// Get information about regions starting with the provided name. |
89 | /// </summary> | 89 | /// </summary> |
90 | /// <param name="name"> | 90 | /// <param name="name"> |
91 | /// The name to match against. | 91 | /// The name to match against. |
@@ -95,7 +95,7 @@ namespace OpenSim.Services.Interfaces | |||
95 | /// </param> | 95 | /// </param> |
96 | /// <returns> | 96 | /// <returns> |
97 | /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the | 97 | /// A list of <see cref="RegionInfo"/>s of regions with matching name. If the |
98 | /// grid-server couldn't be contacted or returned an error, return null. | 98 | /// grid-server couldn't be contacted or returned an error, return null. |
99 | /// </returns> | 99 | /// </returns> |
100 | List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber); | 100 | List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber); |
101 | 101 | ||
@@ -139,7 +139,7 @@ namespace OpenSim.Services.Interfaces | |||
139 | #pragma warning restore 414 | 139 | #pragma warning restore 414 |
140 | 140 | ||
141 | /// <summary> | 141 | /// <summary> |
142 | /// The port by which http communication occurs with the region | 142 | /// The port by which http communication occurs with the region |
143 | /// </summary> | 143 | /// </summary> |
144 | public uint HttpPort { get; set; } | 144 | public uint HttpPort { get; set; } |
145 | 145 | ||
@@ -148,7 +148,7 @@ namespace OpenSim.Services.Interfaces | |||
148 | /// </summary> | 148 | /// </summary> |
149 | public string ServerURI | 149 | public string ServerURI |
150 | { | 150 | { |
151 | get { | 151 | get { |
152 | if (!String.IsNullOrEmpty(m_serverURI)) { | 152 | if (!String.IsNullOrEmpty(m_serverURI)) { |
153 | return m_serverURI; | 153 | return m_serverURI; |
154 | } else { | 154 | } else { |
@@ -158,14 +158,25 @@ namespace OpenSim.Services.Interfaces | |||
158 | return "http://" + m_externalHostName + ":" + HttpPort + "/"; | 158 | return "http://" + m_externalHostName + ":" + HttpPort + "/"; |
159 | } | 159 | } |
160 | } | 160 | } |
161 | set { | 161 | set { |
162 | if (value.EndsWith("/")) { | 162 | if ( value == null) |
163 | { | ||
164 | m_serverURI = String.Empty; | ||
165 | return; | ||
166 | } | ||
167 | |||
168 | if ( value.EndsWith("/") ) | ||
169 | { | ||
170 | |||
163 | m_serverURI = value; | 171 | m_serverURI = value; |
164 | } else { | 172 | } |
173 | else | ||
174 | { | ||
165 | m_serverURI = value + '/'; | 175 | m_serverURI = value + '/'; |
166 | } | 176 | } |
167 | } | 177 | } |
168 | } | 178 | } |
179 | |||
169 | protected string m_serverURI; | 180 | protected string m_serverURI; |
170 | 181 | ||
171 | /// <summary> | 182 | /// <summary> |
@@ -260,31 +271,6 @@ namespace OpenSim.Services.Interfaces | |||
260 | m_serverURI = string.Empty; | 271 | m_serverURI = string.Empty; |
261 | } | 272 | } |
262 | 273 | ||
263 | /* | ||
264 | public GridRegion(int regionLocX, int regionLocY, IPEndPoint internalEndPoint, string externalUri) | ||
265 | { | ||
266 | m_regionLocX = regionLocX; | ||
267 | m_regionLocY = regionLocY; | ||
268 | RegionSizeX = (int)Constants.RegionSize; | ||
269 | RegionSizeY = (int)Constants.RegionSize; | ||
270 | |||
271 | m_internalEndPoint = internalEndPoint; | ||
272 | m_externalHostName = externalUri; | ||
273 | } | ||
274 | |||
275 | public GridRegion(int regionLocX, int regionLocY, string externalUri, uint port) | ||
276 | { | ||
277 | m_regionLocX = regionLocX; | ||
278 | m_regionLocY = regionLocY; | ||
279 | RegionSizeX = (int)Constants.RegionSize; | ||
280 | RegionSizeY = (int)Constants.RegionSize; | ||
281 | |||
282 | m_externalHostName = externalUri; | ||
283 | |||
284 | m_internalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)port); | ||
285 | } | ||
286 | */ | ||
287 | |||
288 | public GridRegion(uint xcell, uint ycell) | 274 | public GridRegion(uint xcell, uint ycell) |
289 | { | 275 | { |
290 | m_regionLocX = (int)Util.RegionToWorldLoc(xcell); | 276 | m_regionLocX = (int)Util.RegionToWorldLoc(xcell); |
@@ -333,7 +319,7 @@ namespace OpenSim.Services.Interfaces | |||
333 | RegionSecret = ConvertFrom.RegionSecret; | 319 | RegionSecret = ConvertFrom.RegionSecret; |
334 | EstateOwner = ConvertFrom.EstateOwner; | 320 | EstateOwner = ConvertFrom.EstateOwner; |
335 | } | 321 | } |
336 | 322 | ||
337 | public GridRegion(Dictionary<string, object> kvp) | 323 | public GridRegion(Dictionary<string, object> kvp) |
338 | { | 324 | { |
339 | if (kvp.ContainsKey("uuid")) | 325 | if (kvp.ContainsKey("uuid")) |
@@ -358,6 +344,13 @@ namespace OpenSim.Services.Interfaces | |||
358 | if (kvp.ContainsKey("regionName")) | 344 | if (kvp.ContainsKey("regionName")) |
359 | RegionName = (string)kvp["regionName"]; | 345 | RegionName = (string)kvp["regionName"]; |
360 | 346 | ||
347 | if (kvp.ContainsKey("access")) | ||
348 | { | ||
349 | byte access = Convert.ToByte((string)kvp["access"]); | ||
350 | Access = access; | ||
351 | Maturity = (int)Util.ConvertAccessLevelToMaturity(access); | ||
352 | } | ||
353 | |||
361 | if (kvp.ContainsKey("flags") && kvp["flags"] != null) | 354 | if (kvp.ContainsKey("flags") && kvp["flags"] != null) |
362 | RegionFlags = (OpenSim.Framework.RegionFlags?)Convert.ToInt32((string)kvp["flags"]); | 355 | RegionFlags = (OpenSim.Framework.RegionFlags?)Convert.ToInt32((string)kvp["flags"]); |
363 | 356 | ||
@@ -394,9 +387,6 @@ namespace OpenSim.Services.Interfaces | |||
394 | if (kvp.ContainsKey("parcelMapTexture")) | 387 | if (kvp.ContainsKey("parcelMapTexture")) |
395 | UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage); | 388 | UUID.TryParse((string)kvp["parcelMapTexture"], out ParcelImage); |
396 | 389 | ||
397 | if (kvp.ContainsKey("access")) | ||
398 | Access = Byte.Parse((string)kvp["access"]); | ||
399 | |||
400 | if (kvp.ContainsKey("regionSecret")) | 390 | if (kvp.ContainsKey("regionSecret")) |
401 | RegionSecret =(string)kvp["regionSecret"]; | 391 | RegionSecret =(string)kvp["regionSecret"]; |
402 | 392 | ||
@@ -409,7 +399,7 @@ namespace OpenSim.Services.Interfaces | |||
409 | // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>", | 399 | // m_log.DebugFormat("{0} New GridRegion. id={1}, loc=<{2},{3}>, size=<{4},{5}>", |
410 | // LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY); | 400 | // LogHeader, RegionID, RegionLocX, RegionLocY, RegionSizeX, RegionSizeY); |
411 | } | 401 | } |
412 | 402 | ||
413 | public Dictionary<string, object> ToKeyValuePairs() | 403 | public Dictionary<string, object> ToKeyValuePairs() |
414 | { | 404 | { |
415 | Dictionary<string, object> kvp = new Dictionary<string, object>(); | 405 | Dictionary<string, object> kvp = new Dictionary<string, object>(); |
@@ -472,41 +462,7 @@ namespace OpenSim.Services.Interfaces | |||
472 | /// </value> | 462 | /// </value> |
473 | public IPEndPoint ExternalEndPoint | 463 | public IPEndPoint ExternalEndPoint |
474 | { | 464 | { |
475 | get | 465 | get { return Util.getEndPoint(m_externalHostName, m_internalEndPoint.Port); } |
476 | { | ||
477 | // Old one defaults to IPv6 | ||
478 | //return new IPEndPoint(Dns.GetHostAddresses(m_externalHostName)[0], m_internalEndPoint.Port); | ||
479 | |||
480 | IPAddress ia = null; | ||
481 | // If it is already an IP, don't resolve it - just return directly | ||
482 | if (IPAddress.TryParse(m_externalHostName, out ia)) | ||
483 | return new IPEndPoint(ia, m_internalEndPoint.Port); | ||
484 | |||
485 | // Reset for next check | ||
486 | ia = null; | ||
487 | try | ||
488 | { | ||
489 | foreach (IPAddress Adr in Dns.GetHostAddresses(m_externalHostName)) | ||
490 | { | ||
491 | if (ia == null) | ||
492 | ia = Adr; | ||
493 | |||
494 | if (Adr.AddressFamily == AddressFamily.InterNetwork) | ||
495 | { | ||
496 | ia = Adr; | ||
497 | break; | ||
498 | } | ||
499 | } | ||
500 | } | ||
501 | catch (SocketException e) | ||
502 | { | ||
503 | throw new Exception( | ||
504 | "Unable to resolve local hostname " + m_externalHostName + " innerException of type '" + | ||
505 | e + "' attached to this exception", e); | ||
506 | } | ||
507 | |||
508 | return new IPEndPoint(ia, m_internalEndPoint.Port); | ||
509 | } | ||
510 | } | 466 | } |
511 | 467 | ||
512 | public string ExternalHostName | 468 | public string ExternalHostName |
@@ -526,4 +482,4 @@ namespace OpenSim.Services.Interfaces | |||
526 | get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); } | 482 | get { return Util.UIntsToLong((uint)RegionLocX, (uint)RegionLocY); } |
527 | } | 483 | } |
528 | } | 484 | } |
529 | } \ No newline at end of file | 485 | } |
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 | |||
37 | public class GridUserInfo | 37 | public class GridUserInfo |
38 | { | 38 | { |
39 | public string UserID; | 39 | public string UserID; |
40 | 40 | ||
41 | public UUID HomeRegionID; | 41 | public UUID HomeRegionID; |
42 | public Vector3 HomePosition; | 42 | public Vector3 HomePosition; |
43 | public Vector3 HomeLookAt; | 43 | public Vector3 HomeLookAt; |
@@ -45,13 +45,13 @@ namespace OpenSim.Services.Interfaces | |||
45 | public UUID LastRegionID; | 45 | public UUID LastRegionID; |
46 | public Vector3 LastPosition; | 46 | public Vector3 LastPosition; |
47 | public Vector3 LastLookAt; | 47 | public Vector3 LastLookAt; |
48 | 48 | ||
49 | public bool Online; | 49 | public bool Online; |
50 | public DateTime Login; | 50 | public DateTime Login; |
51 | public DateTime Logout; | 51 | public DateTime Logout; |
52 | 52 | ||
53 | public GridUserInfo() {} | 53 | public GridUserInfo() {} |
54 | 54 | ||
55 | public GridUserInfo(Dictionary<string, object> kvp) | 55 | public GridUserInfo(Dictionary<string, object> kvp) |
56 | { | 56 | { |
57 | if (kvp.ContainsKey("UserID")) | 57 | if (kvp.ContainsKey("UserID")) |
@@ -96,11 +96,11 @@ namespace OpenSim.Services.Interfaces | |||
96 | result["Online"] = Online.ToString(); | 96 | result["Online"] = Online.ToString(); |
97 | result["Login"] = Login.ToString(); | 97 | result["Login"] = Login.ToString(); |
98 | result["Logout"] = Logout.ToString(); | 98 | result["Logout"] = Logout.ToString(); |
99 | 99 | ||
100 | return result; | 100 | return result; |
101 | } | 101 | } |
102 | } | 102 | } |
103 | 103 | ||
104 | public interface IGridUserService | 104 | public interface IGridUserService |
105 | { | 105 | { |
106 | GridUserInfo LoggedIn(string userID); | 106 | GridUserInfo LoggedIn(string userID); |
@@ -115,7 +115,7 @@ namespace OpenSim.Services.Interfaces | |||
115 | /// <param name="lastLookAt">Last normalized look direction for the user</param> | 115 | /// <param name="lastLookAt">Last normalized look direction for the user</param> |
116 | /// <returns>True if the logout request was successfully processed, otherwise false</returns> | 116 | /// <returns>True if the logout request was successfully processed, otherwise false</returns> |
117 | bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); | 117 | bool LoggedOut(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); |
118 | 118 | ||
119 | bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt); | 119 | bool SetHome(string userID, UUID homeID, Vector3 homePosition, Vector3 homeLookAt); |
120 | 120 | ||
121 | /// <summary> | 121 | /// <summary> |
@@ -128,7 +128,7 @@ namespace OpenSim.Services.Interfaces | |||
128 | /// <param name="lastLookAt">Normalized look direction</param> | 128 | /// <param name="lastLookAt">Normalized look direction</param> |
129 | /// <returns>True if the user's last position was successfully updated, otherwise false</returns> | 129 | /// <returns>True if the user's last position was successfully updated, otherwise false</returns> |
130 | bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); | 130 | bool SetLastPosition(string userID, UUID sessionID, UUID regionID, Vector3 lastPosition, Vector3 lastLookAt); |
131 | 131 | ||
132 | GridUserInfo GetGridUserInfo(string userID); | 132 | GridUserInfo GetGridUserInfo(string userID); |
133 | GridUserInfo[] GetGridUserInfo(string[] userID); | 133 | GridUserInfo[] GetGridUserInfo(string[] userID); |
134 | } | 134 | } |
diff --git a/OpenSim/Services/Interfaces/IHypergridServices.cs b/OpenSim/Services/Interfaces/IHypergridServices.cs index 5e012fb..e0a63ca 100644 --- a/OpenSim/Services/Interfaces/IHypergridServices.cs +++ b/OpenSim/Services/Interfaces/IHypergridServices.cs | |||
@@ -36,8 +36,8 @@ namespace OpenSim.Services.Interfaces | |||
36 | { | 36 | { |
37 | public interface IGatekeeperService | 37 | public interface IGatekeeperService |
38 | { | 38 | { |
39 | bool LinkRegion(string regionDescriptor, out UUID regionID, out ulong regionHandle, out string externalName, out string imageURL, out string reason); | 39 | 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); |
40 | 40 | ||
41 | /// <summary> | 41 | /// <summary> |
42 | /// Returns the region a Hypergrid visitor should enter. | 42 | /// Returns the region a Hypergrid visitor should enter. |
43 | /// </summary> | 43 | /// </summary> |
@@ -59,7 +59,7 @@ namespace OpenSim.Services.Interfaces | |||
59 | public interface IUserAgentService | 59 | public interface IUserAgentService |
60 | { | 60 | { |
61 | bool LoginAgentToGrid(GridRegion source, AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason); | 61 | bool LoginAgentToGrid(GridRegion source, AgentCircuitData agent, GridRegion gatekeeper, GridRegion finalDestination, bool fromLogin, out string reason); |
62 | 62 | ||
63 | void LogoutAgent(UUID userID, UUID sessionID); | 63 | void LogoutAgent(UUID userID, UUID sessionID); |
64 | 64 | ||
65 | /// <summary> | 65 | /// <summary> |
@@ -89,7 +89,7 @@ namespace OpenSim.Services.Interfaces | |||
89 | /// <returns>On success: the user's Server URLs. If the user doesn't exist: "".</returns> | 89 | /// <returns>On success: the user's Server URLs. If the user doesn't exist: "".</returns> |
90 | /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks> | 90 | /// <remarks>Throws an exception if an error occurs (e.g., can't contact the server).</remarks> |
91 | string LocateUser(UUID userID); | 91 | string LocateUser(UUID userID); |
92 | 92 | ||
93 | /// <summary> | 93 | /// <summary> |
94 | /// Returns the Universal User Identifier for 'targetUserID' on behalf of 'userID'. | 94 | /// Returns the Universal User Identifier for 'targetUserID' on behalf of 'userID'. |
95 | /// </summary> | 95 | /// </summary> |
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs index 4289bba..582ea90 100644 --- a/OpenSim/Services/Interfaces/IInventoryService.cs +++ b/OpenSim/Services/Interfaces/IInventoryService.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Services.Interfaces | |||
84 | /// <param name="folderIDs"></param> | 84 | /// <param name="folderIDs"></param> |
85 | /// <returns>Inventory content.</returns> | 85 | /// <returns>Inventory content.</returns> |
86 | InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs); | 86 | InventoryCollection[] GetMultipleFoldersContent(UUID userID, UUID[] folderIDs); |
87 | 87 | ||
88 | /// <summary> | 88 | /// <summary> |
89 | /// Gets the items inside a folder | 89 | /// Gets the items inside a folder |
90 | /// </summary> | 90 | /// </summary> |
@@ -161,7 +161,7 @@ namespace OpenSim.Services.Interfaces | |||
161 | /// </summary> | 161 | /// </summary> |
162 | /// <param name="item"></param> | 162 | /// <param name="item"></param> |
163 | /// <returns>null if no item was found, otherwise the found item</returns> | 163 | /// <returns>null if no item was found, otherwise the found item</returns> |
164 | InventoryItemBase GetItem(InventoryItemBase item); | 164 | InventoryItemBase GetItem(UUID userID, UUID itemID); |
165 | 165 | ||
166 | /// <summary> | 166 | /// <summary> |
167 | /// Get multiple items, given by their UUIDs | 167 | /// Get multiple items, given by their UUIDs |
@@ -175,7 +175,7 @@ namespace OpenSim.Services.Interfaces | |||
175 | /// </summary> | 175 | /// </summary> |
176 | /// <param name="folder"></param> | 176 | /// <param name="folder"></param> |
177 | /// <returns></returns> | 177 | /// <returns></returns> |
178 | InventoryFolderBase GetFolder(InventoryFolderBase folder); | 178 | InventoryFolderBase GetFolder(UUID userID, UUID folderID); |
179 | 179 | ||
180 | /// <summary> | 180 | /// <summary> |
181 | /// Does the given user have an inventory structure? | 181 | /// Does the given user have an inventory structure? |
@@ -193,11 +193,11 @@ namespace OpenSim.Services.Interfaces | |||
193 | 193 | ||
194 | /// <summary> | 194 | /// <summary> |
195 | /// Get the union of permissions of all inventory items | 195 | /// Get the union of permissions of all inventory items |
196 | /// that hold the given assetID. | 196 | /// that hold the given assetID. |
197 | /// </summary> | 197 | /// </summary> |
198 | /// <param name="userID"></param> | 198 | /// <param name="userID"></param> |
199 | /// <param name="assetID"></param> | 199 | /// <param name="assetID"></param> |
200 | /// <returns>The permissions or 0 if no such asset is found in | 200 | /// <returns>The permissions or 0 if no such asset is found in |
201 | /// the user's inventory</returns> | 201 | /// the user's inventory</returns> |
202 | int GetAssetPermissions(UUID userID, UUID assetID); | 202 | int GetAssetPermissions(UUID userID, UUID assetID); |
203 | } | 203 | } |
diff --git a/OpenSim/Services/Interfaces/ILoginService.cs b/OpenSim/Services/Interfaces/ILoginService.cs index ee9b0b1..7c44cd8 100644 --- a/OpenSim/Services/Interfaces/ILoginService.cs +++ b/OpenSim/Services/Interfaces/ILoginService.cs | |||
@@ -47,8 +47,8 @@ namespace OpenSim.Services.Interfaces | |||
47 | 47 | ||
48 | public interface ILoginService | 48 | public interface ILoginService |
49 | { | 49 | { |
50 | LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, | 50 | LoginResponse Login(string firstName, string lastName, string passwd, string startLocation, UUID scopeID, |
51 | string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP); | 51 | string clientVersion, string channel, string mac, string id0, IPEndPoint clientIP, bool LibOMVclient); |
52 | Hashtable SetLevel(string firstName, string lastName, string passwd, int level, IPEndPoint clientIP); | 52 | Hashtable SetLevel(string firstName, string lastName, string passwd, int level, IPEndPoint clientIP); |
53 | } | 53 | } |
54 | 54 | ||
diff --git a/OpenSim/Services/Interfaces/IMapImageService.cs b/OpenSim/Services/Interfaces/IMapImageService.cs index 78daa5f..b8d45dd 100644 --- a/OpenSim/Services/Interfaces/IMapImageService.cs +++ b/OpenSim/Services/Interfaces/IMapImageService.cs | |||
@@ -34,8 +34,8 @@ namespace OpenSim.Services.Interfaces | |||
34 | public interface IMapImageService | 34 | public interface IMapImageService |
35 | { | 35 | { |
36 | //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY); | 36 | //List<MapBlockData> GetMapBlocks(UUID scopeID, int minX, int minY, int maxX, int maxY); |
37 | bool AddMapTile(int x, int y, byte[] imageData, out string reason); | 37 | bool AddMapTile(int x, int y, byte[] imageData, UUID scopeID, out string reason); |
38 | bool RemoveMapTile(int x, int y, out string reason); | 38 | bool RemoveMapTile(int x, int y, UUID scopeID, out string reason); |
39 | byte[] GetMapTile(string fileName, out string format); | 39 | byte[] GetMapTile(string fileName, UUID scopeID, out string format); |
40 | } | 40 | } |
41 | } | 41 | } |
diff --git a/OpenSim/Services/Interfaces/IMuteLIstService.cs b/OpenSim/Services/Interfaces/IMuteLIstService.cs new file mode 100644 index 0000000..9ffd47f --- /dev/null +++ b/OpenSim/Services/Interfaces/IMuteLIstService.cs | |||
@@ -0,0 +1,41 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using OpenSim.Framework; | ||
31 | using OpenMetaverse; | ||
32 | |||
33 | namespace OpenSim.Services.Interfaces | ||
34 | { | ||
35 | public interface IMuteListService | ||
36 | { | ||
37 | Byte[] MuteListRequest(UUID agent, uint crc); | ||
38 | bool UpdateMute(MuteData mute); | ||
39 | bool RemoveMute(UUID agentID, UUID muteID, string muteName); | ||
40 | } | ||
41 | } \ No newline at end of file | ||
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 | |||
35 | public interface IOfflineIMService | 35 | public interface IOfflineIMService |
36 | { | 36 | { |
37 | List<GridInstantMessage> GetMessages(UUID principalID); | 37 | List<GridInstantMessage> GetMessages(UUID principalID); |
38 | 38 | ||
39 | bool StoreMessage(GridInstantMessage im, out string reason); | 39 | bool StoreMessage(GridInstantMessage im, out string reason); |
40 | 40 | ||
41 | /// <summary> | 41 | /// <summary> |
42 | /// Delete messages to or from this user (or group). | 42 | /// Delete messages to or from this user (or group). |
43 | /// </summary> | 43 | /// </summary> |
diff --git a/OpenSim/Services/Interfaces/IPresenceService.cs b/OpenSim/Services/Interfaces/IPresenceService.cs index 90f9842..4843759 100644 --- a/OpenSim/Services/Interfaces/IPresenceService.cs +++ b/OpenSim/Services/Interfaces/IPresenceService.cs | |||
@@ -36,6 +36,7 @@ namespace OpenSim.Services.Interfaces | |||
36 | { | 36 | { |
37 | public string UserID; | 37 | public string UserID; |
38 | public UUID RegionID; | 38 | public UUID RegionID; |
39 | public UUID SessionID; | ||
39 | 40 | ||
40 | public PresenceInfo() | 41 | public PresenceInfo() |
41 | { | 42 | { |
@@ -47,6 +48,8 @@ namespace OpenSim.Services.Interfaces | |||
47 | UserID = kvp["UserID"].ToString(); | 48 | UserID = kvp["UserID"].ToString(); |
48 | if (kvp.ContainsKey("RegionID")) | 49 | if (kvp.ContainsKey("RegionID")) |
49 | UUID.TryParse(kvp["RegionID"].ToString(), out RegionID); | 50 | UUID.TryParse(kvp["RegionID"].ToString(), out RegionID); |
51 | if (kvp.ContainsKey("SessionID")) | ||
52 | UUID.TryParse(kvp["SessionID"].ToString(), out SessionID); | ||
50 | } | 53 | } |
51 | 54 | ||
52 | public Dictionary<string, object> ToKeyValuePairs() | 55 | public Dictionary<string, object> ToKeyValuePairs() |
@@ -54,6 +57,7 @@ namespace OpenSim.Services.Interfaces | |||
54 | Dictionary<string, object> result = new Dictionary<string, object>(); | 57 | Dictionary<string, object> result = new Dictionary<string, object>(); |
55 | result["UserID"] = UserID; | 58 | result["UserID"] = UserID; |
56 | result["RegionID"] = RegionID.ToString(); | 59 | result["RegionID"] = RegionID.ToString(); |
60 | result["SessionID"] = SessionID.ToString(); | ||
57 | 61 | ||
58 | return result; | 62 | return result; |
59 | } | 63 | } |
@@ -100,6 +104,13 @@ namespace OpenSim.Services.Interfaces | |||
100 | PresenceInfo GetAgent(UUID sessionID); | 104 | PresenceInfo GetAgent(UUID sessionID); |
101 | 105 | ||
102 | /// <summary> | 106 | /// <summary> |
107 | /// Get session information for a given session ID. | ||
108 | /// </summary> | ||
109 | /// <returns></returns> | ||
110 | /// <param name='sessionID'></param> | ||
111 | PresenceInfo GetAgentByUser(UUID userID); | ||
112 | |||
113 | /// <summary> | ||
103 | /// Get session information for a collection of users. | 114 | /// Get session information for a collection of users. |
104 | /// </summary> | 115 | /// </summary> |
105 | /// <returns>Session information for the users.</returns> | 116 | /// <returns>Session information for the users.</returns> |
diff --git a/OpenSim/Services/Interfaces/ISimulationService.cs b/OpenSim/Services/Interfaces/ISimulationService.cs index 8a25509..a01897a 100644 --- a/OpenSim/Services/Interfaces/ISimulationService.cs +++ b/OpenSim/Services/Interfaces/ISimulationService.cs | |||
@@ -34,20 +34,6 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion; | |||
34 | 34 | ||
35 | namespace OpenSim.Services.Interfaces | 35 | namespace OpenSim.Services.Interfaces |
36 | { | 36 | { |
37 | public class EntityTransferContext | ||
38 | { | ||
39 | public EntityTransferContext() | ||
40 | { | ||
41 | InboundVersion = VersionInfo.SimulationServiceVersionAcceptedMax; | ||
42 | OutboundVersion = VersionInfo.SimulationServiceVersionSupportedMax; | ||
43 | VariableWearablesSupported = false; | ||
44 | } | ||
45 | |||
46 | public float InboundVersion { get; set; } | ||
47 | public float OutboundVersion { get; set; } | ||
48 | public bool VariableWearablesSupported { get; set; } | ||
49 | } | ||
50 | |||
51 | public interface ISimulationService | 37 | public interface ISimulationService |
52 | { | 38 | { |
53 | /// <summary> | 39 | /// <summary> |
@@ -73,8 +59,8 @@ namespace OpenSim.Services.Interfaces | |||
73 | /// <param name="destination"></param> | 59 | /// <param name="destination"></param> |
74 | /// <param name="aCircuit"></param> | 60 | /// <param name="aCircuit"></param> |
75 | /// <param name="flags"></param> | 61 | /// <param name="flags"></param> |
76 | /// <param name="reason">Reason message in the event of a failure.</param> | 62 | /// <param name="reason">Reason message in the event of a failure.</param> |
77 | bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, out string reason); | 63 | bool CreateAgent(GridRegion source, GridRegion destination, AgentCircuitData aCircuit, uint flags, EntityTransferContext ctx, out string reason); |
78 | 64 | ||
79 | /// <summary> | 65 | /// <summary> |
80 | /// Full child agent update. | 66 | /// Full child agent update. |
@@ -82,7 +68,7 @@ namespace OpenSim.Services.Interfaces | |||
82 | /// <param name="regionHandle"></param> | 68 | /// <param name="regionHandle"></param> |
83 | /// <param name="data"></param> | 69 | /// <param name="data"></param> |
84 | /// <returns></returns> | 70 | /// <returns></returns> |
85 | bool UpdateAgent(GridRegion destination, AgentData data); | 71 | bool UpdateAgent(GridRegion destination, AgentData data, EntityTransferContext ctx); |
86 | 72 | ||
87 | /// <summary> | 73 | /// <summary> |
88 | /// Short child agent update, mostly for position. | 74 | /// Short child agent update, mostly for position. |
@@ -100,6 +86,7 @@ namespace OpenSim.Services.Interfaces | |||
100 | /// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param> | 86 | /// <param name="agentHomeURI">The visitor's Home URI. Will be missing (null) in older OpenSims.</param> |
101 | /// <param name="viaTeleport">True: via teleport; False: via cross (walking)</param> | 87 | /// <param name="viaTeleport">True: via teleport; False: via cross (walking)</param> |
102 | /// <param name="position">Position in the region</param> | 88 | /// <param name="position">Position in the region</param> |
89 | |||
103 | /// <param name="sversion"> | 90 | /// <param name="sversion"> |
104 | /// Version that the requesting simulator is runing. If null then no version check is carried out. | 91 | /// Version that the requesting simulator is runing. If null then no version check is carried out. |
105 | /// </param> | 92 | /// </param> |
diff --git a/OpenSim/Services/Interfaces/IUserAccountService.cs b/OpenSim/Services/Interfaces/IUserAccountService.cs index 2f7702c..c6f3ef3 100644 --- a/OpenSim/Services/Interfaces/IUserAccountService.cs +++ b/OpenSim/Services/Interfaces/IUserAccountService.cs | |||
@@ -91,6 +91,7 @@ namespace OpenSim.Services.Interfaces | |||
91 | public int UserLevel; | 91 | public int UserLevel; |
92 | public int UserFlags; | 92 | public int UserFlags; |
93 | public string UserTitle; | 93 | public string UserTitle; |
94 | public string UserCountry; | ||
94 | public Boolean LocalToGrid = true; | 95 | public Boolean LocalToGrid = true; |
95 | 96 | ||
96 | public Dictionary<string, object> ServiceURLs; | 97 | public Dictionary<string, object> ServiceURLs; |
@@ -120,6 +121,8 @@ namespace OpenSim.Services.Interfaces | |||
120 | UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString()); | 121 | UserFlags = Convert.ToInt32(kvp["UserFlags"].ToString()); |
121 | if (kvp.ContainsKey("UserTitle")) | 122 | if (kvp.ContainsKey("UserTitle")) |
122 | UserTitle = kvp["UserTitle"].ToString(); | 123 | UserTitle = kvp["UserTitle"].ToString(); |
124 | if (kvp.ContainsKey("UserCountry")) | ||
125 | UserCountry = kvp["UserCountry"].ToString(); | ||
123 | if (kvp.ContainsKey("LocalToGrid")) | 126 | if (kvp.ContainsKey("LocalToGrid")) |
124 | Boolean.TryParse(kvp["LocalToGrid"].ToString(), out LocalToGrid); | 127 | Boolean.TryParse(kvp["LocalToGrid"].ToString(), out LocalToGrid); |
125 | 128 | ||
@@ -155,6 +158,7 @@ namespace OpenSim.Services.Interfaces | |||
155 | result["UserLevel"] = UserLevel.ToString(); | 158 | result["UserLevel"] = UserLevel.ToString(); |
156 | result["UserFlags"] = UserFlags.ToString(); | 159 | result["UserFlags"] = UserFlags.ToString(); |
157 | result["UserTitle"] = UserTitle; | 160 | result["UserTitle"] = UserTitle; |
161 | result["UserCountry"] = UserCountry; | ||
158 | result["LocalToGrid"] = LocalToGrid.ToString(); | 162 | result["LocalToGrid"] = LocalToGrid.ToString(); |
159 | 163 | ||
160 | string str = string.Empty; | 164 | string str = string.Empty; |
@@ -182,6 +186,8 @@ namespace OpenSim.Services.Interfaces | |||
182 | /// <param name="query"></param> | 186 | /// <param name="query"></param> |
183 | /// <returns></returns> | 187 | /// <returns></returns> |
184 | List<UserAccount> GetUserAccounts(UUID scopeID, string query); | 188 | List<UserAccount> GetUserAccounts(UUID scopeID, string query); |
189 | List<UserAccount> GetUserAccountsWhere(UUID scopeID, string where); | ||
190 | List<UserAccount> GetUserAccounts(UUID scopeID, List<string> IDs); | ||
185 | 191 | ||
186 | /// <summary> | 192 | /// <summary> |
187 | /// Store the data given, wich replaces the stored data, therefore must be complete. | 193 | /// Store the data given, wich replaces the stored data, therefore must be complete. |
diff --git a/OpenSim/Services/Interfaces/IUserManagement.cs b/OpenSim/Services/Interfaces/IUserManagement.cs index 9e560d5..91b344e 100644 --- a/OpenSim/Services/Interfaces/IUserManagement.cs +++ b/OpenSim/Services/Interfaces/IUserManagement.cs | |||
@@ -42,6 +42,7 @@ namespace OpenSim.Services.Interfaces | |||
42 | string GetUserUUI(UUID uuid); | 42 | string GetUserUUI(UUID uuid); |
43 | bool GetUserUUI(UUID userID, out string uui); | 43 | bool GetUserUUI(UUID userID, out string uui); |
44 | string GetUserServerURL(UUID uuid, string serverType); | 44 | string GetUserServerURL(UUID uuid, string serverType); |
45 | Dictionary<UUID,string> GetUsersNames(string[] ids); | ||
45 | 46 | ||
46 | /// <summary> | 47 | /// <summary> |
47 | /// Get user ID by the given name. | 48 | /// Get user ID by the given name. |
@@ -78,7 +79,7 @@ namespace OpenSim.Services.Interfaces | |||
78 | /// <param name="uuid"></param> | 79 | /// <param name="uuid"></param> |
79 | /// <param name="firstName"></param> | 80 | /// <param name="firstName"></param> |
80 | /// <param name="lastName"></param> | 81 | /// <param name="lastName"></param> |
81 | void AddUser(UUID uuid, string firstName, string lastName); | 82 | void AddUser(UUID uuid, string first, string last, bool isNPC = false); |
82 | 83 | ||
83 | /// <summary> | 84 | /// <summary> |
84 | /// Add a user. | 85 | /// Add a user. |
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 | |||
40 | bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result); | 40 | bool ClassifiedInfoRequest(ref UserClassifiedAdd ad, ref string result); |
41 | bool ClassifiedDelete(UUID recordId); | 41 | bool ClassifiedDelete(UUID recordId); |
42 | #endregion Classifieds | 42 | #endregion Classifieds |
43 | 43 | ||
44 | #region Picks | 44 | #region Picks |
45 | OSD AvatarPicksRequest(UUID creatorId); | 45 | OSD AvatarPicksRequest(UUID creatorId); |
46 | bool PickInfoRequest(ref UserProfilePick pick, ref string result); | 46 | bool PickInfoRequest(ref UserProfilePick pick, ref string result); |
47 | bool PicksUpdate(ref UserProfilePick pick, ref string result); | 47 | bool PicksUpdate(ref UserProfilePick pick, ref string result); |
48 | bool PicksDelete(UUID pickId); | 48 | bool PicksDelete(UUID pickId); |
49 | #endregion Picks | 49 | #endregion Picks |
50 | 50 | ||
51 | #region Notes | 51 | #region Notes |
52 | bool AvatarNotesRequest(ref UserProfileNotes note); | 52 | bool AvatarNotesRequest(ref UserProfileNotes note); |
53 | bool NotesUpdate(ref UserProfileNotes note, ref string result); | 53 | bool NotesUpdate(ref UserProfileNotes note, ref string result); |
54 | #endregion Notes | 54 | #endregion Notes |
55 | 55 | ||
56 | #region Profile Properties | 56 | #region Profile Properties |
57 | bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result); | 57 | bool AvatarPropertiesRequest(ref UserProfileProperties prop, ref string result); |
58 | bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result); | 58 | bool AvatarPropertiesUpdate(ref UserProfileProperties prop, ref string result); |
@@ -62,7 +62,7 @@ namespace OpenSim.Services.Interfaces | |||
62 | bool UserPreferencesRequest(ref UserPreferences pref, ref string result); | 62 | bool UserPreferencesRequest(ref UserPreferences pref, ref string result); |
63 | bool UserPreferencesUpdate(ref UserPreferences pref, ref string result); | 63 | bool UserPreferencesUpdate(ref UserPreferences pref, ref string result); |
64 | #endregion User Preferences | 64 | #endregion User Preferences |
65 | 65 | ||
66 | #region Interests | 66 | #region Interests |
67 | bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result); | 67 | bool AvatarInterestsUpdate(UserProfileProperties prop, ref string result); |
68 | #endregion Interests | 68 | #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 | |||
49 | public class OpenProfileClient | 49 | public class OpenProfileClient |
50 | { | 50 | { |
51 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 51 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | 52 | ||
53 | private string m_serverURI; | 53 | private string m_serverURI; |
54 | 54 | ||
55 | /// <summary> | 55 | /// <summary> |
@@ -60,7 +60,7 @@ namespace OpenSim.Services.UserProfilesService | |||
60 | { | 60 | { |
61 | m_serverURI = serverURI; | 61 | m_serverURI = serverURI; |
62 | } | 62 | } |
63 | 63 | ||
64 | /// <summary> | 64 | /// <summary> |
65 | /// Gets an avatar's profile using the OpenProfile protocol. | 65 | /// Gets an avatar's profile using the OpenProfile protocol. |
66 | /// </summary> | 66 | /// </summary> |
diff --git a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs index 01cafbf..6c683b4 100644 --- a/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/Interfaces/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.Interfaces")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.Interfaces")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,9 +25,9 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |
32 | [assembly: AssemblyVersion("0.8.3.*")] | 32 | [assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)] |
33 | 33 | ||