OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* minor: remove unused grid send/receive keys from user server configuration

0.6.0-stable
Justin Clarke Casey 2008-08-09 20:41:18 +00:00
parent f1c897695b
commit 0fd2bde111
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -46,7 +46,6 @@ namespace OpenSim.Framework.Communications
private static readonly ILog m_log private static readonly ILog m_log
= LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public UserConfig _config;
private List<IUserDataPlugin> _plugins = new List<IUserDataPlugin>(); private List<IUserDataPlugin> _plugins = new List<IUserDataPlugin>();
/// <summary> /// <summary>

2
OpenSim/Grid/MessagingServer/MessageService.cs
View File

@ -68,12 +68,10 @@ namespace OpenSim.Grid.MessagingServer
uc.DatabaseConnect = cfg.DatabaseConnect; uc.DatabaseConnect = cfg.DatabaseConnect;
uc.DatabaseProvider = cfg.DatabaseProvider; uc.DatabaseProvider = cfg.DatabaseProvider;
m_userManager._config = uc;
m_userManager.AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect); m_userManager.AddPlugin(cfg.DatabaseProvider, cfg.DatabaseConnect);
} }
#region FriendList Methods #region FriendList Methods
/// <summary> /// <summary>

16
OpenSim/Grid/UserServer/Main.cs
View File

@ -99,12 +99,11 @@ namespace OpenSim.Grid.UserServer
m_log.Info("[REGION]: Establishing data connection"); m_log.Info("[REGION]: Establishing data connection");
m_userManager = new UserManager(); m_userManager = new UserManager();
m_userManager._config = Cfg;
m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect); m_userManager.AddPlugin(Cfg.DatabaseProvider, Cfg.DatabaseConnect);
m_gridInfoService = new GridInfoService(); m_gridInfoService = new GridInfoService();
m_interServiceInventoryService = new OGS1InterServiceInventoryService(m_userManager._config.InventoryUrl); m_interServiceInventoryService = new OGS1InterServiceInventoryService(Cfg.InventoryUrl);
m_loginService = new UserLoginService( m_loginService = new UserLoginService(
m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg); m_userManager, m_interServiceInventoryService, new LibraryRootFolder(), Cfg, Cfg.DefaultStartupMsg);
@ -216,7 +215,7 @@ namespace OpenSim.Grid.UserServer
{ {
m_log.ErrorFormat( m_log.ErrorFormat(
"[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}", "[USERS]: Could not contact the inventory service at {0} to create an inventory for {1}",
m_userManager._config.InventoryUrl + "CreateInventory/", userID.UUID); Cfg.InventoryUrl + "CreateInventory/", userID.UUID);
} }
catch (Exception e) catch (Exception e)
{ {
@ -247,13 +246,10 @@ namespace OpenSim.Grid.UserServer
// RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>(); // RestObjectPosterResponse<List<InventoryFolderBase>> requester = new RestObjectPosterResponse<List<InventoryFolderBase>>();
// requester.ReturnResponseVal = TestResponse; // requester.ReturnResponseVal = TestResponse;
// requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser); // requester.BeginPostObject<LLUUID>(m_userManager._config.InventoryUrl + "RootFolders/", m_lastCreatedUser);
SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>("POST", SynchronousRestObjectPoster.BeginPostObject<LLUUID, List<InventoryFolderBase>>(
m_userManager. "POST", Cfg.InventoryUrl + "RootFolders/", m_lastCreatedUser);
_config. break;
InventoryUrl +
"RootFolders/",
m_lastCreatedUser);
break;
case "logoff-user": case "logoff-user":
if (cmdparams.Length >= 3) if (cmdparams.Length >= 3)