diff options
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to '')
3 files changed, 17 insertions, 10 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 64ee7e4..d34a8f6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -567,10 +567,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
567 | 567 | ||
568 | m_scene.InventoryService.UpdateItem(item); | 568 | m_scene.InventoryService.UpdateItem(item); |
569 | 569 | ||
570 | // this gets called when the agent logs off! | 570 | // If the name of the object has been changed whilst attached then we want to update the inventory |
571 | // item in the viewer. | ||
571 | if (sp.ControllingClient != null) | 572 | if (sp.ControllingClient != null) |
572 | sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0); | 573 | sp.ControllingClient.SendInventoryItemCreateUpdate(item, 0); |
573 | } | 574 | } |
575 | |||
574 | grp.HasGroupChanged = false; // Prevent it being saved over and over | 576 | grp.HasGroupChanged = false; // Prevent it being saved over and over |
575 | } | 577 | } |
576 | // else | 578 | // else |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 0dad3c4..596174b 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -137,13 +137,15 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
137 | foreach (Scene scene in m_Scenes) | 137 | foreach (Scene scene in m_Scenes) |
138 | { | 138 | { |
139 | // m_log.DebugFormat( | 139 | // m_log.DebugFormat( |
140 | // "[INSTANT MESSAGE]: Looking for root agent {0} in {1}", | 140 | // "[INSTANT MESSAGE]: Looking for root agent {0} in {1}", |
141 | // toAgentID.ToString(), scene.RegionInfo.RegionName); | 141 | // toAgentID.ToString(), scene.RegionInfo.RegionName); |
142 | |||
142 | ScenePresence sp = scene.GetScenePresence(toAgentID); | 143 | ScenePresence sp = scene.GetScenePresence(toAgentID); |
143 | if (sp != null && !sp.IsChildAgent) | 144 | if (sp != null && !sp.IsChildAgent) |
144 | { | 145 | { |
145 | // Local message | 146 | // Local message |
146 | // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", user.Name, toAgentID); | 147 | m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to root agent {0} {1}", sp.Name, toAgentID); |
148 | |||
147 | sp.ControllingClient.SendInstantMessage(im); | 149 | sp.ControllingClient.SendInstantMessage(im); |
148 | 150 | ||
149 | // Message sent | 151 | // Message sent |
@@ -155,13 +157,15 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
155 | // try child avatar second | 157 | // try child avatar second |
156 | foreach (Scene scene in m_Scenes) | 158 | foreach (Scene scene in m_Scenes) |
157 | { | 159 | { |
158 | // m_log.DebugFormat( | 160 | m_log.DebugFormat( |
159 | // "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName); | 161 | "[INSTANT MESSAGE]: Looking for child of {0} in {1}", toAgentID, scene.RegionInfo.RegionName); |
162 | |||
160 | ScenePresence sp = scene.GetScenePresence(toAgentID); | 163 | ScenePresence sp = scene.GetScenePresence(toAgentID); |
161 | if (sp != null) | 164 | if (sp != null) |
162 | { | 165 | { |
163 | // Local message | 166 | // Local message |
164 | // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", user.Name, toAgentID); | 167 | m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to child agent {0} {1}", sp.Name, toAgentID); |
168 | |||
165 | sp.ControllingClient.SendInstantMessage(im); | 169 | sp.ControllingClient.SendInstantMessage(im); |
166 | 170 | ||
167 | // Message sent | 171 | // Message sent |
@@ -170,10 +174,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
170 | } | 174 | } |
171 | } | 175 | } |
172 | 176 | ||
173 | // m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID); | 177 | m_log.DebugFormat("[INSTANT MESSAGE]: Delivering IM to {0} via XMLRPC", im.toAgentID); |
174 | SendGridInstantMessageViaXMLRPC(im, result); | ||
175 | 178 | ||
176 | return; | 179 | SendGridInstantMessageViaXMLRPC(im, result); |
177 | } | 180 | } |
178 | 181 | ||
179 | private void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result) | 182 | private void HandleUndeliveredMessage(GridInstantMessage im, MessageResultNotification result) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index 19c774f..f3af59a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -297,7 +297,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
297 | }); | 297 | }); |
298 | } | 298 | } |
299 | } | 299 | } |
300 | else if (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) | 300 | else if ( |
301 | im.dialog == (byte)InstantMessageDialog.InventoryDeclined | ||
302 | || im.dialog == (byte)InstantMessageDialog.TaskInventoryDeclined) | ||
301 | { | 303 | { |
302 | // Here, the recipient is local and we can assume that the | 304 | // Here, the recipient is local and we can assume that the |
303 | // inventory is loaded. Courtesy of the above bulk update, | 305 | // inventory is loaded. Courtesy of the above bulk update, |