diff options
author | Diva Canto | 2009-09-26 08:49:48 -0700 |
---|---|---|
committer | Diva Canto | 2009-09-26 08:49:48 -0700 |
commit | 632bb7126277b6e8b524b76fb181a079b51adcf4 (patch) | |
tree | a9efec379c4eb9c8ff5abf5efaab9a6fcbf96271 /OpenSim/Region/CoreModules/Avatar | |
parent | More redirects to HGGridConnector-as-HyperlinkService. (diff) | |
download | opensim-SC-632bb7126277b6e8b524b76fb181a079b51adcf4.zip opensim-SC-632bb7126277b6e8b524b76fb181a079b51adcf4.tar.gz opensim-SC-632bb7126277b6e8b524b76fb181a079b51adcf4.tar.bz2 opensim-SC-632bb7126277b6e8b524b76fb181a079b51adcf4.tar.xz |
Fixed MapBlocks bug, wrong order of arguments. First version that seems completely functional.
Also fixed the notification of the message server in standalone -- that server doesn't usually exist.
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs index 6daab44..5a9b452 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs | |||
@@ -330,6 +330,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
330 | 330 | ||
331 | private void NotifyMessageServerOfStartup(Scene scene) | 331 | private void NotifyMessageServerOfStartup(Scene scene) |
332 | { | 332 | { |
333 | if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) | ||
334 | return; | ||
335 | |||
333 | Hashtable xmlrpcdata = new Hashtable(); | 336 | Hashtable xmlrpcdata = new Hashtable(); |
334 | xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); | 337 | xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); |
335 | ArrayList SendParams = new ArrayList(); | 338 | ArrayList SendParams = new ArrayList(); |
@@ -353,6 +356,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
353 | 356 | ||
354 | private void NotifyMessageServerOfShutdown(Scene scene) | 357 | private void NotifyMessageServerOfShutdown(Scene scene) |
355 | { | 358 | { |
359 | if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) | ||
360 | return; | ||
361 | |||
356 | Hashtable xmlrpcdata = new Hashtable(); | 362 | Hashtable xmlrpcdata = new Hashtable(); |
357 | xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); | 363 | xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString(); |
358 | ArrayList SendParams = new ArrayList(); | 364 | ArrayList SendParams = new ArrayList(); |
@@ -376,6 +382,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
376 | 382 | ||
377 | private void NotifyMessageServerOfAgentLocation(UUID agentID, UUID region, ulong regionHandle) | 383 | private void NotifyMessageServerOfAgentLocation(UUID agentID, UUID region, ulong regionHandle) |
378 | { | 384 | { |
385 | if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) | ||
386 | return; | ||
387 | |||
379 | Hashtable xmlrpcdata = new Hashtable(); | 388 | Hashtable xmlrpcdata = new Hashtable(); |
380 | xmlrpcdata["AgentID"] = agentID.ToString(); | 389 | xmlrpcdata["AgentID"] = agentID.ToString(); |
381 | xmlrpcdata["RegionUUID"] = region.ToString(); | 390 | xmlrpcdata["RegionUUID"] = region.ToString(); |
@@ -401,6 +410,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
401 | 410 | ||
402 | private void NotifyMessageServerOfAgentLeaving(UUID agentID, UUID region, ulong regionHandle) | 411 | private void NotifyMessageServerOfAgentLeaving(UUID agentID, UUID region, ulong regionHandle) |
403 | { | 412 | { |
413 | if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) | ||
414 | return; | ||
415 | |||
404 | Hashtable xmlrpcdata = new Hashtable(); | 416 | Hashtable xmlrpcdata = new Hashtable(); |
405 | xmlrpcdata["AgentID"] = agentID.ToString(); | 417 | xmlrpcdata["AgentID"] = agentID.ToString(); |
406 | xmlrpcdata["RegionUUID"] = region.ToString(); | 418 | xmlrpcdata["RegionUUID"] = region.ToString(); |