aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs2
2 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index 5f9f518..a2dc91f 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -201,6 +201,8 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
201 201
202 private void UndeliveredMessage(GridInstantMessage im) 202 private void UndeliveredMessage(GridInstantMessage im)
203 { 203 {
204 if (im.dialog == 19)
205 im.offline = 1; // We want them pushed out to the server
204 if ((im.offline != 0) 206 if ((im.offline != 0)
205 && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages))) 207 && (!im.fromGroup || (im.fromGroup && m_ForwardOfflineGroupMessages)))
206 { 208 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
index 7d7320d..0abc828 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
@@ -3272,7 +3272,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
3272 msg.ParentEstateID = 0; //ParentEstateID; 3272 msg.ParentEstateID = 0; //ParentEstateID;
3273 msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition); 3273 msg.Position = Vector3.Zero;// new Vector3(m_host.AbsolutePosition);
3274 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid; 3274 msg.RegionID = World.RegionInfo.RegionID.Guid;//RegionID.Guid;
3275 msg.binaryBucket = new byte[0];// binaryBucket; 3275 msg.binaryBucket = Util.StringToBytes256(m_host.OwnerID.ToString());
3276 3276
3277 if (m_TransferModule != null) 3277 if (m_TransferModule != null)
3278 { 3278 {