aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region')
-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
4 files changed, 22 insertions, 0 deletions
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,