Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2011-01-17 17:41:06 -0800
committer: Diva Canto 2011-01-17 17:41:06 -0800
commit: a07375a7ae187b57371a508300ffcacbabf5a4df (patch)
tree: 3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Services/HypergridService/GatekeeperService.cs
parent: Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff)
parent: force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff)
download: opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.zip
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2
opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs
index bbddd87..b66bfed 100644
--- a/OpenSim/Services/HypergridService/GatekeeperService.cs
+++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -303,7 +303,7 @@ namespace OpenSim.Services.HypergridService
                return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
            else
            {
-                Object[] args = new Object[] { userURL };
+//                Object[] args = new Object[] { userURL };
                IUserAgentService userAgentService = new UserAgentServiceConnector(userURL); 
                if (userAgentService != null)
                {
author	Diva Canto	2011-01-17 17:41:06 -0800
committer	Diva Canto	2011-01-17 17:41:06 -0800
commit	a07375a7ae187b57371a508300ffcacbabf5a4df (patch)
tree	3ee2ea5ff91a65c6b96d185c1352d37e9c3dffa9 /OpenSim/Services/HypergridService/GatekeeperService.cs
parent	Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, bec... (diff)
parent	force objectId to UUID.Zero for non-overridden animations in AvatarAnimation ... (diff)
download	opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.zip opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.gz opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.bz2 opensim-SC_OLD-a07375a7ae187b57371a508300ffcacbabf5a4df.tar.xz

diff --git a/OpenSim/Services/HypergridService/GatekeeperService.cs b/OpenSim/Services/HypergridService/GatekeeperService.cs index bbddd87..b66bfed 100644 --- a/OpenSim/Services/HypergridService/GatekeeperService.cs +++ b/OpenSim/Services/HypergridService/GatekeeperService.cs
@@ -303,7 +303,7 @@ namespace OpenSim.Services.HypergridService
303	return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);	303	return m_UserAgentService.VerifyAgent(aCircuit.SessionID, aCircuit.ServiceSessionID);
304	else	304	else
305	{	305	{
306	Object[] args = new Object[] { userURL };	306	// Object[] args = new Object[] { userURL };
307	IUserAgentService userAgentService = new UserAgentServiceConnector(userURL);	307	IUserAgentService userAgentService = new UserAgentServiceConnector(userURL);
308	if (userAgentService != null)	308	if (userAgentService != null)
309	{	309	{