aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Client/MXP/ClientStack/MXPClientView.cs4
-rw-r--r--OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs5
-rw-r--r--OpenSim/Framework/IClientAPI.cs2
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs12
-rw-r--r--OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs4
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs2
-rw-r--r--OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs4
-rw-r--r--OpenSim/Tests/Common/Mock/TestClient.cs4
8 files changed, 37 insertions, 0 deletions
diff --git a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
index d8e2711..c9e56e6 100644
--- a/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
+++ b/OpenSim/Client/MXP/ClientStack/MXPClientView.cs
@@ -1045,6 +1045,10 @@ namespace OpenSim.Client.MXP.ClientStack
1045 Session.Send(me); 1045 Session.Send(me);
1046 } 1046 }
1047 1047
1048 public void FlushPrimUpdates()
1049 {
1050 }
1051
1048 public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems) 1052 public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems)
1049 { 1053 {
1050 // Need to translate to MXP somehow 1054 // Need to translate to MXP somehow
diff --git a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
index c37bc06..ba41e8c 100644
--- a/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
+++ b/OpenSim/Client/VWoHTTP/ClientStack/VWHClientView.cs
@@ -593,6 +593,11 @@ namespace OpenSim.Client.VWoHTTP.ClientStack
593 throw new System.NotImplementedException(); 593 throw new System.NotImplementedException();
594 } 594 }
595 595
596 public void FlushPrimUpdates()
597 {
598 throw new System.NotImplementedException();
599 }
600
596 public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems) 601 public void SendInventoryFolderDetails(UUID ownerID, UUID folderID, List<InventoryItemBase> items, List<InventoryFolderBase> folders, bool fetchFolders, bool fetchItems)
597 { 602 {
598 throw new System.NotImplementedException(); 603 throw new System.NotImplementedException();
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 32544b9..28d5502 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -902,6 +902,8 @@ namespace OpenSim.Framework
902 List<InventoryFolderBase> folders, bool fetchFolders, 902 List<InventoryFolderBase> folders, bool fetchFolders,
903 bool fetchItems); 903 bool fetchItems);
904 904
905 void FlushPrimUpdates();
906
905 void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item); 907 void SendInventoryItemDetails(UUID ownerID, InventoryItemBase item);
906 908
907 /// <summary> 909 /// <summary>
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 7cd324c..ae93e11 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3141,6 +3141,18 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3141 } 3141 }
3142 } 3142 }
3143 3143
3144 public void FlushPrimUpdates()
3145 {
3146 while (m_primFullUpdates.Count > 0)
3147 {
3148 ProcessPrimFullUpdates(this, null);
3149 }
3150 while (m_primTerseUpdates.Count > 0)
3151 {
3152 ProcessPrimTerseUpdates(this, null);
3153 }
3154 }
3155
3144 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID) 3156 public void SendAssetUploadCompleteMessage(sbyte AssetType, bool Success, UUID AssetFullID)
3145 { 3157 {
3146 AssetUploadCompletePacket newPack = new AssetUploadCompletePacket(); 3158 AssetUploadCompletePacket newPack = new AssetUploadCompletePacket();
diff --git a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
index 036c9a4..ddb27fe 100644
--- a/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
+++ b/OpenSim/Region/Examples/SimpleModule/MyNpcCharacter.cs
@@ -543,6 +543,10 @@ namespace OpenSim.Region.Examples.SimpleModule
543 { 543 {
544 } 544 }
545 545
546 public void FlushPrimUpdates()
547 {
548 }
549
546 public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID, 550 public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID,
547 List<InventoryItemBase> items, 551 List<InventoryItemBase> items,
548 List<InventoryFolderBase> folders, 552 List<InventoryFolderBase> folders,
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index 7e1063d..8fd4b47 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -840,6 +840,8 @@ namespace OpenSim.Region.Framework.Scenes
840 } 840 }
841 } 841 }
842 842
843 ControllingClient.FlushPrimUpdates();
844
843 m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS); 845 m_scene.StatsReporter.AddAgentTime(Environment.TickCount - m_perfMonMS);
844 } 846 }
845 847
diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
index b20b15b..d3be827 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
@@ -631,6 +631,10 @@ namespace OpenSim.Region.OptionalModules.World.NPC
631 { 631 {
632 } 632 }
633 633
634 public void FlushPrimUpdates()
635 {
636 }
637
634 public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID, 638 public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID,
635 List<InventoryItemBase> items, 639 List<InventoryItemBase> items,
636 List<InventoryFolderBase> folders, 640 List<InventoryFolderBase> folders,
diff --git a/OpenSim/Tests/Common/Mock/TestClient.cs b/OpenSim/Tests/Common/Mock/TestClient.cs
index 39520e7..256d6fd 100644
--- a/OpenSim/Tests/Common/Mock/TestClient.cs
+++ b/OpenSim/Tests/Common/Mock/TestClient.cs
@@ -630,6 +630,10 @@ namespace OpenSim.Tests.Common.Mock
630 { 630 {
631 } 631 }
632 632
633 public void FlushPrimUpdates()
634 {
635 }
636
633 public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID, 637 public virtual void SendInventoryFolderDetails(UUID ownerID, UUID folderID,
634 List<InventoryItemBase> items, 638 List<InventoryItemBase> items,
635 List<InventoryFolderBase> folders, 639 List<InventoryFolderBase> folders,