Merge branch 'master' into careminster-presence-refactor

author: Melanie 2010-08-01 18:00:04 +0100
committer: Melanie 2010-08-01 18:00:04 +0100
commit: 5f94b98cb2cbef74d1aea8d38d78d58a5aea2920 (patch)
tree: 114ccf34f9a444ad909cf44b8cede577425822b1 /OpenSim/Services/GridService/GridService.cs
parent: Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLR... (diff)
parent: Renamed variables in RemoteAdmin plugin to be closer to the coding standards. (diff)
download: opensim-SC-5f94b98cb2cbef74d1aea8d38d78d58a5aea2920.zip
opensim-SC-5f94b98cb2cbef74d1aea8d38d78d58a5aea2920.tar.gz
opensim-SC-5f94b98cb2cbef74d1aea8d38d78d58a5aea2920.tar.bz2
opensim-SC-5f94b98cb2cbef74d1aea8d38d78d58a5aea2920.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 46d72dc..f49d86d 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Services.GridService
        private bool m_DeleteOnUnregister = true;
        private static GridService m_RootInstance = null;
        protected IConfigSource m_config;
-        protected HypergridLinker m_HypergridLinker;
+        protected static HypergridLinker m_HypergridLinker;
        protected IAuthenticationService m_AuthenticationService = null;
        protected bool m_AllowDuplicateNames = false;
author	Melanie	2010-08-01 18:00:04 +0100
committer	Melanie	2010-08-01 18:00:04 +0100
commit	5f94b98cb2cbef74d1aea8d38d78d58a5aea2920 (patch)
tree	114ccf34f9a444ad909cf44b8cede577425822b1 /OpenSim/Services/GridService/GridService.cs
parent	Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLR... (diff)
parent	Renamed variables in RemoteAdmin plugin to be closer to the coding standards. (diff)
download	opensim-SC-5f94b98cb2cbef74d1aea8d38d78d58a5aea2920.zip opensim-SC-5f94b98cb2cbef74d1aea8d38d78d58a5aea2920.tar.gz opensim-SC-5f94b98cb2cbef74d1aea8d38d78d58a5aea2920.tar.bz2 opensim-SC-5f94b98cb2cbef74d1aea8d38d78d58a5aea2920.tar.xz

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs index 46d72dc..f49d86d 100644 --- a/OpenSim/Services/GridService/GridService.cs +++ b/OpenSim/Services/GridService/GridService.cs
@@ -50,7 +50,7 @@ namespace OpenSim.Services.GridService
50	private bool m_DeleteOnUnregister = true;	50	private bool m_DeleteOnUnregister = true;
51	private static GridService m_RootInstance = null;	51	private static GridService m_RootInstance = null;
52	protected IConfigSource m_config;	52	protected IConfigSource m_config;
53	protected HypergridLinker m_HypergridLinker;	53	protected static HypergridLinker m_HypergridLinker;
54		54
55	protected IAuthenticationService m_AuthenticationService = null;	55	protected IAuthenticationService m_AuthenticationService = null;
56	protected bool m_AllowDuplicateNames = false;	56	protected bool m_AllowDuplicateNames = false;