diff options
Diffstat (limited to 'OpenSim/Services/Interfaces')
-rw-r--r-- | OpenSim/Services/Interfaces/IAssetService.cs | 8 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/IAuthorizationService.cs | 32 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/IAvatarService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/Interfaces/IGridService.cs | 6 |
4 files changed, 32 insertions, 18 deletions
diff --git a/OpenSim/Services/Interfaces/IAssetService.cs b/OpenSim/Services/Interfaces/IAssetService.cs index 1ac1cec..80494f1 100644 --- a/OpenSim/Services/Interfaces/IAssetService.cs +++ b/OpenSim/Services/Interfaces/IAssetService.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Services.Interfaces | |||
56 | byte[] GetData(string id); | 56 | byte[] GetData(string id); |
57 | 57 | ||
58 | /// <summary> | 58 | /// <summary> |
59 | /// Synchronously fetches an asset from the local cache only | 59 | /// Synchronously fetches an asset from the local cache only. |
60 | /// </summary> | 60 | /// </summary> |
61 | /// <param name="id">Asset ID</param> | 61 | /// <param name="id">Asset ID</param> |
62 | /// <returns>The fetched asset, or null if it did not exist in the local cache</returns> | 62 | /// <returns>The fetched asset, or null if it did not exist in the local cache</returns> |
@@ -75,7 +75,9 @@ namespace OpenSim.Services.Interfaces | |||
75 | /// <summary> | 75 | /// <summary> |
76 | /// Creates a new asset | 76 | /// Creates a new asset |
77 | /// </summary> | 77 | /// </summary> |
78 | /// Returns a random ID if none is passed into it | 78 | /// <remarks> |
79 | /// Returns a random ID if none is passed via the asset argument. | ||
80 | /// </remarks> | ||
79 | /// <param name="asset"></param> | 81 | /// <param name="asset"></param> |
80 | /// <returns></returns> | 82 | /// <returns></returns> |
81 | string Store(AssetBase asset); | 83 | string Store(AssetBase asset); |
@@ -83,7 +85,9 @@ namespace OpenSim.Services.Interfaces | |||
83 | /// <summary> | 85 | /// <summary> |
84 | /// Update an asset's content | 86 | /// Update an asset's content |
85 | /// </summary> | 87 | /// </summary> |
88 | /// <remarks> | ||
86 | /// Attachments and bare scripts need this!! | 89 | /// Attachments and bare scripts need this!! |
90 | /// </remarks> | ||
87 | /// <param name="id"> </param> | 91 | /// <param name="id"> </param> |
88 | /// <param name="data"></param> | 92 | /// <param name="data"></param> |
89 | /// <returns></returns> | 93 | /// <returns></returns> |
diff --git a/OpenSim/Services/Interfaces/IAuthorizationService.cs b/OpenSim/Services/Interfaces/IAuthorizationService.cs index c5d577a..e5c68f6 100644 --- a/OpenSim/Services/Interfaces/IAuthorizationService.cs +++ b/OpenSim/Services/Interfaces/IAuthorizationService.cs | |||
@@ -34,14 +34,21 @@ namespace OpenSim.Services.Interfaces | |||
34 | 34 | ||
35 | public interface IAuthorizationService | 35 | public interface IAuthorizationService |
36 | { | 36 | { |
37 | ////////////////////////////////////////////////////// | 37 | /// <summary> |
38 | // Authorized | 38 | /// Check whether the user should be given access to the region. |
39 | // | 39 | /// </summary> |
40 | // This method returns a simple true false indicating | 40 | /// <remarks> |
41 | // whether or not a user has access to the region | 41 | /// We also supply user first name and last name for situations where the user does not have an account |
42 | // | 42 | /// on the region (e.g. they're a visitor via Hypergrid). |
43 | bool IsAuthorizedForRegion(string userID, string regionID, out string message); | 43 | /// </remarks> |
44 | 44 | /// <param name="userID"></param> | |
45 | /// <param name="firstName">/param> | ||
46 | /// <param name="lastName"></param> | ||
47 | /// <param name="regionID"></param> | ||
48 | /// <param name="message"></param> | ||
49 | /// <returns></returns> | ||
50 | bool IsAuthorizedForRegion( | ||
51 | string userID, string firstName, string lastName, string regionID, out string message); | ||
45 | } | 52 | } |
46 | 53 | ||
47 | public class AuthorizationRequest | 54 | public class AuthorizationRequest |
@@ -63,7 +70,8 @@ namespace OpenSim.Services.Interfaces | |||
63 | m_regionID = RegionID; | 70 | m_regionID = RegionID; |
64 | } | 71 | } |
65 | 72 | ||
66 | public AuthorizationRequest(string ID,string FirstName, string SurName, string Email, string RegionName, string RegionID) | 73 | public AuthorizationRequest( |
74 | string ID, string FirstName, string SurName, string Email, string RegionName, string RegionID) | ||
67 | { | 75 | { |
68 | m_userID = ID; | 76 | m_userID = ID; |
69 | m_firstname = FirstName; | 77 | m_firstname = FirstName; |
@@ -108,9 +116,6 @@ namespace OpenSim.Services.Interfaces | |||
108 | get { return m_regionID; } | 116 | get { return m_regionID; } |
109 | set { m_regionID = value; } | 117 | set { m_regionID = value; } |
110 | } | 118 | } |
111 | |||
112 | |||
113 | |||
114 | } | 119 | } |
115 | 120 | ||
116 | public class AuthorizationResponse | 121 | public class AuthorizationResponse |
@@ -126,7 +131,6 @@ namespace OpenSim.Services.Interfaces | |||
126 | { | 131 | { |
127 | m_isAuthorized = isAuthorized; | 132 | m_isAuthorized = isAuthorized; |
128 | m_message = message; | 133 | m_message = message; |
129 | |||
130 | } | 134 | } |
131 | 135 | ||
132 | public bool IsAuthorized | 136 | public bool IsAuthorized |
@@ -141,4 +145,4 @@ namespace OpenSim.Services.Interfaces | |||
141 | set { m_message = value; } | 145 | set { m_message = value; } |
142 | } | 146 | } |
143 | } | 147 | } |
144 | } | 148 | } \ No newline at end of file |
diff --git a/OpenSim/Services/Interfaces/IAvatarService.cs b/OpenSim/Services/Interfaces/IAvatarService.cs index d7af562..0d5ab7d 100644 --- a/OpenSim/Services/Interfaces/IAvatarService.cs +++ b/OpenSim/Services/Interfaces/IAvatarService.cs | |||
@@ -180,9 +180,9 @@ namespace OpenSim.Services.Interfaces | |||
180 | } | 180 | } |
181 | } | 181 | } |
182 | 182 | ||
183 | public AvatarAppearance ToAvatarAppearance(UUID owner) | 183 | public AvatarAppearance ToAvatarAppearance() |
184 | { | 184 | { |
185 | AvatarAppearance appearance = new AvatarAppearance(owner); | 185 | AvatarAppearance appearance = new AvatarAppearance(); |
186 | 186 | ||
187 | if (Data.Count == 0) | 187 | if (Data.Count == 0) |
188 | return appearance; | 188 | return appearance; |
diff --git a/OpenSim/Services/Interfaces/IGridService.cs b/OpenSim/Services/Interfaces/IGridService.cs index f569fc8..a084309 100644 --- a/OpenSim/Services/Interfaces/IGridService.cs +++ b/OpenSim/Services/Interfaces/IGridService.cs | |||
@@ -71,6 +71,12 @@ namespace OpenSim.Services.Interfaces | |||
71 | /// <returns></returns> | 71 | /// <returns></returns> |
72 | GridRegion GetRegionByPosition(UUID scopeID, int x, int y); | 72 | GridRegion GetRegionByPosition(UUID scopeID, int x, int y); |
73 | 73 | ||
74 | /// <summary> | ||
75 | /// Get information about a region which exactly matches the name given. | ||
76 | /// </summary> | ||
77 | /// <param name="scopeID"></param> | ||
78 | /// <param name="regionName"></param> | ||
79 | /// <returns>Returns the region information if the name matched. Null otherwise.</returns> | ||
74 | GridRegion GetRegionByName(UUID scopeID, string regionName); | 80 | GridRegion GetRegionByName(UUID scopeID, string regionName); |
75 | 81 | ||
76 | /// <summary> | 82 | /// <summary> |