From 65c5efe43b68700bad94076d4cd421160203c5de Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Fri, 16 May 2008 01:22:11 +0000 Subject: Formatting cleanup. --- .../Environment/Modules/Avatar/Chat/ChatModule.cs | 6 +++--- .../Avatar/Currency/SampleMoney/SampleMoneyModule.cs | 12 ++++++------ .../Modules/Avatar/Friends/FriendsModule.cs | 20 ++++++++++---------- .../Modules/Avatar/Inventory/InventoryModule.cs | 2 +- .../Modules/Avatar/Profiles/AvatarProfilesModule.cs | 2 +- .../Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs | 2 +- 6 files changed, 22 insertions(+), 22 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/Avatar') diff --git a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs index 9e5f376..a72010c 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Chat/ChatModule.cs @@ -235,7 +235,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat { TrySendChatMessage(presence, fromPos, regionPos, fromAgentID, fromName, e.Type, message, ChatSourceType.Agent); - + } }); } @@ -572,7 +572,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat string regex = @":(?\w*)!(?\S*) PRIVMSG (?\S+) :(?.*)"; Regex RE = new Regex(regex, RegexOptions.Multiline); MatchCollection matches = RE.Matches(input); - // Get some direct matches $1 $4 is a + // Get some direct matches $1 $4 is a if ((matches.Count == 1) && (matches[0].Groups.Count == 5)) { result = new Dictionary(); @@ -703,7 +703,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat public void ProcessIRCCommand(string command) { - //m_log.Info("[IRC]: ProcessIRCCommand:" + command); + //m_log.Info("[IRC]: ProcessIRCCommand:" + command); string[] commArgs = new string[command.Split(' ').Length]; string c_server = m_server; diff --git a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs index c63fc93..fab546b 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Currency/SampleMoney/SampleMoneyModule.cs @@ -46,10 +46,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney /// Demo Economy/Money Module. This is not a production quality money/economy module! /// This is a demo for you to use when making one that works for you. /// // To use the following you need to add: - /// -helperuri
+ /// -helperuri
/// to the command line parameters you use to start up your client /// This commonly looks like -helperuri http://127.0.0.1:9000/ - /// + /// /// Centralized grid structure example using OpenSimWi Redux revision 9+ /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux /// @@ -147,7 +147,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney XMLRPCHandler = scene; // To use the following you need to add: - // -helperuri
+ // -helperuri
// to the command line parameters you use to start up your client // This commonly looks like -helperuri http://127.0.0.1:9000/ @@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney private void OnNewClient(IClientAPI client) { // Here we check if we're in grid mode - // I imagine that the 'check balance' + // I imagine that the 'check balance' // function for the client should be here or shortly after if (gridmode) @@ -367,7 +367,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney { lock (m_KnownClientFunds) { - // If we don't know about the sender, then the sender can't + // If we don't know about the sender, then the sender can't // actually be here and therefore this is likely fraud or outdated. if (m_MoneyAddress.Length == 0) { @@ -1394,7 +1394,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney m_rootAgents[avatar.UUID] = avatar.Scene.RegionInfo.originRegionID; - + //m_log.Info("[MONEY]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); // Claim User! my user! Mine mine mine! diff --git a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs index 8c96392..c82f88d 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Friends/FriendsModule.cs @@ -97,9 +97,9 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends private void OnNewClient(IClientAPI client) { // All friends establishment protocol goes over instant message - // There's no way to send a message from the sim + // There's no way to send a message from the sim // to a user to 'add a friend' without causing dialog box spam - // + // // The base set of friends are added when the user signs on in their XMLRPC response // Generated by LoginService. The friends are retreived from the database by the UserManager @@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends LLUUID[] Agents = new LLUUID[1]; Agents[0] = client.AgentId; av.ControllingClient.SendAgentOnline(Agents); - + } } } @@ -223,14 +223,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends } catch (IndexOutOfRangeException) { - // Ignore the index out of range exception. + // Ignore the index out of range exception. // This causes friend lists to get out of sync slightly.. however // prevents a sim crash. m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); } catch (ArgumentOutOfRangeException) { - // Ignore the index out of range exception. + // Ignore the index out of range exception. // This causes friend lists to get out of sync slightly.. however // prevents a sim crash. m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); @@ -248,14 +248,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends catch (IndexOutOfRangeException) { - // Ignore the index out of range exception. + // Ignore the index out of range exception. // This causes friend lists to get out of sync slightly.. however // prevents a sim crash. m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); } catch (ArgumentOutOfRangeException) { - // Ignore the index out of range exception. + // Ignore the index out of range exception. // This causes friend lists to get out of sync slightly.. however // prevents a sim crash. m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); @@ -411,10 +411,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends { if (m_pendingFriendRequests.ContainsKey(transactionID)) { - // Found Pending Friend Request with that Transaction.. + // Found Pending Friend Request with that Transaction.. Scene SceneAgentIn = m_scene[0]; - // Found Pending Friend Request with that Transaction.. + // Found Pending Friend Request with that Transaction.. ScenePresence agentpresence = GetPresenceFromAgentID(agentID); if (agentpresence != null) { @@ -453,7 +453,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends { Scene SceneAgentIn = m_scene[0]; - // Found Pending Friend Request with that Transaction.. + // Found Pending Friend Request with that Transaction.. ScenePresence agentpresence = GetPresenceFromAgentID(agentID); if (agentpresence != null) { diff --git a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs index 624f307..e1cc688 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Inventory/InventoryModule.cs @@ -107,7 +107,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Inventory // First byte of the array is probably the item type // Next 16 bytes are the UUID - //Array.Copy(binaryBucket, 1, rawId, 0, 16); + //Array.Copy(binaryBucket, 1, rawId, 0, 16); //LLUUID itemId = new LLUUID(new Guid(rawId)); LLUUID itemId = new LLUUID(binaryBucket, 1); diff --git a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs index 15825b6..2e2be7a 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs @@ -86,7 +86,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles } /// - /// + /// /// /// /// diff --git a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs index 2112f91..f8651a3 100644 --- a/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs +++ b/OpenSim/Region/Environment/Modules/Avatar/Voice/AsterixVoice/AsteriskVoiceModule.cs @@ -226,7 +226,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Voice.AsterixVoice public string ProvisionVoiceAccountRequest(string request, string path, string param, LLUUID agentID, Caps caps) { - // we need to + // we need to // - get user data from UserProfileCacheService // - generate nonce for user voice account password // - issue XmlRpc request to asterisk opensim front end: -- cgit v1.1