aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-13 00:48:36 +0100
committerJustin Clark-Casey (justincc)2011-07-13 00:48:36 +0100
commit08dc07dc7691ce8ee3c81528bb45b9fdfc603a68 (patch)
tree7458d9516faed0db2cd498cd751eb8aa4bdfa0ce /OpenSim/Region/CoreModules/Avatar
parentAdd experimental module to check status of services that the simulator is con... (diff)
downloadopensim-SC_OLD-08dc07dc7691ce8ee3c81528bb45b9fdfc603a68.zip
opensim-SC_OLD-08dc07dc7691ce8ee3c81528bb45b9fdfc603a68.tar.gz
opensim-SC_OLD-08dc07dc7691ce8ee3c81528bb45b9fdfc603a68.tar.bz2
opensim-SC_OLD-08dc07dc7691ce8ee3c81528bb45b9fdfc603a68.tar.xz
refactor: Move all callers of the obsoleted SychronousRestObjectPoster.BeginPostObject() to the identical SynchronousRestObjectRequester.MakeRequest()
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs7
1 files changed, 4 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 321b38b..8d055d4 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -173,9 +173,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
173 { 173 {
174 if (m_RestURL != "") 174 if (m_RestURL != "")
175 { 175 {
176 m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId); 176 m_log.DebugFormat("[OFFLINE MESSAGING]: Retrieving stored messages for {0}", client.AgentId);
177 177
178 List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( 178 List<GridInstantMessage> msglist
179 = SynchronousRestObjectRequester.MakeRequest<UUID, List<GridInstantMessage>>(
179 "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); 180 "POST", m_RestURL + "/RetrieveMessages/", client.AgentId);
180 181
181 if (msglist == null) 182 if (msglist == null)
@@ -203,7 +204,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
203 if ((im.offline != 0) 204 if ((im.offline != 0)
204 && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) 205 && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages)))
205 { 206 {
206 bool success = SynchronousRestObjectPoster.BeginPostObject<GridInstantMessage, bool>( 207 bool success = SynchronousRestObjectRequester.MakeRequest<GridInstantMessage, bool>(
207 "POST", m_RestURL+"/SaveMessage/", im); 208 "POST", m_RestURL+"/SaveMessage/", im);
208 209
209 if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent) 210 if (im.dialog == (byte)InstantMessageDialog.MessageFromAgent)