aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorJeff Ames2008-07-23 13:24:25 +0000
committerJeff Ames2008-07-23 13:24:25 +0000
commit80d8e2889e62d8900837d37a800a4eeaae5ffc5a (patch)
tree47bdf0f48ae8ace3bb7cd10ab91d91b52b96f80e /OpenSim/Framework/Communications
parentget rid of some LLQuaternion == null checks. Because LLQuaternion is (diff)
downloadopensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.zip
opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.gz
opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.bz2
opensim-SC-80d8e2889e62d8900837d37a800a4eeaae5ffc5a.tar.xz
Update svn properties. Formatting cleanup. Remove a compiler warning.
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs2
-rw-r--r--OpenSim/Framework/Communications/Cache/CachedUserInfo.cs2
2 files changed, 2 insertions, 2 deletions
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 }