ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-09 18:55:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

*Master User is now set up

Browse Source 
*Added support for getting user profile information from remote grid server (untested)
*Updated prebuild.xml
This commit is contained in:
mingchen
2007-06-28 16:17:20 +00:00
parent e1ebfaef63
commit 108d89f894
43 changed files with 389 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenSim/Framework/Communications/CommunicationsManager.cs
View File

@@ -43,9 +43,10 @@ namespace OpenSim.Framework.Communications
public IGridServices GridServer;
public IInterRegionCommunications InterRegion;
public NetworkServersInfo ServersInfo;
public CommunicationsManager(NetworkServersInfo serversInfo)
{
ServersInfo = serversInfo;
}
}
}

6
OpenSim/Framework/Communications/OpenSim.Framework.Communications.csproj
View File

@@ -86,9 +86,6 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="CommunicationsManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IGridServices.cs">
<SubType>Code</SubType>
</Compile>
@@ -98,6 +95,9 @@
<Compile Include="IUserServices.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CommunicationsManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>

2
OpenSim/Framework/Communications/OpenSim.Framework.Communications.dll.build
View File

@@ -11,10 +11,10 @@
<resources prefix="OpenSim.Framework.Communications" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="CommunicationsManager.cs" />
<include name="IGridServices.cs" />
<include name="IInterRegionCommunications.cs" />
<include name="IUserServices.cs" />
<include name="CommunicationsManager.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

4
OpenSim/Framework/Console/OpenSim.Framework.Console.csproj
View File

@@ -69,10 +69,10 @@
<Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ConsoleCallbacksBase.cs">
<Compile Include="LogBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LogBase.cs">
<Compile Include="ConsoleCallbacksBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MainLog.cs">

2
OpenSim/Framework/Console/OpenSim.Framework.Console.dll.build
View File

@@ -12,8 +12,8 @@
</resources>
<sources failonempty="true">
<include name="AssemblyInfo.cs" />
<include name="ConsoleCallbacksBase.cs" />
<include name="LogBase.cs" />
<include name="ConsoleCallbacksBase.cs" />
<include name="MainLog.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

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

@@ -88,13 +88,13 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="DB4oGridData.cs">
<Compile Include="DB4oUserData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="DB4oManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="DB4oUserData.cs">
<Compile Include="DB4oGridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

4
OpenSim/Framework/Data.DB4o/OpenSim.Framework.Data.DB4o.dll.build
View File

@@ -11,9 +11,9 @@
<resources prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="DB4oGridData.cs" />
<include name="DB4oManager.cs" />
<include name="DB4oUserData.cs" />
<include name="DB4oManager.cs" />
<include name="DB4oGridData.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

10
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="MySQLLogData.cs">
<Compile Include="MySQLUserData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLUserData.cs">
<Compile Include="MySQLLogData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLGridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">

6
OpenSim/Framework/Data.MySQL/OpenSim.Framework.Data.MySQL.dll.build
View File

@@ -11,11 +11,11 @@
<resources prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="MySQLGridData.cs" />
<include name="MySQLInventoryData.cs" />
<include name="MySQLLogData.cs" />
<include name="MySQLManager.cs" />
<include name="MySQLUserData.cs" />
<include name="MySQLManager.cs" />
<include name="MySQLLogData.cs" />
<include name="MySQLGridData.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

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

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

2
OpenSim/Framework/Data.SQLite/OpenSim.Framework.Data.SQLite.dll.build
View File

@@ -11,8 +11,8 @@
<resources prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="SQLiteGridData.cs" />
<include name="SQLiteManager.cs" />
<include name="SQLiteGridData.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">

12
OpenSim/Framework/Data/OpenSim.Framework.Data.csproj
View File

@@ -78,9 +78,15 @@
<ItemGroup>
</ItemGroup>
<ItemGroup>
<Compile Include="ReservationData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="GridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfileData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ILogData.cs">
<SubType>Code</SubType>
</Compile>
@@ -90,12 +96,6 @@
<Compile Include="InventoryData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ReservationData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfileData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UserData.cs">
<SubType>Code</SubType>
</Compile>

4
OpenSim/Framework/Data/OpenSim.Framework.Data.dll.build
View File

@@ -11,12 +11,12 @@
<resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="ReservationData.cs" />
<include name="GridData.cs" />
<include name="SimProfileData.cs" />
<include name="ILogData.cs" />
<include name="IniConfig.cs" />
<include name="InventoryData.cs" />
<include name="ReservationData.cs" />
<include name="SimProfileData.cs" />
<include name="UserData.cs" />
<include name="UserProfileData.cs" />
<include name="Properties/AssemblyInfo.cs" />

72
OpenSim/Framework/General/OpenSim.Framework.csproj
View File

@@ -91,76 +91,85 @@
<Compile Include="AgentInventory.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Util.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AuthenticateSessionBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="BlockingQueue.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IRegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Logger.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LoginService.cs">
<Compile Include="Remoting.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Remoting.cs">
<Compile Include="LoginService.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfile.cs">
<Compile Include="BlockingQueue.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UserProfile.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Util.cs">
<Compile Include="IRegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfile.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\AuthenticateResponse.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IUserServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IAssetServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IWorld.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IClientAPI.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\ILocalStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IUserServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IWorld.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IGenericConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IUserConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentCiruitData.cs">
<Compile Include="Types\NeighbourInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionHandle.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\ParcelData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentWearable.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetBase.cs">
<Compile Include="Types\PrimData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetLandmark.cs">
<Compile Include="Types\MapBlockData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetStorage.cs">
@@ -169,30 +178,21 @@
<Compile Include="Types\EstateSettings.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\Login.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\MapBlockData.cs">
<Compile Include="Types\AssetLandmark.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\NeighbourInfo.cs">
<Compile Include="Types\AssetBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\NetworkServersInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\ParcelData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\PrimData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionHandle.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionInfo.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup>

46
OpenSim/Framework/General/OpenSim.Framework.dll.build
View File

@@ -12,40 +12,40 @@
</resources>
<sources failonempty="true">
<include name="AgentInventory.cs" />
<include name="AuthenticateSessionBase.cs" />
<include name="BlockingQueue.cs" />
<include name="IRegionCommsListener.cs" />
<include name="Logger.cs" />
<include name="LoginService.cs" />
<include name="RegionCommsListener.cs" />
<include name="Remoting.cs" />
<include name="SimProfile.cs" />
<include name="UserProfile.cs" />
<include name="Util.cs" />
<include name="AuthenticateSessionBase.cs" />
<include name="Logger.cs" />
<include name="Remoting.cs" />
<include name="RegionCommsListener.cs" />
<include name="LoginService.cs" />
<include name="BlockingQueue.cs" />
<include name="UserProfile.cs" />
<include name="IRegionCommsListener.cs" />
<include name="SimProfile.cs" />
<include name="Interfaces/AuthenticateResponse.cs" />
<include name="Interfaces/IUserServer.cs" />
<include name="Interfaces/IAssetServer.cs" />
<include name="Interfaces/IWorld.cs" />
<include name="Interfaces/IClientAPI.cs" />
<include name="Interfaces/ILocalStorage.cs" />
<include name="Interfaces/IUserServer.cs" />
<include name="Interfaces/IWorld.cs" />
<include name="Interfaces/Config/IGenericConfig.cs" />
<include name="Interfaces/Config/IGridConfig.cs" />
<include name="Interfaces/Config/IUserConfig.cs" />
<include name="Interfaces/Config/IGridConfig.cs" />
<include name="Properties/AssemblyInfo.cs" />
<include name="Types/AgentCiruitData.cs" />
<include name="Types/AgentWearable.cs" />
<include name="Types/AssetBase.cs" />
<include name="Types/AssetLandmark.cs" />
<include name="Types/AssetStorage.cs" />
<include name="Types/EstateSettings.cs" />
<include name="Types/Login.cs" />
<include name="Types/MapBlockData.cs" />
<include name="Types/NeighbourInfo.cs" />
<include name="Types/NetworkServersInfo.cs" />
<include name="Types/ParcelData.cs" />
<include name="Types/PrimData.cs" />
<include name="Types/RegionHandle.cs" />
<include name="Types/RegionInfo.cs" />
<include name="Types/ParcelData.cs" />
<include name="Types/AgentWearable.cs" />
<include name="Types/PrimData.cs" />
<include name="Types/MapBlockData.cs" />
<include name="Types/AssetStorage.cs" />
<include name="Types/EstateSettings.cs" />
<include name="Types/AgentCiruitData.cs" />
<include name="Types/Login.cs" />
<include name="Types/AssetLandmark.cs" />
<include name="Types/AssetBase.cs" />
<include name="Types/NetworkServersInfo.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>

39
OpenSim/Framework/General/Types/NetworkServersInfo.cs
View File

@@ -156,6 +156,45 @@ namespace OpenSim.Framework.Types
this.GridRecvKey = attri;
}
//Grid Server
attri = "";
attri = configData.GetAttribute("UserServerURL");
if (attri == "")
{
this.UserURL= OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("User server URL", "http://127.0.0.1:8002/");
configData.SetAttribute("UserServerURL", this.UserURL);
}
else
{
this.UserURL = attri;
}
//Grid Send Key
attri = "";
attri = configData.GetAttribute("UserSendKey");
if (attri == "")
{
this.UserSendKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to send to user server", "null");
configData.SetAttribute("UserSendKey", this.UserSendKey);
}
else
{
this.UserSendKey = attri;
}
//Grid Receive Key
attri = "";
attri = configData.GetAttribute("UserRecvKey");
if (attri == "")
{
this.UserRecvKey = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Key to expect from user server", "null");
configData.SetAttribute("GridRecvKey", this.UserRecvKey);
}
else
{
this.UserRecvKey = attri;
}
attri = "";
attri = configData.GetAttribute("AssetServerURL");
if (attri == "")

10
OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj
View File

@@ -90,19 +90,19 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="BaseHttpServer.cs">
<Compile Include="IRestHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="XmlRpcMethod.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CheckSumServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="IRestHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UDPServerBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="XmlRpcMethod.cs">
<Compile Include="BaseHttpServer.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup>

6
OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build
View File

@@ -11,11 +11,11 @@
<resources prefix="OpenSim.Framework.Servers" dynamicprefix="true" >
</resources>
<sources failonempty="true">
<include name="BaseHttpServer.cs" />
<include name="CheckSumServer.cs" />
<include name="IRestHandler.cs" />
<include name="UDPServerBase.cs" />
<include name="XmlRpcMethod.cs" />
<include name="CheckSumServer.cs" />
<include name="UDPServerBase.cs" />
<include name="BaseHttpServer.cs" />
</sources>
<references basedir="${project::get-base-directory()}">
<lib>