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

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

Sugilite
mingchen 2007-06-27 18:04:07 +00:00
parent 1dcc814b70
commit 2261e4ec2a
28 changed files with 251 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
OpenSim.sln
View File

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C# Express 2005
# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim", "OpenSim\Region\Application\OpenSim.csproj", "{438A9556-0000-0000-0000-000000000000}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework", "OpenSim\Framework\General\OpenSim.Framework.csproj", "{8ACA2445-0000-0000-0000-000000000000}"
@ -55,6 +55,81 @@ Global
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution
({438A9556-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).6 = ({C74E4A30-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).7 = ({2CC71860-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).8 = ({586E2916-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).9 = ({61FCCDB3-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).10 = ({DC3698B2-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).11 = ({BFB5D807-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).12 = ({4806E378-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).13 = ({DCBA491C-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).14 = ({F4FF31EB-0000-0000-0000-000000000000})
({438A9556-0000-0000-0000-000000000000}).15 = ({C9E0F891-0000-0000-0000-000000000000})
({8ACA2445-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
({CB52B7E7-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({CB52B7E7-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000})
({C74E4A30-0000-0000-0000-000000000000}).0 = ({8ACA2445-0000-0000-0000-000000000000})
({2CC71860-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({2CC71860-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
({586E2916-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
({586E2916-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
({586E2916-0000-0000-0000-000000000000}).5 = ({C74E4A30-0000-0000-0000-000000000000})
({586E2916-0000-0000-0000-000000000000}).6 = ({2CC71860-0000-0000-0000-000000000000})
({61FCCDB3-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({DC3698B2-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
({DC3698B2-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
({DC3698B2-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
({DC3698B2-0000-0000-0000-000000000000}).7 = ({61FCCDB3-0000-0000-0000-000000000000})
({DC3698B2-0000-0000-0000-000000000000}).8 = ({F4FF31EB-0000-0000-0000-000000000000})
({DC3698B2-0000-0000-0000-000000000000}).9 = ({C9E0F891-0000-0000-0000-000000000000})
({BFB5D807-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({BFB5D807-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
({BFB5D807-0000-0000-0000-000000000000}).3 = ({36B72A9B-0000-0000-0000-000000000000})
({BFB5D807-0000-0000-0000-000000000000}).4 = ({586E2916-0000-0000-0000-000000000000})
({4806E378-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({4806E378-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
({4806E378-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
({4806E378-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000})
({4806E378-0000-0000-0000-000000000000}).5 = ({2CC71860-0000-0000-0000-000000000000})
({DCBA491C-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
({DCBA491C-0000-0000-0000-000000000000}).4 = ({CB52B7E7-0000-0000-0000-000000000000})
({DCBA491C-0000-0000-0000-000000000000}).5 = ({A7CD0630-0000-0000-0000-000000000000})
({DCBA491C-0000-0000-0000-000000000000}).6 = ({C74E4A30-0000-0000-0000-000000000000})
({DCBA491C-0000-0000-0000-000000000000}).7 = ({2CC71860-0000-0000-0000-000000000000})
({DCBA491C-0000-0000-0000-000000000000}).8 = ({61FCCDB3-0000-0000-0000-000000000000})
({DCBA491C-0000-0000-0000-000000000000}).9 = ({F4FF31EB-0000-0000-0000-000000000000})
({DCBA491C-0000-0000-0000-000000000000}).10 = ({C9E0F891-0000-0000-0000-000000000000})
({241A8CDD-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
({241A8CDD-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
({98C7B681-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({98C7B681-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
({15B4FEF3-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
({F4FF31EB-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({F4FF31EB-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
({90620634-0000-0000-0000-000000000000}).2 = ({F4FF31EB-0000-0000-0000-000000000000})
({A6D191D8-0000-0000-0000-000000000000}).1 = ({F4FF31EB-0000-0000-0000-000000000000})
({A4691E59-0000-0000-0000-000000000000}).3 = ({8ACA2445-0000-0000-0000-000000000000})
({A4691E59-0000-0000-0000-000000000000}).4 = ({A7CD0630-0000-0000-0000-000000000000})
({43DB702D-0000-0000-0000-000000000000}).2 = ({8ACA2445-0000-0000-0000-000000000000})
({43DB702D-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
({477B9270-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({477B9270-0000-0000-0000-000000000000}).2 = ({A7CD0630-0000-0000-0000-000000000000})
({24B12448-0000-0000-0000-000000000000}).1 = ({8ACA2445-0000-0000-0000-000000000000})
({24B12448-0000-0000-0000-000000000000}).2 = ({CB52B7E7-0000-0000-0000-000000000000})
({24B12448-0000-0000-0000-000000000000}).3 = ({A7CD0630-0000-0000-0000-000000000000})
({24B12448-0000-0000-0000-000000000000}).4 = ({2CC71860-0000-0000-0000-000000000000})
({24B12448-0000-0000-0000-000000000000}).5 = ({61FCCDB3-0000-0000-0000-000000000000})
({24B12448-0000-0000-0000-000000000000}).6 = ({DC3698B2-0000-0000-0000-000000000000})
({24B12448-0000-0000-0000-000000000000}).7 = ({BFB5D807-0000-0000-0000-000000000000})
({24B12448-0000-0000-0000-000000000000}).8 = ({DCBA491C-0000-0000-0000-000000000000})
({24B12448-0000-0000-0000-000000000000}).9 = ({241A8CDD-0000-0000-0000-000000000000})
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{438A9556-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU

4
OpenSim/Framework/Data.DB4o/Properties/AssemblyInfo.cs
View File

@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("OpenGrid.Framework.Data.DB4o")]
[assembly: AssemblyTitle("OpenSim.Framework.Data.DB4o")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("OpenGrid.Framework.Data.DB4o")]
[assembly: AssemblyProduct("OpenSim.Framework.Data.DB4o")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

4
OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
View File

@ -28,9 +28,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenGrid.Framework.Data;
using OpenSim.Framework.Data;
namespace OpenGrid.Framework.Data.MSSQL
namespace OpenSim.Framework.Data.MSSQL
{
/// <summary>
/// A grid data interface for Microsoft SQL Server

4
OpenSim/Framework/Data.MSSQL/MSSQLManager.cs
View File

@ -32,9 +32,9 @@ using System.Data;
using System.Data.SqlClient;
using OpenGrid.Framework.Data;
using OpenSim.Framework.Data;
namespace OpenGrid.Framework.Data.MSSQL
namespace OpenSim.Framework.Data.MSSQL
{
/// <summary>
/// A management class for the MS SQL Storage Engine

4
OpenSim/Framework/Data.MSSQL/Properties/AssemblyInfo.cs
View File

@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("OpenGrid.Framework.Data.MSSQL")]
[assembly: AssemblyTitle("OpenSim.Framework.Data.MSSQL")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("OpenGrid.Framework.Data.MSSQL")]
[assembly: AssemblyProduct("OpenSim.Framework.Data.MSSQL")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

4
OpenSim/Framework/Data.MySQL/MySQLGridData.cs
View File

@ -28,9 +28,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenGrid.Framework.Data;
using OpenSim.Framework.Data;
namespace OpenGrid.Framework.Data.MySQL
namespace OpenSim.Framework.Data.MySQL
{
/// <summary>
/// A MySQL Interface for the Grid Server

2
OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
View File

@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Text;
using libsecondlife;
namespace OpenGrid.Framework.Data.MySQL
namespace OpenSim.Framework.Data.MySQL
{
/// <summary>
/// A MySQL interface for the inventory server

2
OpenSim/Framework/Data.MySQL/MySQLLogData.cs
View File

@ -29,7 +29,7 @@ using System;
using System.Collections.Generic;
using System.Text;
namespace OpenGrid.Framework.Data.MySQL
namespace OpenSim.Framework.Data.MySQL
{
/// <summary>
/// An interface to the log database for MySQL

4
OpenSim/Framework/Data.MySQL/MySQLManager.cs
View File

@ -36,9 +36,9 @@ using MySql.Data;
using MySql.Data.Types;
using MySql.Data.MySqlClient;
using OpenGrid.Framework.Data;
using OpenSim.Framework.Data;
namespace OpenGrid.Framework.Data.MySQL
namespace OpenSim.Framework.Data.MySQL
{
/// <summary>
/// A MySQL Database manager

4
OpenSim/Framework/Data.MySQL/MySQLUserData.cs
View File

@ -28,10 +28,10 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenGrid.Framework.Data;
using OpenSim.Framework.Data;
using libsecondlife;
namespace OpenGrid.Framework.Data.MySQL
namespace OpenSim.Framework.Data.MySQL
{
/// <summary>
/// A database interface class to a user profile storage system

14
OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.csproj
View File

@ -88,19 +88,19 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="MySQLGridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLInventoryData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLUserData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLLogData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLGridData.cs">
<Compile Include="MySQLManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLUserData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

4
OpenSim/Framework/Data.MySQL/Properties/AssemblyInfo.cs
View File

@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("OpenGrid.Framework.Data.MySQL")]
[assembly: AssemblyTitle("OpenSim.Framework.Data.MySQL")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("OpenGrid.Framework.Data.MySQL")]
[assembly: AssemblyProduct("OpenSim.Framework.Data.MySQL")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

4
OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.csproj
View File

@ -88,10 +88,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="SQLiteManager.cs">
<Compile Include="SQLiteGridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SQLiteGridData.cs">
<Compile Include="SQLiteManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

4
OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
View File

@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("OpenGrid.Framework.Data.SQLite")]
[assembly: AssemblyTitle("OpenSim.Framework.Data.SQLite")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("OpenGrid.Framework.Data.SQLite")]
[assembly: AssemblyProduct("OpenSim.Framework.Data.SQLite")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

4
OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
View File

@ -28,9 +28,9 @@
using System;
using System.Collections.Generic;
using System.Text;
using OpenGrid.Framework.Data;
using OpenSim.Framework.Data;
namespace OpenGrid.Framework.Data.SQLite
namespace OpenSim.Framework.Data.SQLite
{
/// <summary>
/// A Grid Interface to the SQLite database

4
OpenSim/Framework/Data.SQLite/SQLiteManager.cs
View File

@ -32,9 +32,9 @@ using System.Data;
using System.Data.SQLite;
using OpenGrid.Framework.Data;
using OpenSim.Framework.Data;
namespace OpenGrid.Framework.Data.SQLite
namespace OpenSim.Framework.Data.SQLite
{
class SQLiteManager
{

4
OpenSim/Framework/Data/Properties/AssemblyInfo.cs
View File

@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("OpenGrid.Framework.Data")]
[assembly: AssemblyTitle("OpenSim.Framework.Data")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("OpenGrid.Framework.Data")]
[assembly: AssemblyProduct("OpenSim.Framework.Data")]
[assembly: AssemblyCopyright("Copyright © 2007")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

4
OpenSim/Grid/AssetServer/AssetHttpServer.cs
View File

@ -35,9 +35,9 @@ using System.Threading;
using Nwc.XmlRpc;
using System.Collections;
using OpenSim.Framework.Console;
using OpenSim.Servers;
using OpenSim.Framework.Servers;
namespace OpenGridServices.AssetServer
namespace OpenSim.Grid.AssetServer
{
/// <summary>
/// An HTTP server for sending assets

4
OpenSim/Grid/AssetServer/Main.cs
View File

@ -40,11 +40,11 @@ using OpenSim.Framework.Console;
using OpenSim.Framework.Types;
using OpenSim.Framework.Interfaces;
using OpenSim.Framework.Utilities;
using OpenSim.Servers;
using OpenSim.Framework.Servers;
using Db4objects.Db4o;
using Db4objects.Db4o.Query;
namespace OpenGridServices.AssetServer
namespace OpenSim.Grid.AssetServer
{
/// <summary>
/// An asset server

6
OpenSim/Grid/Framework.Manager/GridManagementAgent.cs
View File

@ -27,12 +27,12 @@
*/
using Nwc.XmlRpc;
using OpenSim.Framework;
using OpenSim.Servers;
using OpenSim.Framework.Servers;
using System.Collections;
using System.Collections.Generic;
using libsecondlife;
namespace OpenGrid.Framework.Manager
namespace OpenSim.Framework.Manager
{
/// <summary>
/// Used to pass messages to the gridserver
@ -116,7 +116,7 @@ namespace OpenGrid.Framework.Manager
Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData = new Hashtable();
// TODO: Switch this over to using OpenGrid.Framework.Data
// TODO: Switch this over to using OpenSim.Framework.Data
if (requestData["username"].Equals("admin") && requestData["password"].Equals("supersecret"))
{
response.IsFault = false;

2
OpenSim/Grid/Framework.Manager/GridServerManager.cs
View File

@ -33,7 +33,7 @@ using Nwc.XmlRpc;
using System.Threading;
using libsecondlife;
namespace OpenGrid.Framework.Manager {
namespace OpenSim.Framework.Manager {
/// <summary>
/// A remote management system for the grid server

4
OpenSim/Grid/Framework.Manager/OpenSim.Grid.Framework.Manager.csproj
View File

@ -82,10 +82,10 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<Compile Include="GridManagementAgent.cs">
<Compile Include="GridServerManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="GridServerManager.cs">
<Compile Include="GridManagementAgent.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>

4
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -30,7 +30,7 @@ using System.Collections;
using System.Collections.Generic;
using System.Text;
using System.Reflection;
using OpenGrid.Framework.Data;
using OpenSim.Framework.Data;
using OpenSim.Framework.Utilities;
using OpenSim.Framework.Console;
using OpenSim.Framework.Sims;
@ -38,7 +38,7 @@ using libsecondlife;
using Nwc.XmlRpc;
using System.Xml;
namespace OpenGridServices.GridServer
namespace OpenSim.Grid.GridServer
{
class GridManager
{

12
OpenSim/Grid/GridServer/Main.cs
View File

@ -34,22 +34,22 @@ using System.Net;
using System.Threading;
using System.Reflection;
using libsecondlife;
using OpenGrid.Framework.Manager;
using OpenSim.Framework.Manager;
using OpenSim.Framework;
using OpenSim.Framework.Sims;
using OpenSim.Framework.Console;
using OpenSim.Framework.Interfaces;
using OpenSim.Servers;
using OpenSim.Framework.Servers;
using OpenSim.GenericConfig;
namespace OpenGridServices.GridServer
namespace OpenSim.Grid.GridServer
{
/// <summary>
/// </summary>
public class OpenGrid_Main : conscmd_callback
{
private string ConfigDll = "OpenGrid.Config.GridConfigDb4o.dll";
private string GridDll = "OpenGrid.Framework.Data.MySQL.dll";
private string GridDll = "OpenSim.Framework.Data.MySQL.dll";
public GridConfig Cfg;
public static OpenGrid_Main thegrid;
@ -253,8 +253,8 @@ namespace OpenGridServices.GridServer
attri = configData.GetAttribute("DataBaseProvider");
if (attri == "")
{
GridDll = "OpenGrid.Framework.Data.DB4o.dll";
configData.SetAttribute("DataBaseProvider", "OpenGrid.Framework.Data.DB4o.dll");
GridDll = "OpenSim.Framework.Data.DB4o.dll";
configData.SetAttribute("DataBaseProvider", "OpenSim.Framework.Data.DB4o.dll");
}
else
{

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
{

4
prebuild.xml
View File

@ -469,7 +469,7 @@
</Files>
</Project>
<!-- OpenGridFrameWork.Communications" -->
<!-- OpenSim.Framework.Communications -->
<Project name="OpenSim.Framework.Communications" path="OpenSim/Framework/Communications" type="Library">
<Configuration name="Debug">
<Options>
@ -730,7 +730,7 @@
</Configuration>
<!-- OpenGrid Data Services -->
<!-- OpenSim Data Services -->
<Project name="OpenSim.Framework.Data" path="OpenSim/Framework/Data" type="Library">
<Configuration name="Debug">
<Options>