diff options
| author | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
|---|---|---|
| committer | dr scofield (aka dirk husemann) | 2009-10-01 09:48:02 +0200 |
| commit | 9dcf7da42abfaf20a6a2ec552868dd37cc3e7261 (patch) | |
| tree | a9c5145dea2ade7981922dffeed134c8e1a493ef /OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |
| parent | adding skeleton test case for LandDataSerializer [w-i-p] (diff) | |
| parent | Removed an innefficent List.Contains lookup from UpdateQueue (diff) | |
| download | opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC_OLD-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 912cbf1..88ace6a 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -2332,7 +2332,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 2332 | return itemBlock; | 2332 | return itemBlock; |
| 2333 | } | 2333 | } |
| 2334 | 2334 | ||
| 2335 | public void SendBulkUpdateInventory(InventoryNodeBase node) | 2335 | public void SendBulkUpdateInventory(InventoryNodeBase node) |
| 2336 | { | 2336 | { |
| 2337 | if (node is InventoryItemBase) | 2337 | if (node is InventoryItemBase) |
| 2338 | SendBulkUpdateInventoryItem((InventoryItemBase)node); | 2338 | SendBulkUpdateInventoryItem((InventoryItemBase)node); |
| @@ -2937,7 +2937,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 2937 | else if (m_avatarTerseUpdates.Count == 1) | 2937 | else if (m_avatarTerseUpdates.Count == 1) |
| 2938 | { | 2938 | { |
| 2939 | lock (m_avatarTerseUpdateTimer) | 2939 | lock (m_avatarTerseUpdateTimer) |
| 2940 | m_avatarTerseUpdateTimer.Start(); | 2940 | m_avatarTerseUpdateTimer.Start(); |
| 2941 | } | 2941 | } |
| 2942 | } | 2942 | } |
| 2943 | } | 2943 | } |