diff options
author | Jeff Ames | 2008-08-18 00:39:10 +0000 |
---|---|---|
committer | Jeff Ames | 2008-08-18 00:39:10 +0000 |
commit | 6ef9d4da901a346c232458317cca6268da888e2e (patch) | |
tree | dd1d935b10f34f261839da9f9879c02322e8ede7 /OpenSim/Framework/Communications | |
parent | Update svn properties, minor formatting cleanup. (diff) | |
download | opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.zip opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.gz opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.bz2 opensim-SC_OLD-6ef9d4da901a346c232458317cca6268da888e2e.tar.xz |
Formatting cleanup.
Diffstat (limited to '')
16 files changed, 75 insertions, 76 deletions
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 6eff690..e924b3f 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -143,10 +143,10 @@ namespace OpenSim.Framework.Communications.Cache | |||
143 | public void Clear() | 143 | public void Clear() |
144 | { | 144 | { |
145 | m_log.Info("[ASSET CACHE]: Clearing Asset cache"); | 145 | m_log.Info("[ASSET CACHE]: Clearing Asset cache"); |
146 | 146 | ||
147 | if (StatsManager.SimExtraStats != null) | 147 | if (StatsManager.SimExtraStats != null) |
148 | StatsManager.SimExtraStats.ClearAssetCacheStatistics(); | 148 | StatsManager.SimExtraStats.ClearAssetCacheStatistics(); |
149 | 149 | ||
150 | Initialize(); | 150 | Initialize(); |
151 | } | 151 | } |
152 | 152 | ||
@@ -365,9 +365,9 @@ namespace OpenSim.Framework.Communications.Cache | |||
365 | } | 365 | } |
366 | } | 366 | } |
367 | else | 367 | else |
368 | { | 368 | { |
369 | if (!Assets.ContainsKey(asset.FullID)) | 369 | if (!Assets.ContainsKey(asset.FullID)) |
370 | { | 370 | { |
371 | AssetInfo assetInf = new AssetInfo(asset); | 371 | AssetInfo assetInf = new AssetInfo(asset); |
372 | Assets.Add(assetInf.FullID, assetInf); | 372 | Assets.Add(assetInf.FullID, assetInf); |
373 | 373 | ||
@@ -382,7 +382,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
382 | } | 382 | } |
383 | } | 383 | } |
384 | 384 | ||
385 | /// <summary> | 385 | /// <summary> |
386 | /// Allows you to clear a specific asset by uuid out | 386 | /// Allows you to clear a specific asset by uuid out |
387 | /// of the asset cache. This is needed because the osdynamic | 387 | /// of the asset cache. This is needed because the osdynamic |
388 | /// texture code grows the asset cache without bounds. The | 388 | /// texture code grows the asset cache without bounds. The |
@@ -399,8 +399,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
399 | if (Textures.ContainsKey(uuid)) | 399 | if (Textures.ContainsKey(uuid)) |
400 | { | 400 | { |
401 | Textures.Remove(uuid); | 401 | Textures.Remove(uuid); |
402 | } | 402 | } |
403 | else if (Assets.ContainsKey(uuid)) | 403 | else if (Assets.ContainsKey(uuid)) |
404 | { | 404 | { |
405 | Assets.Remove(uuid); | 405 | Assets.Remove(uuid); |
406 | } | 406 | } |
diff --git a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs index ed5b896..2c8e685 100644 --- a/OpenSim/Framework/Communications/Cache/AssetServerBase.cs +++ b/OpenSim/Framework/Communications/Cache/AssetServerBase.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
57 | /// <param name="req"></param> | 57 | /// <param name="req"></param> |
58 | /// <returns></returns> | 58 | /// <returns></returns> |
59 | /// <exception cref="System.Exception"> | 59 | /// <exception cref="System.Exception"> |
60 | /// Thrown if the request failed for some other reason than that the | 60 | /// Thrown if the request failed for some other reason than that the |
61 | /// asset cannot be found. | 61 | /// asset cannot be found. |
62 | /// </exception> | 62 | /// </exception> |
63 | protected abstract AssetBase GetAsset(AssetRequest req); | 63 | protected abstract AssetBase GetAsset(AssetRequest req); |
@@ -70,7 +70,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
70 | protected virtual void ProcessRequest(AssetRequest req) | 70 | protected virtual void ProcessRequest(AssetRequest req) |
71 | { | 71 | { |
72 | AssetBase asset; | 72 | AssetBase asset; |
73 | 73 | ||
74 | try | 74 | try |
75 | { | 75 | { |
76 | asset = GetAsset(req); | 76 | asset = GetAsset(req); |
@@ -78,12 +78,12 @@ namespace OpenSim.Framework.Communications.Cache | |||
78 | catch (Exception e) | 78 | catch (Exception e) |
79 | { | 79 | { |
80 | m_log.ErrorFormat("[ASSET]: Asset request for {0} threw exception {1}", req.AssetID, e); | 80 | m_log.ErrorFormat("[ASSET]: Asset request for {0} threw exception {1}", req.AssetID, e); |
81 | 81 | ||
82 | if (StatsManager.SimExtraStats != null) | 82 | if (StatsManager.SimExtraStats != null) |
83 | StatsManager.SimExtraStats.AddAssetServiceRequestFailure(); | 83 | StatsManager.SimExtraStats.AddAssetServiceRequestFailure(); |
84 | 84 | ||
85 | m_receiver.AssetNotFound(req.AssetID, req.IsTexture); | 85 | m_receiver.AssetNotFound(req.AssetID, req.IsTexture); |
86 | 86 | ||
87 | return; | 87 | return; |
88 | } | 88 | } |
89 | 89 | ||
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 57f5e76..c337907 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -91,8 +91,8 @@ namespace OpenSim.Framework.Communications.Cache | |||
91 | get { return m_session_id; } | 91 | get { return m_session_id; } |
92 | set { m_session_id = value; } | 92 | set { m_session_id = value; } |
93 | } | 93 | } |
94 | private LLUUID m_session_id = LLUUID.Zero; | 94 | private LLUUID m_session_id = LLUUID.Zero; |
95 | 95 | ||
96 | /// <summary> | 96 | /// <summary> |
97 | /// Constructor | 97 | /// Constructor |
98 | /// </summary> | 98 | /// </summary> |
@@ -172,7 +172,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
172 | } | 172 | } |
173 | } | 173 | } |
174 | } | 174 | } |
175 | 175 | ||
176 | /// <summary> | 176 | /// <summary> |
177 | /// Drop all cached inventory. | 177 | /// Drop all cached inventory. |
178 | /// </summary> | 178 | /// </summary> |
diff --git a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs index 4206cae..9cccf66 100644 --- a/OpenSim/Framework/Communications/Cache/GridAssetClient.cs +++ b/OpenSim/Framework/Communications/Cache/GridAssetClient.cs | |||
@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
60 | rc.AddQueryParameter("texture"); | 60 | rc.AddQueryParameter("texture"); |
61 | 61 | ||
62 | rc.RequestMethod = "GET"; | 62 | rc.RequestMethod = "GET"; |
63 | 63 | ||
64 | Stream s = rc.Request(); | 64 | Stream s = rc.Request(); |
65 | 65 | ||
66 | if (s.Length > 0) | 66 | if (s.Length > 0) |
diff --git a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs index d7de9d6..61cfc1a 100644 --- a/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs +++ b/OpenSim/Framework/Communications/Cache/InventoryFolderImpl.cs | |||
@@ -37,19 +37,19 @@ namespace OpenSim.Framework.Communications.Cache | |||
37 | public class InventoryFolderImpl : InventoryFolderBase | 37 | public class InventoryFolderImpl : InventoryFolderBase |
38 | { | 38 | { |
39 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 39 | //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
40 | 40 | ||
41 | public static readonly string PATH_DELIMITER = "/"; | 41 | public static readonly string PATH_DELIMITER = "/"; |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Items that are contained in this folder | 44 | /// Items that are contained in this folder |
45 | /// </summary> | 45 | /// </summary> |
46 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); | 46 | public Dictionary<LLUUID, InventoryItemBase> Items = new Dictionary<LLUUID, InventoryItemBase>(); |
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Child folders that are contained in this folder | 49 | /// Child folders that are contained in this folder |
50 | /// </summary> | 50 | /// </summary> |
51 | public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>(); | 51 | public Dictionary<LLUUID, InventoryFolderImpl> SubFolders = new Dictionary<LLUUID, InventoryFolderImpl>(); |
52 | 52 | ||
53 | // Constructors | 53 | // Constructors |
54 | public InventoryFolderImpl(InventoryFolderBase folderbase) | 54 | public InventoryFolderImpl(InventoryFolderBase folderbase) |
55 | { | 55 | { |
@@ -195,15 +195,15 @@ namespace OpenSim.Framework.Communications.Cache | |||
195 | 195 | ||
196 | return null; | 196 | return null; |
197 | } | 197 | } |
198 | 198 | ||
199 | /// <summary> | 199 | /// <summary> |
200 | /// Find a folder given a PATH_DELIMITOR delimited path starting from this folder | 200 | /// Find a folder given a PATH_DELIMITOR delimited path starting from this folder |
201 | /// | 201 | /// |
202 | /// This method does not handle paths that contain multiple delimitors | 202 | /// This method does not handle paths that contain multiple delimitors |
203 | /// | 203 | /// |
204 | /// FIXME: We do not yet handle situations where folders have the same name. We could handle this by some | 204 | /// FIXME: We do not yet handle situations where folders have the same name. We could handle this by some |
205 | /// XPath like expression | 205 | /// XPath like expression |
206 | /// | 206 | /// |
207 | /// FIXME: Delimitors which occur in names themselves are not currently escapable. | 207 | /// FIXME: Delimitors which occur in names themselves are not currently escapable. |
208 | /// </summary> | 208 | /// </summary> |
209 | /// <param name="path"> | 209 | /// <param name="path"> |
@@ -214,7 +214,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
214 | { | 214 | { |
215 | if (path == string.Empty) | 215 | if (path == string.Empty) |
216 | return this; | 216 | return this; |
217 | 217 | ||
218 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); | 218 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); |
219 | 219 | ||
220 | lock (SubFolders) | 220 | lock (SubFolders) |
@@ -228,19 +228,19 @@ namespace OpenSim.Framework.Communications.Cache | |||
228 | return folder; | 228 | return folder; |
229 | } | 229 | } |
230 | } | 230 | } |
231 | 231 | ||
232 | // We didn't find a folder with the given name | 232 | // We didn't find a folder with the given name |
233 | return null; | 233 | return null; |
234 | } | 234 | } |
235 | 235 | ||
236 | /// <summary> | 236 | /// <summary> |
237 | /// Find an item given a PATH_DELIMITOR delimited path starting from this folder. | 237 | /// Find an item given a PATH_DELIMITOR delimited path starting from this folder. |
238 | /// | 238 | /// |
239 | /// This method does not handle paths that contain multiple delimitors | 239 | /// This method does not handle paths that contain multiple delimitors |
240 | /// | 240 | /// |
241 | /// FIXME: We do not yet handle situations where folders or items have the same name. We could handle this by some | 241 | /// FIXME: We do not yet handle situations where folders or items have the same name. We could handle this by some |
242 | /// XPath like expression | 242 | /// XPath like expression |
243 | /// | 243 | /// |
244 | /// FIXME: Delimitors which occur in names themselves are not currently escapable. | 244 | /// FIXME: Delimitors which occur in names themselves are not currently escapable. |
245 | /// </summary> | 245 | /// </summary> |
246 | /// <param name="path"> | 246 | /// <param name="path"> |
@@ -248,7 +248,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
248 | /// </param> | 248 | /// </param> |
249 | /// <returns>null if the item is not found</returns> | 249 | /// <returns>null if the item is not found</returns> |
250 | public InventoryItemBase FindItemByPath(string path) | 250 | public InventoryItemBase FindItemByPath(string path) |
251 | { | 251 | { |
252 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); | 252 | string[] components = path.Split(new string[] { PATH_DELIMITER }, 2, StringSplitOptions.None); |
253 | 253 | ||
254 | if (components.Length == 1) | 254 | if (components.Length == 1) |
@@ -263,7 +263,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
263 | } | 263 | } |
264 | } | 264 | } |
265 | else | 265 | else |
266 | { | 266 | { |
267 | lock (SubFolders) | 267 | lock (SubFolders) |
268 | { | 268 | { |
269 | foreach (InventoryFolderImpl folder in SubFolders.Values) | 269 | foreach (InventoryFolderImpl folder in SubFolders.Values) |
@@ -273,10 +273,10 @@ namespace OpenSim.Framework.Communications.Cache | |||
273 | } | 273 | } |
274 | } | 274 | } |
275 | } | 275 | } |
276 | 276 | ||
277 | // We didn't find an item or intermediate folder with the given name | 277 | // We didn't find an item or intermediate folder with the given name |
278 | return null; | 278 | return null; |
279 | } | 279 | } |
280 | 280 | ||
281 | /// <summary> | 281 | /// <summary> |
282 | /// Return a copy of the list of child items in this folder | 282 | /// Return a copy of the list of child items in this folder |
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs index 1360aa3..4e3840b 100644 --- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs +++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs | |||
@@ -90,7 +90,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
90 | 90 | ||
91 | m_log.WarnFormat( | 91 | m_log.WarnFormat( |
92 | "[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userId); | 92 | "[USER CACHE]: Tried to remove the profile of user {0}, but this was not in the scene", userId); |
93 | 93 | ||
94 | return false; | 94 | return false; |
95 | } | 95 | } |
96 | 96 | ||
diff --git a/OpenSim/Framework/Communications/Capabilities/Caps.cs b/OpenSim/Framework/Communications/Capabilities/Caps.cs index 1aa8eb0..24fe0f4 100644 --- a/OpenSim/Framework/Communications/Capabilities/Caps.cs +++ b/OpenSim/Framework/Communications/Capabilities/Caps.cs | |||
@@ -422,7 +422,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
422 | mapLayer.Right = 5000; | 422 | mapLayer.Right = 5000; |
423 | mapLayer.Top = 5000; | 423 | mapLayer.Top = 5000; |
424 | mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006"); | 424 | mapLayer.ImageID = new LLUUID("00000000-0000-1111-9999-000000000006"); |
425 | 425 | ||
426 | return mapLayer; | 426 | return mapLayer; |
427 | } | 427 | } |
428 | 428 | ||
@@ -783,7 +783,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
783 | 783 | ||
784 | // TODO: probably make this a better set of extensions here | 784 | // TODO: probably make this a better set of extensions here |
785 | string extension = ".jp2"; | 785 | string extension = ".jp2"; |
786 | if (m_invType != "image") | 786 | if (m_invType != "image") |
787 | { | 787 | { |
788 | extension = ".dat"; | 788 | extension = ".dat"; |
789 | } | 789 | } |
diff --git a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs index 1c8f27f..b0e2b8f 100644 --- a/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs +++ b/OpenSim/Framework/Communications/Capabilities/LLSDRemoteParcelResponse.cs | |||
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Communications.Capabilities | |||
34 | public class LLSDRemoteParcelResponse | 34 | public class LLSDRemoteParcelResponse |
35 | { | 35 | { |
36 | public LLUUID parcel_id; | 36 | public LLUUID parcel_id; |
37 | 37 | ||
38 | public LLSDRemoteParcelResponse() | 38 | public LLSDRemoteParcelResponse() |
39 | { | 39 | { |
40 | } | 40 | } |
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 2bfe045..08dbc80 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -41,26 +41,26 @@ namespace OpenSim.Framework.Communications | |||
41 | public class CommunicationsManager | 41 | public class CommunicationsManager |
42 | { | 42 | { |
43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 43 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
44 | 44 | ||
45 | protected Dictionary<LLUUID, string[]> m_nameRequestCache = new Dictionary<LLUUID, string[]>(); | 45 | protected Dictionary<LLUUID, string[]> m_nameRequestCache = new Dictionary<LLUUID, string[]>(); |
46 | 46 | ||
47 | public IUserService UserService | 47 | public IUserService UserService |
48 | { | 48 | { |
49 | get { return m_userService; } | 49 | get { return m_userService; } |
50 | } | 50 | } |
51 | protected IUserService m_userService; | 51 | protected IUserService m_userService; |
52 | 52 | ||
53 | public IGridServices GridService | 53 | public IGridServices GridService |
54 | { | 54 | { |
55 | get { return m_gridService; } | 55 | get { return m_gridService; } |
56 | } | 56 | } |
57 | protected IGridServices m_gridService; | 57 | protected IGridServices m_gridService; |
58 | 58 | ||
59 | public IInterRegionCommunications InterRegion | 59 | public IInterRegionCommunications InterRegion |
60 | { | 60 | { |
61 | get { return m_interRegion; } | 61 | get { return m_interRegion; } |
62 | } | 62 | } |
63 | protected IInterRegionCommunications m_interRegion; | 63 | protected IInterRegionCommunications m_interRegion; |
64 | 64 | ||
65 | public UserProfileCacheService UserProfileCacheService | 65 | public UserProfileCacheService UserProfileCacheService |
66 | { | 66 | { |
@@ -68,36 +68,36 @@ namespace OpenSim.Framework.Communications | |||
68 | } | 68 | } |
69 | protected UserProfileCacheService m_userProfileCacheService; | 69 | protected UserProfileCacheService m_userProfileCacheService; |
70 | 70 | ||
71 | // protected AgentAssetTransactionsManager m_transactionsManager; | 71 | // protected AgentAssetTransactionsManager m_transactionsManager; |
72 | 72 | ||
73 | // public AgentAssetTransactionsManager TransactionsManager | 73 | // public AgentAssetTransactionsManager TransactionsManager |
74 | // { | 74 | // { |
75 | // get { return m_transactionsManager; } | 75 | // get { return m_transactionsManager; } |
76 | // } | 76 | // } |
77 | 77 | ||
78 | public IAvatarService AvatarService | 78 | public IAvatarService AvatarService |
79 | { | 79 | { |
80 | get { return m_avatarService; } | 80 | get { return m_avatarService; } |
81 | } | 81 | } |
82 | protected IAvatarService m_avatarService; | 82 | protected IAvatarService m_avatarService; |
83 | 83 | ||
84 | public AssetCache AssetCache | 84 | public AssetCache AssetCache |
85 | { | 85 | { |
86 | get { return m_assetCache; } | 86 | get { return m_assetCache; } |
87 | } | 87 | } |
88 | protected AssetCache m_assetCache; | 88 | protected AssetCache m_assetCache; |
89 | 89 | ||
90 | public IInterServiceInventoryServices InterServiceInventoryService | 90 | public IInterServiceInventoryServices InterServiceInventoryService |
91 | { | 91 | { |
92 | get { return m_interServiceInventoryService; } | 92 | get { return m_interServiceInventoryService; } |
93 | } | 93 | } |
94 | protected IInterServiceInventoryServices m_interServiceInventoryService; | 94 | protected IInterServiceInventoryServices m_interServiceInventoryService; |
95 | 95 | ||
96 | public NetworkServersInfo NetworkServersInfo | 96 | public NetworkServersInfo NetworkServersInfo |
97 | { | 97 | { |
98 | get { return m_networkServersInfo; } | 98 | get { return m_networkServersInfo; } |
99 | } | 99 | } |
100 | protected NetworkServersInfo m_networkServersInfo; | 100 | protected NetworkServersInfo m_networkServersInfo; |
101 | 101 | ||
102 | /// <summary> | 102 | /// <summary> |
103 | /// Constructor | 103 | /// Constructor |
@@ -138,7 +138,7 @@ namespace OpenSim.Framework.Communications | |||
138 | return null; | 138 | return null; |
139 | } | 139 | } |
140 | } | 140 | } |
141 | 141 | ||
142 | public IInventoryServices InventoryService | 142 | public IInventoryServices InventoryService |
143 | { | 143 | { |
144 | get | 144 | get |
diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs index 509f408..fcc0db5 100644 --- a/OpenSim/Framework/Communications/IGridServices.cs +++ b/OpenSim/Framework/Communications/IGridServices.cs | |||
@@ -33,7 +33,7 @@ namespace OpenSim.Framework.Communications | |||
33 | public interface IGridServices | 33 | public interface IGridServices |
34 | { | 34 | { |
35 | string gdebugRegionName { get; set; } | 35 | string gdebugRegionName { get; set; } |
36 | 36 | ||
37 | /// <summary> | 37 | /// <summary> |
38 | /// Register a region with the grid service. | 38 | /// Register a region with the grid service. |
39 | /// </summary> | 39 | /// </summary> |
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Communications | |||
41 | /// <returns></returns> | 41 | /// <returns></returns> |
42 | /// <exception cref="System.Exception">Thrown if region registration failed</exception> | 42 | /// <exception cref="System.Exception">Thrown if region registration failed</exception> |
43 | RegionCommsListener RegisterRegion(RegionInfo regionInfos); | 43 | RegionCommsListener RegisterRegion(RegionInfo regionInfos); |
44 | 44 | ||
45 | bool DeregisterRegion(RegionInfo regionInfo); | 45 | bool DeregisterRegion(RegionInfo regionInfo); |
46 | 46 | ||
47 | /// <summary> | 47 | /// <summary> |
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Communications | |||
51 | /// <param name="y"></param> | 51 | /// <param name="y"></param> |
52 | /// <returns></returns> | 52 | /// <returns></returns> |
53 | List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); | 53 | List<SimpleRegionInfo> RequestNeighbours(uint x, uint y); |
54 | 54 | ||
55 | RegionInfo RequestNeighbourInfo(ulong regionHandle); | 55 | RegionInfo RequestNeighbourInfo(ulong regionHandle); |
56 | RegionInfo RequestNeighbourInfo(LLUUID regionID); | 56 | RegionInfo RequestNeighbourInfo(LLUUID regionID); |
57 | RegionInfo RequestClosestRegion(string regionName); | 57 | RegionInfo RequestClosestRegion(string regionName); |
diff --git a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs index 24213f2..a1f4c2e 100644 --- a/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInterServiceInventoryServices.cs | |||
@@ -32,22 +32,22 @@ namespace OpenSim.Framework.Communications | |||
32 | { | 32 | { |
33 | /// <summary> | 33 | /// <summary> |
34 | /// Inventory operations used between grid services. | 34 | /// Inventory operations used between grid services. |
35 | /// </summary> | 35 | /// </summary> |
36 | public interface IInterServiceInventoryServices | 36 | public interface IInterServiceInventoryServices |
37 | { | 37 | { |
38 | /// <summary> | 38 | /// <summary> |
39 | /// Create a new inventory for the given user. | 39 | /// Create a new inventory for the given user. |
40 | /// </summary> | 40 | /// </summary> |
41 | /// <param name="user"></param> | 41 | /// <param name="user"></param> |
42 | /// <returns>true if the inventory was successfully created, false otherwise</returns> | 42 | /// <returns>true if the inventory was successfully created, false otherwise</returns> |
43 | bool CreateNewUserInventory(LLUUID user); | 43 | bool CreateNewUserInventory(LLUUID user); |
44 | 44 | ||
45 | /// <summary> | 45 | /// <summary> |
46 | /// Returns a list of all the folders in a given user's inventory. | 46 | /// Returns a list of all the folders in a given user's inventory. |
47 | /// </summary> | 47 | /// </summary> |
48 | /// <param name="userId"></param> | 48 | /// <param name="userId"></param> |
49 | /// <returns>A flat list of the user's inventory folder tree, | 49 | /// <returns>A flat list of the user's inventory folder tree, |
50 | /// null if there is no inventory for this user</returns> | 50 | /// null if there is no inventory for this user</returns> |
51 | List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId); | 51 | List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId); |
52 | } | 52 | } |
53 | } | 53 | } |
diff --git a/OpenSim/Framework/Communications/IInventoryServices.cs b/OpenSim/Framework/Communications/IInventoryServices.cs index 08a2c5f..b00b1bf 100644 --- a/OpenSim/Framework/Communications/IInventoryServices.cs +++ b/OpenSim/Framework/Communications/IInventoryServices.cs | |||
@@ -41,12 +41,12 @@ namespace OpenSim.Framework.Communications | |||
41 | /// Defines all the operations one can perform on a user's inventory. | 41 | /// Defines all the operations one can perform on a user's inventory. |
42 | /// </summary> | 42 | /// </summary> |
43 | public interface IInventoryServices | 43 | public interface IInventoryServices |
44 | { | 44 | { |
45 | string Host | 45 | string Host |
46 | { | 46 | { |
47 | get; | 47 | get; |
48 | } | 48 | } |
49 | 49 | ||
50 | /// <summary> | 50 | /// <summary> |
51 | /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the | 51 | /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the |
52 | /// inventory has been received | 52 | /// inventory has been received |
diff --git a/OpenSim/Framework/Communications/ISecureInventoryService.cs b/OpenSim/Framework/Communications/ISecureInventoryService.cs index 3608c56..bd962d1 100644 --- a/OpenSim/Framework/Communications/ISecureInventoryService.cs +++ b/OpenSim/Framework/Communications/ISecureInventoryService.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Framework.Communications | |||
40 | { | 40 | { |
41 | get; | 41 | get; |
42 | } | 42 | } |
43 | 43 | ||
44 | /// <summary> | 44 | /// <summary> |
45 | /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the | 45 | /// Request the inventory for a user. This is an asynchronous operation that will call the callback when the |
46 | /// inventory has been received | 46 | /// inventory has been received |
@@ -102,14 +102,14 @@ namespace OpenSim.Framework.Communications | |||
102 | /// Does the given user have an inventory structure? | 102 | /// Does the given user have an inventory structure? |
103 | /// </summary> | 103 | /// </summary> |
104 | /// <param name="userID"></param> | 104 | /// <param name="userID"></param> |
105 | /// <returns></returns> | 105 | /// <returns></returns> |
106 | bool HasInventoryForUser(LLUUID userID); | 106 | bool HasInventoryForUser(LLUUID userID); |
107 | 107 | ||
108 | /// <summary> | 108 | /// <summary> |
109 | /// Retrieve the root inventory folder for the given user. | 109 | /// Retrieve the root inventory folder for the given user. |
110 | /// </summary> | 110 | /// </summary> |
111 | /// <param name="userID"></param> | 111 | /// <param name="userID"></param> |
112 | /// <returns>null if no root folder was found</returns> | 112 | /// <returns>null if no root folder was found</returns> |
113 | InventoryFolderBase RequestRootFolder(LLUUID userID); | 113 | InventoryFolderBase RequestRootFolder(LLUUID userID); |
114 | } | 114 | } |
115 | } | 115 | } |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 40701f0..c76c078 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -53,14 +53,14 @@ namespace OpenSim.Framework.Communications | |||
53 | /// <param name="provider">The filename to the user server plugin DLL</param> | 53 | /// <param name="provider">The filename to the user server plugin DLL</param> |
54 | public void AddPlugin(string provider, string connect) | 54 | public void AddPlugin(string provider, string connect) |
55 | { | 55 | { |
56 | PluginLoader<IInventoryDataPlugin> loader = | 56 | PluginLoader<IInventoryDataPlugin> loader = |
57 | new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); | 57 | new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); |
58 | 58 | ||
59 | // loader will try to load all providers (MySQL, MSSQL, etc) | 59 | // loader will try to load all providers (MySQL, MSSQL, etc) |
60 | // unless it is constrainted to the correct "Provider" entry in the addin.xml | 60 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
61 | loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); | 61 | loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); |
62 | loader.Load(); | 62 | loader.Load(); |
63 | 63 | ||
64 | m_plugins = loader.Plugins; | 64 | m_plugins = loader.Plugins; |
65 | } | 65 | } |
66 | 66 | ||
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index fd5f139..40064d3 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -79,7 +79,7 @@ namespace OpenSim.Framework.Communications | |||
79 | /// <param name="response">The existing response</param> | 79 | /// <param name="response">The existing response</param> |
80 | /// <param name="theUser">The user profile</param> | 80 | /// <param name="theUser">The user profile</param> |
81 | public abstract void CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest); | 81 | public abstract void CustomiseResponse(LoginResponse response, UserProfileData theUser, string startLocationRequest); |
82 | 82 | ||
83 | /// <summary> | 83 | /// <summary> |
84 | /// If the user is already logged in, try to notify the region that the user they've got is dead. | 84 | /// If the user is already logged in, try to notify the region that the user they've got is dead. |
85 | /// </summary> | 85 | /// </summary> |
@@ -206,12 +206,11 @@ namespace OpenSim.Framework.Communications | |||
206 | userProfile.CurrentAgent.AgentOnline = false; | 206 | userProfile.CurrentAgent.AgentOnline = false; |
207 | 207 | ||
208 | m_userManager.CommitAgent(ref userProfile); | 208 | m_userManager.CommitAgent(ref userProfile); |
209 | 209 | ||
210 | // try to tell the region that their user is dead. | 210 | // try to tell the region that their user is dead. |
211 | LogOffUser(userProfile, " XMLRPC You were logged off because you logged in from another location"); | 211 | LogOffUser(userProfile, " XMLRPC You were logged off because you logged in from another location"); |
212 | 212 | ||
213 | // Reject the login | 213 | // Reject the login |
214 | |||
215 | 214 | ||
216 | m_log.InfoFormat( | 215 | m_log.InfoFormat( |
217 | "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in", | 216 | "[LOGIN END]: XMLRPC Notifying user {0} {1} that they are already logged in", |
@@ -293,7 +292,7 @@ namespace OpenSim.Framework.Communications | |||
293 | //return logResponse.ToXmlRpcResponse(); | 292 | //return logResponse.ToXmlRpcResponse(); |
294 | } | 293 | } |
295 | 294 | ||
296 | userProfile.LastLogin = userProfile.CurrentAgent.LoginTime; | 295 | userProfile.LastLogin = userProfile.CurrentAgent.LoginTime; |
297 | CommitAgent(ref userProfile); | 296 | CommitAgent(ref userProfile); |
298 | 297 | ||
299 | // If we reach this point, then the login has successfully logged onto the grid | 298 | // If we reach this point, then the login has successfully logged onto the grid |
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index f477df4..feeb666 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -57,11 +57,11 @@ namespace OpenSim.Framework.Communications | |||
57 | PluginLoader<IUserDataPlugin> loader = | 57 | PluginLoader<IUserDataPlugin> loader = |
58 | new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); | 58 | new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); |
59 | 59 | ||
60 | // loader will try to load all providers (MySQL, MSSQL, etc) | 60 | // loader will try to load all providers (MySQL, MSSQL, etc) |
61 | // unless it is constrainted to the correct "Provider" entry in the addin.xml | 61 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
62 | loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); | 62 | loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); |
63 | loader.Load(); | 63 | loader.Load(); |
64 | 64 | ||
65 | _plugins = loader.Plugins; | 65 | _plugins = loader.Plugins; |
66 | } | 66 | } |
67 | 67 | ||