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/Framework/Communications/CommunicationsManager.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-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.zip opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.gz opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.bz2 opensim-SC-9dcf7da42abfaf20a6a2ec552868dd37cc3e7261.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into x-opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/Communications/CommunicationsManager.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/CommunicationsManager.cs b/OpenSim/Framework/Communications/CommunicationsManager.cs index 9f377a6..2410f31 100644 --- a/OpenSim/Framework/Communications/CommunicationsManager.cs +++ b/OpenSim/Framework/Communications/CommunicationsManager.cs | |||
@@ -90,8 +90,8 @@ namespace OpenSim.Framework.Communications | |||
90 | public IUserAdminService UserAdminService | 90 | public IUserAdminService UserAdminService |
91 | { | 91 | { |
92 | get { return m_userAdminService; } | 92 | get { return m_userAdminService; } |
93 | } | 93 | } |
94 | protected IUserAdminService m_userAdminService; | 94 | protected IUserAdminService m_userAdminService; |
95 | 95 | ||
96 | /// <summary> | 96 | /// <summary> |
97 | /// Constructor | 97 | /// Constructor |