ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 03:06:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

*Fixed all renaming for OpenGridServices.sln, still a reference issue in prebuild.xml though

Browse Source
This commit is contained in:
mingchen
2007-06-27 18:04:07 +00:00
parent 1dcc814b70
commit 2261e4ec2a
28 changed files with 251 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,18 +38,18 @@ using OpenSim.Framework.Sims;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Console;
using OpenSim.Servers;
using OpenSim.Framework.Servers;
using OpenSim.Framework.Utilities;
using OpenSim.GenericConfig;
namespace OpenGridServices.UserServer
namespace OpenSim.Grid.UserServer
{
/// <summary>
/// </summary>
public class OpenUser_Main : conscmd_callback
{
private string ConfigDll = "OpenUser.Config.UserConfigDb4o.dll";
private string StorageDll = "OpenGrid.Framework.Data.MySQL.dll";
private string StorageDll = "OpenSim.Framework.Data.MySQL.dll";
private UserConfig Cfg;
protected IGenericConfig localXMLConfig;
@@ -169,8 +169,8 @@ namespace OpenGridServices.UserServer
attri = configData.GetAttribute("DataBaseProvider");
if (attri == "")
{
StorageDll = "OpenGrid.Framework.Data.DB4o.dll";
configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
StorageDll = "OpenSim.Framework.Data.DB4o.dll";
configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
}
else
{

4
OpenSim/Grid/UserServer/OpenSim.Grid.UserServer.csproj
View File

@@ -112,10 +112,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Main.cs">
<Compile Include="UserManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UserManager.cs">
<Compile Include="Main.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

7
OpenSim/Grid/UserServer/UserManager.cs
View File

@@ -29,7 +29,7 @@ using System;
using System.Collections;
using System.Collections.Generic;
using System.Text;
using OpenGrid.Framework.Data;
using OpenSim.Framework.Data;
using libsecondlife;
using System.Reflection;
@@ -38,11 +38,12 @@ using Nwc.XmlRpc;
using OpenSim.Framework.Sims;
using OpenSim.Framework.Inventory;
using OpenSim.Framework.Utilities;
using OpenGrid.Framework.UserManagement;
using OpenSim.Framework.UserManagement;
using System.Security.Cryptography;
namespace OpenGridServices.UserServer
namespace OpenSim.Grid.UserServer
{
public class UserManager : UserManagerBase
{