From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- .../Communications/Osp/OspInventoryWrapperPlugin.cs | 6 +++--- OpenSim/Framework/Communications/Osp/OspResolver.cs | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'OpenSim/Framework/Communications/Osp') diff --git a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs index 98d0e0f..e96c5e8 100644 --- a/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs +++ b/OpenSim/Framework/Communications/Osp/OspInventoryWrapperPlugin.cs @@ -47,7 +47,7 @@ namespace OpenSim.Framework.Communications.Osp public string Name { get { return "OspInventoryWrapperPlugin"; } } public string Version { get { return "0.1"; } } - public void Initialise() {} + public void Initialise() {} public void Initialise(string connect) {} public void Dispose() {} @@ -80,9 +80,9 @@ namespace OpenSim.Framework.Communications.Osp } protected InventoryItemBase PostProcessItem(InventoryItemBase item) - { + { item.CreatorIdAsUuid = OspResolver.ResolveOspa(item.CreatorId, m_commsManager); - return item; + return item; } public List getFolderHierarchy(UUID parentID) { return m_wrappedPlugin.getFolderHierarchy(parentID); } diff --git a/OpenSim/Framework/Communications/Osp/OspResolver.cs b/OpenSim/Framework/Communications/Osp/OspResolver.cs index e98317a..32f0efc 100644 --- a/OpenSim/Framework/Communications/Osp/OspResolver.cs +++ b/OpenSim/Framework/Communications/Osp/OspResolver.cs @@ -33,13 +33,13 @@ using OpenSim.Framework; using OpenSim.Framework.Communications.Cache; namespace OpenSim.Framework.Communications.Osp -{ +{ /// /// Resolves OpenSim Profile Anchors (OSPA). An OSPA is a string used to provide information for /// identifying user profiles or supplying a simple name if no profile is available. /// public class OspResolver - { + { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); public const string OSPA_PREFIX = "ospa:"; @@ -73,7 +73,7 @@ namespace OpenSim.Framework.Communications.Osp { return OSPA_PREFIX + OSPA_NAME_KEY + OSPA_PAIR_SEPARATOR + firstName + OSPA_NAME_VALUE_SEPARATOR + lastName; - } + } /// /// Resolve an osp string into the most suitable internal OpenSim identifier. @@ -89,13 +89,13 @@ namespace OpenSim.Framework.Communications.Osp /// is returned. /// public static UUID ResolveOspa(string ospa, CommunicationsManager commsManager) - { + { if (!ospa.StartsWith(OSPA_PREFIX)) return UUID.Zero; m_log.DebugFormat("[OSP RESOLVER]: Resolving {0}", ospa); - string ospaMeat = ospa.Substring(OSPA_PREFIX.Length); + string ospaMeat = ospa.Substring(OSPA_PREFIX.Length); string[] ospaTuples = ospaMeat.Split(OSPA_TUPLE_SEPARATOR_ARRAY); foreach (string tuple in ospaTuples) @@ -162,7 +162,7 @@ namespace OpenSim.Framework.Communications.Osp tempUserProfile.ID = HashName(tempUserProfile.Name); m_log.DebugFormat( - "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID); + "[OSP RESOLVER]: Adding temporary user profile for {0} {1}", tempUserProfile.Name, tempUserProfile.ID); commsManager.UserService.AddTemporaryUserProfile(tempUserProfile); return tempUserProfile.ID; -- cgit v1.1