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/HGInventoryService.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/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs
index 9ee1ae4..4b02698 100644
--- a/OpenSim/Services/HypergridService/HGInventoryService.cs
+++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Services.HypergridService
                LogManager.GetLogger(
                MethodBase.GetCurrentMethod().DeclaringType);
-        protected new IXInventoryData m_Database;
+        protected IXInventoryData m_Database;
        private string m_ProfileServiceURL;
        private IUserAccountService m_UserAccountService;
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/HGInventoryService.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/HGInventoryService.cs b/OpenSim/Services/HypergridService/HGInventoryService.cs index 9ee1ae4..4b02698 100644 --- a/OpenSim/Services/HypergridService/HGInventoryService.cs +++ b/OpenSim/Services/HypergridService/HGInventoryService.cs
@@ -53,7 +53,7 @@ namespace OpenSim.Services.HypergridService
53	LogManager.GetLogger(	53	LogManager.GetLogger(
54	MethodBase.GetCurrentMethod().DeclaringType);	54	MethodBase.GetCurrentMethod().DeclaringType);
55		55
56	protected new IXInventoryData m_Database;	56	protected IXInventoryData m_Database;
57		57
58	private string m_ProfileServiceURL;	58	private string m_ProfileServiceURL;
59	private IUserAccountService m_UserAccountService;	59	private IUserAccountService m_UserAccountService;