diff options
Diffstat (limited to '')
6 files changed, 22 insertions, 22 deletions
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 | |||
235 | { | 235 | { |
236 | TrySendChatMessage(presence, fromPos, regionPos, | 236 | TrySendChatMessage(presence, fromPos, regionPos, |
237 | fromAgentID, fromName, e.Type, message, ChatSourceType.Agent); | 237 | fromAgentID, fromName, e.Type, message, ChatSourceType.Agent); |
238 | 238 | ||
239 | } | 239 | } |
240 | }); | 240 | }); |
241 | } | 241 | } |
@@ -572,7 +572,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
572 | string regex = @":(?<nick>\w*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)"; | 572 | string regex = @":(?<nick>\w*)!(?<user>\S*) PRIVMSG (?<channel>\S+) :(?<msg>.*)"; |
573 | Regex RE = new Regex(regex, RegexOptions.Multiline); | 573 | Regex RE = new Regex(regex, RegexOptions.Multiline); |
574 | MatchCollection matches = RE.Matches(input); | 574 | MatchCollection matches = RE.Matches(input); |
575 | // Get some direct matches $1 $4 is a | 575 | // Get some direct matches $1 $4 is a |
576 | if ((matches.Count == 1) && (matches[0].Groups.Count == 5)) | 576 | if ((matches.Count == 1) && (matches[0].Groups.Count == 5)) |
577 | { | 577 | { |
578 | result = new Dictionary<string, string>(); | 578 | result = new Dictionary<string, string>(); |
@@ -703,7 +703,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Chat | |||
703 | 703 | ||
704 | public void ProcessIRCCommand(string command) | 704 | public void ProcessIRCCommand(string command) |
705 | { | 705 | { |
706 | //m_log.Info("[IRC]: ProcessIRCCommand:" + command); | 706 | //m_log.Info("[IRC]: ProcessIRCCommand:" + command); |
707 | 707 | ||
708 | string[] commArgs = new string[command.Split(' ').Length]; | 708 | string[] commArgs = new string[command.Split(' ').Length]; |
709 | string c_server = m_server; | 709 | 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 | |||
46 | /// Demo Economy/Money Module. This is not a production quality money/economy module! | 46 | /// Demo Economy/Money Module. This is not a production quality money/economy module! |
47 | /// This is a demo for you to use when making one that works for you. | 47 | /// This is a demo for you to use when making one that works for you. |
48 | /// // To use the following you need to add: | 48 | /// // To use the following you need to add: |
49 | /// -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> | 49 | /// -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> |
50 | /// to the command line parameters you use to start up your client | 50 | /// to the command line parameters you use to start up your client |
51 | /// This commonly looks like -helperuri http://127.0.0.1:9000/ | 51 | /// This commonly looks like -helperuri http://127.0.0.1:9000/ |
52 | /// | 52 | /// |
53 | /// Centralized grid structure example using OpenSimWi Redux revision 9+ | 53 | /// Centralized grid structure example using OpenSimWi Redux revision 9+ |
54 | /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux | 54 | /// svn co https://opensimwiredux.svn.sourceforge.net/svnroot/opensimwiredux |
55 | /// </summary> | 55 | /// </summary> |
@@ -147,7 +147,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
147 | XMLRPCHandler = scene; | 147 | XMLRPCHandler = scene; |
148 | 148 | ||
149 | // To use the following you need to add: | 149 | // To use the following you need to add: |
150 | // -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> | 150 | // -helperuri <ADDRESS TO HERE OR grid MONEY SERVER> |
151 | // to the command line parameters you use to start up your client | 151 | // to the command line parameters you use to start up your client |
152 | // This commonly looks like -helperuri http://127.0.0.1:9000/ | 152 | // This commonly looks like -helperuri http://127.0.0.1:9000/ |
153 | 153 | ||
@@ -276,7 +276,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
276 | private void OnNewClient(IClientAPI client) | 276 | private void OnNewClient(IClientAPI client) |
277 | { | 277 | { |
278 | // Here we check if we're in grid mode | 278 | // Here we check if we're in grid mode |
279 | // I imagine that the 'check balance' | 279 | // I imagine that the 'check balance' |
280 | // function for the client should be here or shortly after | 280 | // function for the client should be here or shortly after |
281 | 281 | ||
282 | if (gridmode) | 282 | if (gridmode) |
@@ -367,7 +367,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
367 | { | 367 | { |
368 | lock (m_KnownClientFunds) | 368 | lock (m_KnownClientFunds) |
369 | { | 369 | { |
370 | // If we don't know about the sender, then the sender can't | 370 | // If we don't know about the sender, then the sender can't |
371 | // actually be here and therefore this is likely fraud or outdated. | 371 | // actually be here and therefore this is likely fraud or outdated. |
372 | if (m_MoneyAddress.Length == 0) | 372 | if (m_MoneyAddress.Length == 0) |
373 | { | 373 | { |
@@ -1394,7 +1394,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Currency.SampleMoney | |||
1394 | 1394 | ||
1395 | 1395 | ||
1396 | m_rootAgents[avatar.UUID] = avatar.Scene.RegionInfo.originRegionID; | 1396 | m_rootAgents[avatar.UUID] = avatar.Scene.RegionInfo.originRegionID; |
1397 | 1397 | ||
1398 | 1398 | ||
1399 | //m_log.Info("[MONEY]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); | 1399 | //m_log.Info("[MONEY]: Claiming " + avatar.Firstname + " " + avatar.Lastname + " in region:" + avatar.RegionHandle + "."); |
1400 | // Claim User! my user! Mine mine mine! | 1400 | // 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 | |||
97 | private void OnNewClient(IClientAPI client) | 97 | private void OnNewClient(IClientAPI client) |
98 | { | 98 | { |
99 | // All friends establishment protocol goes over instant message | 99 | // All friends establishment protocol goes over instant message |
100 | // There's no way to send a message from the sim | 100 | // There's no way to send a message from the sim |
101 | // to a user to 'add a friend' without causing dialog box spam | 101 | // to a user to 'add a friend' without causing dialog box spam |
102 | // | 102 | // |
103 | // The base set of friends are added when the user signs on in their XMLRPC response | 103 | // The base set of friends are added when the user signs on in their XMLRPC response |
104 | // Generated by LoginService. The friends are retreived from the database by the UserManager | 104 | // Generated by LoginService. The friends are retreived from the database by the UserManager |
105 | 105 | ||
@@ -167,7 +167,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
167 | LLUUID[] Agents = new LLUUID[1]; | 167 | LLUUID[] Agents = new LLUUID[1]; |
168 | Agents[0] = client.AgentId; | 168 | Agents[0] = client.AgentId; |
169 | av.ControllingClient.SendAgentOnline(Agents); | 169 | av.ControllingClient.SendAgentOnline(Agents); |
170 | 170 | ||
171 | } | 171 | } |
172 | } | 172 | } |
173 | } | 173 | } |
@@ -223,14 +223,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
223 | } | 223 | } |
224 | catch (IndexOutOfRangeException) | 224 | catch (IndexOutOfRangeException) |
225 | { | 225 | { |
226 | // Ignore the index out of range exception. | 226 | // Ignore the index out of range exception. |
227 | // This causes friend lists to get out of sync slightly.. however | 227 | // This causes friend lists to get out of sync slightly.. however |
228 | // prevents a sim crash. | 228 | // prevents a sim crash. |
229 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); | 229 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); |
230 | } | 230 | } |
231 | catch (ArgumentOutOfRangeException) | 231 | catch (ArgumentOutOfRangeException) |
232 | { | 232 | { |
233 | // Ignore the index out of range exception. | 233 | // Ignore the index out of range exception. |
234 | // This causes friend lists to get out of sync slightly.. however | 234 | // This causes friend lists to get out of sync slightly.. however |
235 | // prevents a sim crash. | 235 | // prevents a sim crash. |
236 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); | 236 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); |
@@ -248,14 +248,14 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
248 | 248 | ||
249 | catch (IndexOutOfRangeException) | 249 | catch (IndexOutOfRangeException) |
250 | { | 250 | { |
251 | // Ignore the index out of range exception. | 251 | // Ignore the index out of range exception. |
252 | // This causes friend lists to get out of sync slightly.. however | 252 | // This causes friend lists to get out of sync slightly.. however |
253 | // prevents a sim crash. | 253 | // prevents a sim crash. |
254 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); | 254 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); |
255 | } | 255 | } |
256 | catch (ArgumentOutOfRangeException) | 256 | catch (ArgumentOutOfRangeException) |
257 | { | 257 | { |
258 | // Ignore the index out of range exception. | 258 | // Ignore the index out of range exception. |
259 | // This causes friend lists to get out of sync slightly.. however | 259 | // This causes friend lists to get out of sync slightly.. however |
260 | // prevents a sim crash. | 260 | // prevents a sim crash. |
261 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); | 261 | m_log.Info("[FRIEND]: Unable to enumerate last friendlist user. User logged off"); |
@@ -411,10 +411,10 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
411 | { | 411 | { |
412 | if (m_pendingFriendRequests.ContainsKey(transactionID)) | 412 | if (m_pendingFriendRequests.ContainsKey(transactionID)) |
413 | { | 413 | { |
414 | // Found Pending Friend Request with that Transaction.. | 414 | // Found Pending Friend Request with that Transaction.. |
415 | Scene SceneAgentIn = m_scene[0]; | 415 | Scene SceneAgentIn = m_scene[0]; |
416 | 416 | ||
417 | // Found Pending Friend Request with that Transaction.. | 417 | // Found Pending Friend Request with that Transaction.. |
418 | ScenePresence agentpresence = GetPresenceFromAgentID(agentID); | 418 | ScenePresence agentpresence = GetPresenceFromAgentID(agentID); |
419 | if (agentpresence != null) | 419 | if (agentpresence != null) |
420 | { | 420 | { |
@@ -453,7 +453,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Friends | |||
453 | { | 453 | { |
454 | Scene SceneAgentIn = m_scene[0]; | 454 | Scene SceneAgentIn = m_scene[0]; |
455 | 455 | ||
456 | // Found Pending Friend Request with that Transaction.. | 456 | // Found Pending Friend Request with that Transaction.. |
457 | ScenePresence agentpresence = GetPresenceFromAgentID(agentID); | 457 | ScenePresence agentpresence = GetPresenceFromAgentID(agentID); |
458 | if (agentpresence != null) | 458 | if (agentpresence != null) |
459 | { | 459 | { |
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 | |||
107 | 107 | ||
108 | // First byte of the array is probably the item type | 108 | // First byte of the array is probably the item type |
109 | // Next 16 bytes are the UUID | 109 | // Next 16 bytes are the UUID |
110 | //Array.Copy(binaryBucket, 1, rawId, 0, 16); | 110 | //Array.Copy(binaryBucket, 1, rawId, 0, 16); |
111 | 111 | ||
112 | //LLUUID itemId = new LLUUID(new Guid(rawId)); | 112 | //LLUUID itemId = new LLUUID(new Guid(rawId)); |
113 | LLUUID itemId = new LLUUID(binaryBucket, 1); | 113 | 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 | |||
86 | } | 86 | } |
87 | 87 | ||
88 | /// <summary> | 88 | /// <summary> |
89 | /// | 89 | /// |
90 | /// </summary> | 90 | /// </summary> |
91 | /// <param name="remoteClient"></param> | 91 | /// <param name="remoteClient"></param> |
92 | /// <param name="avatarID"></param> | 92 | /// <param name="avatarID"></param> |
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 | |||
226 | public string ProvisionVoiceAccountRequest(string request, string path, string param, | 226 | public string ProvisionVoiceAccountRequest(string request, string path, string param, |
227 | LLUUID agentID, Caps caps) | 227 | LLUUID agentID, Caps caps) |
228 | { | 228 | { |
229 | // we need to | 229 | // we need to |
230 | // - get user data from UserProfileCacheService | 230 | // - get user data from UserProfileCacheService |
231 | // - generate nonce for user voice account password | 231 | // - generate nonce for user voice account password |
232 | // - issue XmlRpc request to asterisk opensim front end: | 232 | // - issue XmlRpc request to asterisk opensim front end: |