diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index 931093a..3d9c028 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | |||
@@ -133,6 +133,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
133 | } | 133 | } |
134 | 134 | ||
135 | /// <summary> | 135 | /// <summary> |
136 | /// | ||
137 | /// </summary> | ||
138 | /// <param name="message"></param> | ||
139 | /// <param name="type"></param> | ||
140 | /// <param name="channel"></param> | ||
141 | /// <param name="fromPos"></param> | ||
142 | /// <param name="fromName"></param> | ||
143 | /// <param name="fromAgentID"></param> | ||
144 | /// <param name="targetID"></param> | ||
145 | public void SimChatToAgent(UUID targetID, byte[] message, int channel, Vector3 fromPos, string fromName, UUID fromID, bool fromAgent) | ||
146 | { | ||
147 | SimChat(message, ChatTypeEnum.Region, channel, fromPos, fromName, fromID, targetID, fromAgent, false); | ||
148 | } | ||
149 | |||
150 | /// <summary> | ||
136 | /// Invoked when the client requests a prim. | 151 | /// Invoked when the client requests a prim. |
137 | /// </summary> | 152 | /// </summary> |
138 | /// <param name="primLocalID"></param> | 153 | /// <param name="primLocalID"></param> |
@@ -536,8 +551,21 @@ namespace OpenSim.Region.Framework.Scenes | |||
536 | 551 | ||
537 | void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder) | 552 | void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder) |
538 | { | 553 | { |
554 | <<<<<<< HEAD | ||
555 | try | ||
556 | { | ||
557 | SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); | ||
558 | } | ||
559 | catch (Exception e) | ||
560 | { | ||
561 | m_log.Error( | ||
562 | string.Format( | ||
563 | "[AGENT INVENTORY]: Error in SendInventoryAsync() for {0} with folder ID {1}. Exception ", e)); | ||
564 | } | ||
565 | ======= | ||
539 | Thread.Sleep(20); | 566 | Thread.Sleep(20); |
540 | SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); | 567 | SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); |
568 | >>>>>>> avn/ubitvar | ||
541 | } | 569 | } |
542 | 570 | ||
543 | void SendInventoryComplete(IAsyncResult iar) | 571 | void SendInventoryComplete(IAsyncResult iar) |