Merge branch 'master' into careminster

Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
author: Melanie 2013-07-18 10:08:10 +0100
committer: Melanie 2013-07-18 10:08:10 +0100
commit: 7830cc995471120892a24a39e86283774fa07c4c (patch)
tree: d3f46b4f3ce95bb8572511c6f12c9f8ca86922c8 /OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
parent: Merge branch 'master' into careminster (diff)
parent: Document obscure Groups config related to the user level required for creatin... (diff)
download: opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.zip
opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.gz
opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.bz2
opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.xz
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
index 410916f..2567c8f 100644
--- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Services.HypergridService
                LogManager.GetLogger(
                MethodBase.GetCurrentMethod().DeclaringType);
-        private string m_HomeURL;
+//        private string m_HomeURL;
        private IUserAccountService m_UserAccountService;
        private IAvatarService m_AvatarService;
@@ -96,8 +96,8 @@ namespace OpenSim.Services.HypergridService
                if (m_AvatarService == null)
                    throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));
-                m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
+//                m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
-                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); 
+//                    new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty); 
 //                m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
            }
author	Melanie	2013-07-18 10:08:10 +0100
committer	Melanie	2013-07-18 10:08:10 +0100
commit	7830cc995471120892a24a39e86283774fa07c4c (patch)
tree	d3f46b4f3ce95bb8572511c6f12c9f8ca86922c8 /OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
parent	Merge branch 'master' into careminster (diff)
parent	Document obscure Groups config related to the user level required for creatin... (diff)
download	opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.zip opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.gz opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.bz2 opensim-SC_OLD-7830cc995471120892a24a39e86283774fa07c4c.tar.xz

diff --git a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs index 410916f..2567c8f 100644 --- a/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGSuitcaseInventoryService.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Services.HypergridService
54	LogManager.GetLogger(	54	LogManager.GetLogger(
55	MethodBase.GetCurrentMethod().DeclaringType);	55	MethodBase.GetCurrentMethod().DeclaringType);
56		56
57	private string m_HomeURL;	57	// private string m_HomeURL;
58	private IUserAccountService m_UserAccountService;	58	private IUserAccountService m_UserAccountService;
59	private IAvatarService m_AvatarService;	59	private IAvatarService m_AvatarService;
60		60
@@ -96,8 +96,8 @@ namespace OpenSim.Services.HypergridService
96	if (m_AvatarService == null)	96	if (m_AvatarService == null)
97	throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));	97	throw new Exception(String.Format("Unable to create m_AvatarService from {0}", avatarDll));
98		98
99	m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",	99	// m_HomeURL = Util.GetConfigVarFromSections<string>(config, "HomeURI",
100	new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty);	100	// new string[] { "Startup", "Hypergrid", m_ConfigName }, String.Empty);
101		101
102	// m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);	102	// m_Cache = UserAccountCache.CreateUserAccountCache(m_UserAccountService);
103	}	103	}