diff options
author | Justin Clark-Casey (justincc) | 2009-09-07 18:26:53 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-09-07 18:26:53 +0100 |
commit | 116933bee5adfa4a3c1815fb7f3866bdaa584c41 (patch) | |
tree | b1aaf689ad7c9ef07e495e94d64f5978a1d5c9c3 /OpenSim/Region/Communications/OGS1 | |
parent | T012_EstateSettingsRandomStorage() which wasn't being run because the method ... (diff) | |
parent | Merge branch 'master' of ssh://MyConnection/var/git/opensim (diff) | |
download | opensim-SC_OLD-116933bee5adfa4a3c1815fb7f3866bdaa584c41.zip opensim-SC_OLD-116933bee5adfa4a3c1815fb7f3866bdaa584c41.tar.gz opensim-SC_OLD-116933bee5adfa4a3c1815fb7f3866bdaa584c41.tar.bz2 opensim-SC_OLD-116933bee5adfa4a3c1815fb7f3866bdaa584c41.tar.xz |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs index 9f234be..ec8512a 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1UserDataPlugin.cs | |||
@@ -48,6 +48,10 @@ namespace OpenSim.Region.Communications.OGS1 | |||
48 | 48 | ||
49 | protected CommunicationsManager m_commsManager; | 49 | protected CommunicationsManager m_commsManager; |
50 | 50 | ||
51 | public OGS1UserDataPlugin() | ||
52 | { | ||
53 | } | ||
54 | |||
51 | public OGS1UserDataPlugin(CommunicationsManager commsManager) | 55 | public OGS1UserDataPlugin(CommunicationsManager commsManager) |
52 | { | 56 | { |
53 | m_log.DebugFormat("[OGS1 USER SERVICES]: {0} initialized", Name); | 57 | m_log.DebugFormat("[OGS1 USER SERVICES]: {0} initialized", Name); |
@@ -108,7 +112,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
108 | parameters.Add(param); | 112 | parameters.Add(param); |
109 | XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters); | 113 | XmlRpcRequest req = new XmlRpcRequest("get_agent_by_uuid", parameters); |
110 | 114 | ||
111 | XmlRpcResponse resp = req.Send(GetUserServerURL(userId), 6000); | 115 | XmlRpcResponse resp = req.Send(m_commsManager.NetworkServersInfo.UserURL, 6000); |
112 | Hashtable respData = (Hashtable)resp.Value; | 116 | Hashtable respData = (Hashtable)resp.Value; |
113 | if (respData.Contains("error_type")) | 117 | if (respData.Contains("error_type")) |
114 | { | 118 | { |
@@ -603,7 +607,7 @@ namespace OpenSim.Region.Communications.OGS1 | |||
603 | { | 607 | { |
604 | if ((string)respData["returnString"] == "TRUE") | 608 | if ((string)respData["returnString"] == "TRUE") |
605 | { | 609 | { |
606 | 610 | m_log.DebugFormat("[OGS1 USER SERVICES]: Updated user appearance in {0}", GetUserServerURL(user)); | |
607 | } | 611 | } |
608 | else | 612 | else |
609 | { | 613 | { |
@@ -622,8 +626,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
622 | } | 626 | } |
623 | catch (WebException e) | 627 | catch (WebException e) |
624 | { | 628 | { |
625 | m_log.Warn("[OGS1 USER SERVICES]: Error when trying to update Avatar's appearance: " + | 629 | m_log.WarnFormat("[OGS1 USER SERVICES]: Error when trying to update Avatar's appearance in {0}: {1}", |
626 | e.Message); | 630 | GetUserServerURL(user), e.Message); |
627 | // Return Empty list (no friends) | 631 | // Return Empty list (no friends) |
628 | } | 632 | } |
629 | } | 633 | } |