diff options
| author | Melanie | 2010-01-26 15:12:41 +0000 |
|---|---|---|
| committer | Melanie | 2010-01-26 15:12:41 +0000 |
| commit | e9c9a74e0ade505ee8d8d8e7790141f758a65f61 (patch) | |
| tree | 8aec3c51c714b0f2ec713880759cfd8f6a7cbcd3 /OpenSim/Region/CoreModules | |
| parent | Merge branch 'master' into careminster (diff) | |
| download | opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.zip opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.gz opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.bz2 opensim-SC_OLD-e9c9a74e0ade505ee8d8d8e7790141f758a65f61.tar.xz | |
Some merge fixups
Diffstat (limited to 'OpenSim/Region/CoreModules')
| -rw-r--r-- | OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs index 3e86848..8f289c0 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs | |||
| @@ -180,11 +180,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
| 180 | 180 | ||
| 181 | private void RetrieveInstantMessages(IClientAPI client) | 181 | private void RetrieveInstantMessages(IClientAPI client) |
| 182 | { | 182 | { |
| 183 | if (m_RestURL != "") | 183 | if (m_RestURL == String.Empty) |
| 184 | { | 184 | return; |
| 185 | m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId); | 185 | |
| 186 | m_log.DebugFormat("[OFFLINE MESSAGING] Retrieving stored messages for {0}", client.AgentId); | ||
| 186 | 187 | ||
| 187 | List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( | 188 | List<GridInstantMessage> msglist = SynchronousRestObjectPoster.BeginPostObject<UUID, List<GridInstantMessage>>( |
| 188 | "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); | 189 | "POST", m_RestURL + "/RetrieveMessages/", client.AgentId); |
| 189 | 190 | ||
| 190 | if (msglist != null) | 191 | if (msglist != null) |