diff options
author | Jeff Ames | 2008-07-23 13:24:25 +0000 |
---|---|---|
committer | Jeff Ames | 2008-07-23 13:24:25 +0000 |
commit | 80d8e2889e62d8900837d37a800a4eeaae5ffc5a (patch) | |
tree | 47bdf0f48ae8ace3bb7cd10ab91d91b52b96f80e /OpenSim/Framework | |
parent | get rid of some LLQuaternion == null checks. Because LLQuaternion is (diff) | |
download | opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.zip opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.gz opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.bz2 opensim-SC_OLD-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.xz |
Update svn properties. Formatting cleanup. Remove a compiler warning.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/BlockingQueue.cs | 4 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/AssetCache.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Framework/BlockingQueue.cs b/OpenSim/Framework/BlockingQueue.cs index 5b7e911..586ccd7 100644 --- a/OpenSim/Framework/BlockingQueue.cs +++ b/OpenSim/Framework/BlockingQueue.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Framework | |||
63 | Monitor.Wait(m_queueSync); | 63 | Monitor.Wait(m_queueSync); |
64 | } | 64 | } |
65 | 65 | ||
66 | if(m_pqueue.Count > 0) | 66 | if (m_pqueue.Count > 0) |
67 | return m_pqueue.Dequeue(); | 67 | return m_pqueue.Dequeue(); |
68 | return m_queue.Dequeue(); | 68 | return m_queue.Dequeue(); |
69 | } | 69 | } |
@@ -73,7 +73,7 @@ namespace OpenSim.Framework | |||
73 | { | 73 | { |
74 | lock (m_queueSync) | 74 | lock (m_queueSync) |
75 | { | 75 | { |
76 | if(m_pqueue.Contains(item)) | 76 | if (m_pqueue.Contains(item)) |
77 | return true; | 77 | return true; |
78 | return m_queue.Contains(item); | 78 | return m_queue.Contains(item); |
79 | } | 79 | } |
diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs index 90b0a10..6eff690 100644 --- a/OpenSim/Framework/Communications/Cache/AssetCache.cs +++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs | |||
@@ -447,7 +447,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
447 | RequestedAssets.Remove(assetInf.FullID); | 447 | RequestedAssets.Remove(assetInf.FullID); |
448 | // If it's a direct request for a script, drop it | 448 | // If it's a direct request for a script, drop it |
449 | // because it's a hacked client | 449 | // because it's a hacked client |
450 | if(req.AssetRequestSource != 2 || assetInf.Type != 10) | 450 | if (req.AssetRequestSource != 2 || assetInf.Type != 10) |
451 | AssetRequests.Add(req); | 451 | AssetRequests.Add(req); |
452 | } | 452 | } |
453 | } | 453 | } |
diff --git a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs index 383c129..11516f0 100644 --- a/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs +++ b/OpenSim/Framework/Communications/Cache/CachedUserInfo.cs | |||
@@ -728,7 +728,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
728 | 728 | ||
729 | public void Execute() | 729 | public void Execute() |
730 | { | 730 | { |
731 | if(m_delegate != null) | 731 | if (m_delegate != null) |
732 | m_delegate.DynamicInvoke(m_args); | 732 | m_delegate.DynamicInvoke(m_args); |
733 | } | 733 | } |
734 | } | 734 | } |
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 13fabaf..d157bac 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -233,7 +233,7 @@ namespace OpenSim.Framework | |||
233 | 233 | ||
234 | public void Save() | 234 | public void Save() |
235 | { | 235 | { |
236 | if(OnSave != null) | 236 | if (OnSave != null) |
237 | OnSave(this); | 237 | OnSave(this); |
238 | } | 238 | } |
239 | 239 | ||