diff options
author | Dan Lake | 2011-07-20 15:01:32 -0700 |
---|---|---|
committer | Dan Lake | 2011-07-20 15:01:32 -0700 |
commit | 2c11f7fc38ba14e041ed0e648088d574dadaaffe (patch) | |
tree | d593e3d1130e78ec74a11650d413f451a9a844da /OpenSim/Region/CoreModules/Avatar/InstantMessage | |
parent | Merge branch 'master' into bulletsim (diff) | |
parent | Removed unused AddPrimShape methods in PhysicsScene caused by merge conflicts (diff) | |
download | opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.zip opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.gz opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.bz2 opensim-SC_OLD-2c11f7fc38ba14e041ed0e648088d574dadaaffe.tar.xz |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/InstantMessage')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | 7 |
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) |