aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJeff Ames2008-11-04 00:54:16 +0000
committerJeff Ames2008-11-04 00:54:16 +0000
commita66081f562f8cbc492bb4d4001cb20e6410de1d2 (patch)
tree7b0dd7cb5f368bef333e7cfdc1b72d5843fa8609 /OpenSim/Region
parentadd email field to UserProfileData object (diff)
downloadopensim-SC_OLD-a66081f562f8cbc492bb4d4001cb20e6410de1d2.zip
opensim-SC_OLD-a66081f562f8cbc492bb4d4001cb20e6410de1d2.tar.gz
opensim-SC_OLD-a66081f562f8cbc492bb4d4001cb20e6410de1d2.tar.bz2
opensim-SC_OLD-a66081f562f8cbc492bb4d4001cb20e6410de1d2.tar.xz
Update svn properties, minor formatting cleanup.
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 3879910..f1e2f04 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -753,7 +753,7 @@ namespace OpenSim.Region.Communications.OGS1
753 m_log.WarnFormat("[OGS1 USER SERVICES]: Contacting MessagingServer about user-regions resulted in error: {0}", 753 m_log.WarnFormat("[OGS1 USER SERVICES]: Contacting MessagingServer about user-regions resulted in error: {0}",
754 respData == null ? "<unknown error>" : respData["faultMessage"]); 754 respData == null ? "<unknown error>" : respData["faultMessage"]);
755 } 755 }
756 else if(!respData.ContainsKey("count")) 756 else if (!respData.ContainsKey("count"))
757 { 757 {
758 m_log.WarnFormat("[OGS1 USER SERVICES]: Wrong format in response for MessagingServer request get_presence_info_bulk: missing 'count' field"); 758 m_log.WarnFormat("[OGS1 USER SERVICES]: Wrong format in response for MessagingServer request get_presence_info_bulk: missing 'count' field");
759 } 759 }
@@ -763,7 +763,7 @@ namespace OpenSim.Region.Communications.OGS1
763 m_log.DebugFormat("[OGS1 USER SERVICES]: Request returned {0} results.", count); 763 m_log.DebugFormat("[OGS1 USER SERVICES]: Request returned {0} results.", count);
764 for (int i = 0; i < count; ++i) 764 for (int i = 0; i < count; ++i)
765 { 765 {
766 if(respData.ContainsKey("uuid_" + i) && respData.ContainsKey("isOnline_" + i) && respData.ContainsKey("regionHandle_" + i)) 766 if (respData.ContainsKey("uuid_" + i) && respData.ContainsKey("isOnline_" + i) && respData.ContainsKey("regionHandle_" + i))
767 { 767 {
768 UUID uuid; 768 UUID uuid;
769 if (UUID.TryParse((string)respData["uuid_" + i], out uuid)) 769 if (UUID.TryParse((string)respData["uuid_" + i], out uuid))