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

*Removed SimProfile.cs as it is no longer needed (in favor of SimProfileData) 

*Added simulator_data_request XMLRPC method to request data from the grid server about a sim instead of faking its login
*Login is progressing, now just getting an XML error (http://pastebin.com/942515) -- if you can fix this, throw MingChen in IRC a Private Message
Sugilite
mingchen 2007-07-05 15:15:28 +00:00
parent ad86e94b3d
commit 583f2a9de8
40 changed files with 406 additions and 421 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
OpenGridServices.sln
View File

@ -1,5 +1,5 @@
Microsoft Visual Studio Solution File, Format Version 9.00 Microsoft Visual Studio Solution File, Format Version 9.00
# Visual Studio 2005 # Visual C# Express 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data", "OpenSim\Framework\Data\OpenSim.Framework.Data.csproj", "{36B72A9B-0000-0000-0000-000000000000}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Framework.Data.DB4o", "OpenSim\Framework\Data.DB4o\OpenSim.Framework.Data.DB4o.csproj", "{FD2D303D-0000-0000-0000-000000000000}"
@ -25,72 +25,61 @@ EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenSim.Grid.UserServer.Config", "OpenSim\Grid\UserServer.Config\OpenSim.Grid.UserServer.Config.csproj", "{08F87229-0000-0000-0000-000000000000}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectDependencies) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
({FD2D303D-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({17F7F694-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000}) {36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({17F7F6BE-0000-0000-0000-000000000000}).2 = ({36B72A9B-0000-0000-0000-000000000000}) {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({6ECC56A9-0000-0000-0000-000000000000}).1 = ({36B72A9B-0000-0000-0000-000000000000}) {36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({586E2916-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
({60FCC3A6-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) {FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
({60FCC3A6-0000-0000-0000-000000000000}).7 = ({4B7BFD1C-0000-0000-0000-000000000000}) {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
({2FC96F92-0000-0000-0000-000000000000}).4 = ({36B72A9B-0000-0000-0000-000000000000}) {FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
({2FC96F92-0000-0000-0000-000000000000}).7 = ({586E2916-0000-0000-0000-000000000000}) {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
EndGlobalSection {17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
GlobalSection(ProjectConfigurationPlatforms) = postSolution {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{36B72A9B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD2D303D-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F7F694-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{17F7F6BE-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6ECC56A9-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{586E2916-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{586E2916-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E5F1A03B-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4B7BFD1C-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU {08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{60FCC3A6-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{1442B635-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU EndGlobalSection
{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU GlobalSection(SolutionProperties) = preSolution
{1442B635-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU HideSolutionNode = FALSE
{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU EndGlobalSection
{2FC96F92-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2FC96F92-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08F87229-0000-0000-0000-000000000000}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08F87229-0000-0000-0000-000000000000}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal EndGlobal

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

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

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

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

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

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

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

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

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

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

2
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 prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="DB4oUserData.cs" />
<include name="DB4oGridData.cs" /> <include name="DB4oGridData.cs" />
<include name="DB4oManager.cs" /> <include name="DB4oManager.cs" />
<include name="DB4oUserData.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

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

@ -88,19 +88,19 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="MySQLGridData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLInventoryData.cs"> <Compile Include="MySQLInventoryData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="MySQLLogData.cs"> <Compile Include="MySQLUserData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="MySQLManager.cs"> <Compile Include="MySQLManager.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="MySQLUserData.cs"> <Compile Include="MySQLLogData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MySQLGridData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <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 prefix="OpenSim.Framework.Data.MySQL" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="MySQLGridData.cs" />
<include name="MySQLInventoryData.cs" /> <include name="MySQLInventoryData.cs" />
<include name="MySQLLogData.cs" />
<include name="MySQLManager.cs" />
<include name="MySQLUserData.cs" /> <include name="MySQLUserData.cs" />
<include name="MySQLManager.cs" />
<include name="MySQLLogData.cs" />
<include name="MySQLGridData.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

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

@ -88,10 +88,10 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="SQLiteGridData.cs"> <Compile Include="SQLiteManager.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="SQLiteManager.cs"> <Compile Include="SQLiteGridData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <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 prefix="OpenSim.Framework.Data.SQLite" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="SQLiteGridData.cs" />
<include name="SQLiteManager.cs" /> <include name="SQLiteManager.cs" />
<include name="SQLiteGridData.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

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

@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<ProjectType>Local</ProjectType> <ProjectType>Local</ProjectType>
<ProductVersion>8.0.50727</ProductVersion> <ProductVersion>8.0.50727</ProductVersion>
@ -6,7 +6,8 @@
<ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid> <ProjectGuid>{36B72A9B-0000-0000-0000-000000000000}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon></ApplicationIcon> <ApplicationIcon>
</ApplicationIcon>
<AssemblyKeyContainerName> <AssemblyKeyContainerName>
</AssemblyKeyContainerName> </AssemblyKeyContainerName>
<AssemblyName>OpenSim.Framework.Data</AssemblyName> <AssemblyName>OpenSim.Framework.Data</AssemblyName>
@ -15,9 +16,11 @@
<DefaultTargetSchema>IE50</DefaultTargetSchema> <DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign> <DelaySign>false</DelaySign>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder></AppDesignerFolder> <AppDesignerFolder>
</AppDesignerFolder>
<RootNamespace>OpenSim.Framework.Data</RootNamespace> <RootNamespace>OpenSim.Framework.Data</RootNamespace>
<StartupObject></StartupObject> <StartupObject>
</StartupObject>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
</PropertyGroup> </PropertyGroup>
@ -28,7 +31,8 @@
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE;DEBUG</DefineConstants> <DefineConstants>TRACE;DEBUG</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile>
</DocumentationFile>
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>False</Optimize> <Optimize>False</Optimize>
@ -37,7 +41,8 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn>
</NoWarn>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@ -46,7 +51,8 @@
<ConfigurationOverrideFile> <ConfigurationOverrideFile>
</ConfigurationOverrideFile> </ConfigurationOverrideFile>
<DefineConstants>TRACE</DefineConstants> <DefineConstants>TRACE</DefineConstants>
<DocumentationFile></DocumentationFile> <DocumentationFile>
</DocumentationFile>
<DebugSymbols>False</DebugSymbols> <DebugSymbols>False</DebugSymbols>
<FileAlignment>4096</FileAlignment> <FileAlignment>4096</FileAlignment>
<Optimize>True</Optimize> <Optimize>True</Optimize>
@ -55,29 +61,34 @@
<RemoveIntegerChecks>False</RemoveIntegerChecks> <RemoveIntegerChecks>False</RemoveIntegerChecks>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors> <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<NoWarn></NoWarn> <NoWarn>
</NoWarn>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="libsecondlife.dll" > <Reference Include="libsecondlife.dll">
<HintPath>..\..\..\bin\libsecondlife.dll</HintPath> <HintPath>..\..\..\bin\libsecondlife.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System" > <Reference Include="System">
<HintPath>System.dll</HintPath> <HintPath>System.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Data" > <Reference Include="System.Data">
<HintPath>System.Data.dll</HintPath> <HintPath>System.Data.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="System.Xml" > <Reference Include="System.Xml">
<HintPath>System.Xml.dll</HintPath> <HintPath>System.Xml.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<Reference Include="XMLRPC, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ReservationData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="GridData.cs"> <Compile Include="GridData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -90,18 +101,15 @@
<Compile Include="InventoryData.cs"> <Compile Include="InventoryData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ReservationData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfileData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UserData.cs"> <Compile Include="UserData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="UserProfileData.cs"> <Compile Include="UserProfileData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="SimProfileData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

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

@ -11,14 +11,14 @@
<resources prefix="OpenSim.Framework.Data" dynamicprefix="true" > <resources prefix="OpenSim.Framework.Data" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="ReservationData.cs" />
<include name="GridData.cs" /> <include name="GridData.cs" />
<include name="ILogData.cs" /> <include name="ILogData.cs" />
<include name="IniConfig.cs" /> <include name="IniConfig.cs" />
<include name="InventoryData.cs" /> <include name="InventoryData.cs" />
<include name="ReservationData.cs" />
<include name="SimProfileData.cs" />
<include name="UserData.cs" /> <include name="UserData.cs" />
<include name="UserProfileData.cs" /> <include name="UserProfileData.cs" />
<include name="SimProfileData.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

70
OpenSim/Framework/Data/SimProfileData.cs
View File

@ -26,6 +26,10 @@
* *
*/ */
using libsecondlife; using libsecondlife;
using Nwc.XmlRpc;
using System;
using System.Collections;
namespace OpenSim.Framework.Data namespace OpenSim.Framework.Data
{ {
@ -108,5 +112,71 @@ namespace OpenSim.Framework.Data
/// Region Map Texture Asset /// Region Map Texture Asset
/// </summary> /// </summary>
public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006"); public LLUUID regionMapTextureID = new LLUUID("00000000-0000-0000-9999-000000000006");
/// <summary>
/// Get Sim profile data from grid server when in grid mode
/// </summary>
/// <param name="region_uuid"></param>
/// <param name="gridserver_url"></param>
/// <param name="?"></param>
/// <returns></returns>
public SimProfileData RequestSimProfileData(LLUUID region_uuid, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)
{
Hashtable requestData = new Hashtable();
requestData["region_uuid"] = region_uuid.UUID.ToString();
requestData["authkey"] = gridserver_sendkey;
ArrayList SendParams = new ArrayList();
SendParams.Add(requestData);
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);
Hashtable responseData = (Hashtable)GridResp.Value;
if (responseData.ContainsKey("error"))
{
return null;
}
SimProfileData simData = new SimProfileData();
simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);
simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);
simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));
simData.serverIP = (string)responseData["sim_ip"];
simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);
simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";
simData.UUID = new LLUUID((string)responseData["region_UUID"]);
simData.regionName = (string)responseData["region_name"];
return simData;
}
public SimProfileData RequestSimProfileData(ulong region_handle, string gridserver_url, string gridserver_sendkey, string gridserver_recvkey)
{
Hashtable requestData = new Hashtable();
requestData["region_handle"] = region_handle.ToString();
requestData["authkey"] = gridserver_sendkey;
ArrayList SendParams = new ArrayList();
SendParams.Add(requestData);
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_data_request", SendParams);
XmlRpcResponse GridResp = GridReq.Send(gridserver_url, 3000);
Hashtable responseData = (Hashtable)GridResp.Value;
if (responseData.ContainsKey("error"))
{
return null;
}
SimProfileData simData = new SimProfileData();
simData.regionLocX = Convert.ToUInt32((string)responseData["region_locx"]);
simData.regionLocY = Convert.ToUInt32((string)responseData["region_locy"]);
simData.regionHandle = Helpers.UIntsToLong((simData.regionLocX * 256), (simData.regionLocY * 256));
simData.serverIP = (string)responseData["sim_ip"];
simData.serverPort = Convert.ToUInt32((string)responseData["sim_port"]);
simData.serverURI = "http://" + simData.serverIP + ":" + simData.serverPort.ToString() + "/";
simData.UUID = new LLUUID((string)responseData["region_UUID"]);
simData.regionName = (string)responseData["region_name"];
return simData;
}
} }
} }

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

@ -97,85 +97,67 @@
<Compile Include="BlockingQueue.cs"> <Compile Include="BlockingQueue.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="IRegionCommsListener.cs"> <Compile Include="Util.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LoginService.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Remoting.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="SimProfile.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="UserProfile.cs"> <Compile Include="UserProfile.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Util.cs"> <Compile Include="IRegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Remoting.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LoginService.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Interfaces\AuthenticateResponse.cs"> <Compile Include="Interfaces\AuthenticateResponse.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Interfaces\IUserServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IAssetServer.cs"> <Compile Include="Interfaces\IAssetServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Interfaces\IWorld.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\IClientAPI.cs"> <Compile Include="Interfaces\IClientAPI.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Interfaces\ILocalStorage.cs"> <Compile Include="Interfaces\ILocalStorage.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </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"> <Compile Include="Interfaces\Config\IGenericConfig.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Interfaces\Config\IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IUserConfig.cs"> <Compile Include="Interfaces\Config\IUserConfig.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Interfaces\Config\IGridConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentWearable.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetLandmark.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\EstateSettings.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\Login.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\MapBlockData.cs"> <Compile Include="Types\MapBlockData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\PrimitiveBaseShape.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetLandmark.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\NeighbourInfo.cs"> <Compile Include="Types\NeighbourInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\NetworkServersInfo.cs"> <Compile Include="Types\RegionInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionHandle.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\ParcelData.cs"> <Compile Include="Types\ParcelData.cs">
@ -184,18 +166,33 @@
<Compile Include="Types\PrimData.cs"> <Compile Include="Types\PrimData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\PrimitiveBaseShape.cs"> <Compile Include="Types\AgentWearable.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\RegionHandle.cs"> <Compile Include="Types\AssetStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\RegionInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\UUID.cs"> <Compile Include="Types\UUID.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\EstateSettings.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\Login.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\AssetBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\NetworkServersInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup> <PropertyGroup>

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

@ -14,39 +14,38 @@
<include name="AgentInventory.cs" /> <include name="AgentInventory.cs" />
<include name="AuthenticateSessionBase.cs" /> <include name="AuthenticateSessionBase.cs" />
<include name="BlockingQueue.cs" /> <include name="BlockingQueue.cs" />
<include name="IRegionCommsListener.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="Util.cs" />
<include name="UserProfile.cs" />
<include name="IRegionCommsListener.cs" />
<include name="Remoting.cs" />
<include name="RegionCommsListener.cs" />
<include name="LoginService.cs" />
<include name="Interfaces/AuthenticateResponse.cs" /> <include name="Interfaces/AuthenticateResponse.cs" />
<include name="Interfaces/IUserServer.cs" />
<include name="Interfaces/IAssetServer.cs" /> <include name="Interfaces/IAssetServer.cs" />
<include name="Interfaces/IWorld.cs" />
<include name="Interfaces/IClientAPI.cs" /> <include name="Interfaces/IClientAPI.cs" />
<include name="Interfaces/ILocalStorage.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/IGenericConfig.cs" />
<include name="Interfaces/Config/IGridConfig.cs" />
<include name="Interfaces/Config/IUserConfig.cs" /> <include name="Interfaces/Config/IUserConfig.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Interfaces/Config/IGridConfig.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/MapBlockData.cs" />
<include name="Types/PrimitiveBaseShape.cs" />
<include name="Types/AssetLandmark.cs" />
<include name="Types/NeighbourInfo.cs" /> <include name="Types/NeighbourInfo.cs" />
<include name="Types/NetworkServersInfo.cs" /> <include name="Types/RegionInfo.cs" />
<include name="Types/RegionHandle.cs" />
<include name="Types/ParcelData.cs" /> <include name="Types/ParcelData.cs" />
<include name="Types/PrimData.cs" /> <include name="Types/PrimData.cs" />
<include name="Types/PrimitiveBaseShape.cs" /> <include name="Types/AgentWearable.cs" />
<include name="Types/RegionHandle.cs" /> <include name="Types/AssetStorage.cs" />
<include name="Types/RegionInfo.cs" />
<include name="Types/UUID.cs" /> <include name="Types/UUID.cs" />
<include name="Types/EstateSettings.cs" />
<include name="Types/Login.cs" />
<include name="Types/AgentCiruitData.cs" />
<include name="Types/AssetBase.cs" />
<include name="Types/NetworkServersInfo.cs" />
<include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>

119
OpenSim/Framework/General/SimProfile.cs
View File

@ -1,119 +0,0 @@
/*
* Copyright (c) Contributors, http://www.openmetaverse.org/
* See CONTRIBUTORS.TXT for a full list of copyright holders.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of the OpenSim Project nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS AND ANY
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
*/
using System;
using System.Collections;
using libsecondlife;
using Nwc.XmlRpc;
namespace OpenSim.Framework.Sims
{
public class SimProfile
{
public LLUUID UUID;
public ulong regionhandle;
public string regionname;
public string sim_ip;
public uint sim_port;
public string caps_url;
public uint RegionLocX;
public uint RegionLocY;
public string sendkey;
public string recvkey;
public bool online;
public SimProfile LoadFromGrid(ulong region_handle, string GridURL, string SendKey, string RecvKey)
{
try
{
Hashtable GridReqParams = new Hashtable();
GridReqParams["region_handle"] = region_handle.ToString();
GridReqParams["authkey"] = SendKey;
ArrayList SendParams = new ArrayList();
SendParams.Add(GridReqParams);
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
Hashtable RespData = (Hashtable)GridResp.Value;
this.UUID = new LLUUID((string)RespData["UUID"]);
this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
this.regionname = (string)RespData["regionname"];
this.sim_ip = (string)RespData["sim_ip"];
this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
this.sendkey = SendKey;
this.recvkey = RecvKey;
}
catch (Exception e)
{
System.Console.WriteLine(e.ToString());
}
return this;
}
public SimProfile LoadFromGrid(LLUUID UUID, string GridURL, string SendKey, string RecvKey)
{
try
{
Hashtable GridReqParams = new Hashtable();
GridReqParams["UUID"] = UUID.ToString();
GridReqParams["authkey"] = SendKey;
ArrayList SendParams = new ArrayList();
SendParams.Add(GridReqParams);
XmlRpcRequest GridReq = new XmlRpcRequest("simulator_login", SendParams);
XmlRpcResponse GridResp = GridReq.Send(GridURL, 3000);
Hashtable RespData = (Hashtable)GridResp.Value;
this.UUID = new LLUUID((string)RespData["UUID"]);
this.regionhandle = Helpers.UIntsToLong(((uint)Convert.ToUInt32(RespData["region_locx"]) * 256), ((uint)Convert.ToUInt32(RespData["region_locy"]) * 256));
this.regionname = (string)RespData["regionname"];
this.sim_ip = (string)RespData["sim_ip"];
this.sim_port = (uint)Convert.ToUInt16(RespData["sim_port"]);
this.caps_url = "http://" + ((string)RespData["sim_ip"]) + ":" + (string)RespData["sim_port"] + "/";
this.RegionLocX = (uint)Convert.ToUInt32(RespData["region_locx"]);
this.RegionLocY = (uint)Convert.ToUInt32(RespData["region_locy"]);
this.sendkey = SendKey;
this.recvkey = RecvKey;
}
catch (Exception e)
{
System.Console.WriteLine(e.ToString());
}
return this;
}
public SimProfile()
{
}
}
}

4
OpenSim/Framework/UserManager/UserManagerBase.cs
View File

@ -357,6 +357,8 @@ namespace OpenSim.Framework.UserManagement
/// <returns>The response to send</returns> /// <returns>The response to send</returns>
public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request) public XmlRpcResponse XmlRpcLoginMethod(XmlRpcRequest request)
{ {
System.Console.WriteLine("Attempting login now...");
XmlRpcResponse response = new XmlRpcResponse(); XmlRpcResponse response = new XmlRpcResponse();
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
@ -457,11 +459,13 @@ namespace OpenSim.Framework.UserManagement
{ {
System.Console.WriteLine(e.ToString()); System.Console.WriteLine(e.ToString());
return logResponse.CreateDeadRegionResponse(); return logResponse.CreateDeadRegionResponse();
//return logResponse.ToXmlRpcResponse();
} }
CommitAgent(ref userProfile); CommitAgent(ref userProfile);
return logResponse.ToXmlRpcResponse(); return logResponse.ToXmlRpcResponse();
} }
catch (Exception E) catch (Exception E)
{ {
System.Console.WriteLine(E.ToString()); System.Console.WriteLine(E.ToString());

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

@ -268,6 +268,7 @@ namespace OpenSim.Grid.GridServer
TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256)); TheSim.regionHandle = Helpers.UIntsToLong((TheSim.regionLocX * 256), (TheSim.regionLocY * 256));
TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/"; TheSim.serverURI = "http://" + TheSim.serverIP + ":" + TheSim.serverPort + "/";
Console.WriteLine("NEW SIM: " + TheSim.serverURI);
TheSim.regionName = (string)requestData["sim_name"]; TheSim.regionName = (string)requestData["sim_name"];
TheSim.UUID = new LLUUID((string)requestData["UUID"]); TheSim.UUID = new LLUUID((string)requestData["UUID"]);
@ -376,6 +377,40 @@ namespace OpenSim.Grid.GridServer
return response; return response;
} }
public XmlRpcResponse XmlRpcSimulatorDataRequestMethod(XmlRpcRequest request)
{
Hashtable requestData = (Hashtable)request.Params[0];
Hashtable responseData = new Hashtable();
SimProfileData simData = null;
if (requestData.ContainsKey("region_UUID"))
{
simData = getRegion(new LLUUID((string)requestData["region_UUID"]));
}
else if (requestData.ContainsKey("region_handle"))
{
simData = getRegion(Convert.ToUInt64((string)requestData["region_handle"]));
}
if (simData == null)
{
//Sim does not exist
responseData["error"] = "Sim does not exist";
}
else
{
responseData["sim_ip"] = simData.serverIP;
responseData["sim_port"] = simData.serverPort.ToString();
responseData["region_locx"] = simData.regionLocX;
responseData["region_locy"] = simData.regionLocY;
responseData["region_UUID"] = simData.UUID.UUID.ToString();
responseData["region_name"] = simData.regionName;
}
XmlRpcResponse response = new XmlRpcResponse();
response.Value = responseData;
return response;
}
public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request) public XmlRpcResponse XmlRpcMapBlockMethod(XmlRpcRequest request)
{ {
int xmin=980, ymin=980, xmax=1020, ymax=1020; int xmin=980, ymin=980, xmax=1020, ymax=1020;

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

@ -125,6 +125,7 @@ namespace OpenSim.Grid.GridServer
//GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback); //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer, "gridserver", Cfg.SimSendKey, Cfg.SimRecvKey, managercallback);
httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod); httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcSimulatorLoginMethod);
httpServer.AddXmlRPCHandler("simulator_data_request", m_gridManager.XmlRpcSimulatorDataRequestMethod);
httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod); httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);
httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod )); httpServer.AddStreamHandler(new RestStreamHandler("GET", "/sims/", m_gridManager.RestGetSimMethod ));

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

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

2
OpenSim/Grid/GridServer/OpenSim.Grid.GridServer.exe.build
View File

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

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

@ -29,7 +29,6 @@ using System;
using System.Collections; using System.Collections;
using Nwc.XmlRpc; using Nwc.XmlRpc;
using OpenSim.Framework.Data; using OpenSim.Framework.Data;
using OpenSim.Framework.Sims;
using OpenSim.Framework.UserManagement; using OpenSim.Framework.UserManagement;
namespace OpenSim.Grid.UserServer namespace OpenSim.Grid.UserServer
@ -48,23 +47,23 @@ namespace OpenSim.Grid.UserServer
public override void CustomiseResponse( LoginResponse response, UserProfileData theUser) public override void CustomiseResponse( LoginResponse response, UserProfileData theUser)
{ {
// Load information from the gridserver // Load information from the gridserver
SimProfile SimInfo = new SimProfile(); SimProfileData SimInfo = new SimProfileData();
SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey); SimInfo = SimInfo.RequestSimProfileData(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
// Customise the response // Customise the response
// Home Location // Home Location
response.Home = "{'region_handle':[r" + (SimInfo.RegionLocX * 256).ToString() + ",r" + (SimInfo.RegionLocY * 256).ToString() + "], " + response.Home = "{'region_handle':[r" + (SimInfo.regionLocX * 256).ToString() + ",r" + (SimInfo.regionLocY * 256).ToString() + "], " +
"'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " + "'position':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "], " +
"'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}"; "'look_at':[r" + theUser.homeLocation.X.ToString() + ",r" + theUser.homeLocation.Y.ToString() + ",r" + theUser.homeLocation.Z.ToString() + "]}";
// Destination // Destination
response.SimAddress = SimInfo.sim_ip; response.SimAddress = SimInfo.serverIP;
response.SimPort = (Int32)SimInfo.sim_port; response.SimPort = (Int32)SimInfo.serverPort;
response.RegionX = SimInfo.RegionLocY ; response.RegionX = SimInfo.regionLocX;
response.RegionY = SimInfo.RegionLocX ; response.RegionY = SimInfo.regionLocX;
// Notify the target of an incoming user // Notify the target of an incoming user
Console.WriteLine("Notifying " + SimInfo.regionname + " (" + SimInfo.caps_url + ")"); Console.WriteLine("Notifying " + SimInfo.regionName + " (" + SimInfo.serverURI+ ")");
// Prepare notification // Prepare notification
Hashtable SimParams = new Hashtable(); Hashtable SimParams = new Hashtable();
@ -83,11 +82,11 @@ namespace OpenSim.Grid.UserServer
// Update agent with target sim // Update agent with target sim
theUser.currentAgent.currentRegion = SimInfo.UUID; theUser.currentAgent.currentRegion = SimInfo.UUID;
theUser.currentAgent.currentHandle = SimInfo.regionhandle; theUser.currentAgent.currentHandle = SimInfo.regionHandle;
// Send // Send
XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams); XmlRpcRequest GridReq = new XmlRpcRequest("expect_user", SendParams);
XmlRpcResponse GridResp = GridReq.Send(SimInfo.caps_url, 3000); XmlRpcResponse GridResp = GridReq.Send(SimInfo.serverURI, 3000);
} }
} }
} }

6
OpenSim/Region/Application/OpenSim.csproj
View File

@ -170,15 +170,15 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="VersionInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Application.cs"> <Compile Include="Application.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="OpenSimMain.cs"> <Compile Include="OpenSimMain.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="VersionInfo.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup> <PropertyGroup>

2
OpenSim/Region/Application/OpenSim.exe.build
View File

@ -11,9 +11,9 @@
<resources prefix="OpenSim" dynamicprefix="true" > <resources prefix="OpenSim" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="VersionInfo.cs" />
<include name="Application.cs" /> <include name="Application.cs" />
<include name="OpenSimMain.cs" /> <include name="OpenSimMain.cs" />
<include name="VersionInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>

34
OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.csproj
View File

@ -122,34 +122,34 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ClientStackNetworkHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.AgentAssetUpload.cs"> <Compile Include="ClientView.AgentAssetUpload.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientView.API.cs"> <Compile Include="ClientStackNetworkHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.PacketHandlers.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.ProcessPackets.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientViewBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="PacketServer.cs"> <Compile Include="PacketServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="UDPServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.PacketHandlers.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.API.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.ProcessPackets.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionApplicationBase.cs"> <Compile Include="RegionApplicationBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="UDPServer.cs"> <Compile Include="ClientViewBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Assets\InventoryCache.cs"> <Compile Include="Assets\InventoryCache.cs">

14
OpenSim/Region/ClientStack/OpenSim.Region.ClientStack.dll.build
View File

@ -11,16 +11,16 @@
<resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" > <resources prefix="OpenSim.Region.ClientStack" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="ClientStackNetworkHandler.cs" />
<include name="ClientView.AgentAssetUpload.cs" /> <include name="ClientView.AgentAssetUpload.cs" />
<include name="ClientView.API.cs" /> <include name="ClientStackNetworkHandler.cs" />
<include name="ClientView.cs" />
<include name="ClientView.PacketHandlers.cs" />
<include name="ClientView.ProcessPackets.cs" />
<include name="ClientViewBase.cs" />
<include name="PacketServer.cs" /> <include name="PacketServer.cs" />
<include name="RegionApplicationBase.cs" />
<include name="UDPServer.cs" /> <include name="UDPServer.cs" />
<include name="ClientView.PacketHandlers.cs" />
<include name="ClientView.API.cs" />
<include name="ClientView.ProcessPackets.cs" />
<include name="RegionApplicationBase.cs" />
<include name="ClientViewBase.cs" />
<include name="ClientView.cs" />
<include name="Assets/InventoryCache.cs" /> <include name="Assets/InventoryCache.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

6
OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.csproj
View File

@ -98,15 +98,15 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="LocalUserServices.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CommunicationsLocal.cs"> <Compile Include="CommunicationsLocal.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LocalBackEndServices.cs"> <Compile Include="LocalBackEndServices.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LocalUserServices.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

2
OpenSim/Region/Communications/Local/OpenSim.Region.Communications.Local.dll.build
View File

@ -11,9 +11,9 @@
<resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" > <resources prefix="OpenSim.Region.Communications.Local" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="LocalUserServices.cs" />
<include name="CommunicationsLocal.cs" /> <include name="CommunicationsLocal.cs" />
<include name="LocalBackEndServices.cs" /> <include name="LocalBackEndServices.cs" />
<include name="LocalUserServices.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

3
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -35,7 +35,7 @@ namespace OpenSim.Region.Communications.OGS1
GridParams["authkey"] = serversInfo.GridSendKey; GridParams["authkey"] = serversInfo.GridSendKey;
GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated(); GridParams["UUID"] = regionInfo.SimUUID.ToStringHyphenated();
GridParams["sim_ip"] = regionInfo.InternalEndPoint.Address.ToString(); GridParams["sim_ip"] = regionInfo.ExternalHostName;
GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString(); GridParams["sim_port"] = regionInfo.InternalEndPoint.Port.ToString();
GridParams["region_locx"] = regionInfo.RegionLocX.ToString(); GridParams["region_locx"] = regionInfo.RegionLocX.ToString();
GridParams["region_locy"] = regionInfo.RegionLocY.ToString(); GridParams["region_locy"] = regionInfo.RegionLocY.ToString();
@ -166,6 +166,7 @@ namespace OpenSim.Region.Communications.OGS1
// Grid Request Processing // Grid Request Processing
public XmlRpcResponse ExpectUser(XmlRpcRequest request) public XmlRpcResponse ExpectUser(XmlRpcRequest request)
{ {
Console.WriteLine("Expecting User...");
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
AgentCircuitData agentData = new AgentCircuitData(); AgentCircuitData agentData = new AgentCircuitData();
agentData.SessionID = new LLUUID((string)requestData["session_id"]); agentData.SessionID = new LLUUID((string)requestData["session_id"]);

6
OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.csproj
View File

@ -116,16 +116,16 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="CommunicationsOGS1.cs"> <Compile Include="OGS1UserServices.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="OGS1GridServices.cs"> <Compile Include="CommunicationsOGS1.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="OGS1InterSimComms.cs"> <Compile Include="OGS1InterSimComms.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="OGS1UserServices.cs"> <Compile Include="OGS1GridServices.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">

6
OpenSim/Region/Communications/OGS1/OpenSim.Region.Communications.OGS1.dll.build
View File

@ -11,10 +11,10 @@
<resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" > <resources prefix="OpenSim.Region.Communications.OGS1" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="CommunicationsOGS1.cs" />
<include name="OGS1GridServices.cs" />
<include name="OGS1InterSimComms.cs" />
<include name="OGS1UserServices.cs" /> <include name="OGS1UserServices.cs" />
<include name="CommunicationsOGS1.cs" />
<include name="OGS1InterSimComms.cs" />
<include name="OGS1GridServices.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

4
OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj
View File

@ -154,10 +154,10 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="LlsdMethodEntry.cs"> <Compile Include="MyWorld.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="MyWorld.cs"> <Compile Include="LlsdMethodEntry.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Program.cs"> <Compile Include="Program.cs">

2
OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build
View File

@ -11,8 +11,8 @@
<resources prefix="SimpleApp" dynamicprefix="true" > <resources prefix="SimpleApp" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="LlsdMethodEntry.cs" />
<include name="MyWorld.cs" /> <include name="MyWorld.cs" />
<include name="LlsdMethodEntry.cs" />
<include name="Program.cs" /> <include name="Program.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>

6
OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.csproj
View File

@ -93,9 +93,6 @@
<Compile Include="AssemblyInfo.cs"> <Compile Include="AssemblyInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Db4LocalStorage.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="MapStorage.cs"> <Compile Include="MapStorage.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -105,6 +102,9 @@
<Compile Include="UUIDPrimQuery.cs"> <Compile Include="UUIDPrimQuery.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Db4LocalStorage.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup> <PropertyGroup>

2
OpenSim/Region/Storage/LocalStorageDb4o/OpenSim.Region.Storage.LocalStorageDb4o.dll.build
View File

@ -12,10 +12,10 @@
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AssemblyInfo.cs" /> <include name="AssemblyInfo.cs" />
<include name="Db4LocalStorage.cs" />
<include name="MapStorage.cs" /> <include name="MapStorage.cs" />
<include name="UUIDParcelQuery.cs" /> <include name="UUIDParcelQuery.cs" />
<include name="UUIDPrimQuery.cs" /> <include name="UUIDPrimQuery.cs" />
<include name="Db4LocalStorage.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>

72
Prebuild/src/Prebuild.csproj
View File

@ -83,9 +83,6 @@
<Compile Include="Prebuild.cs"> <Compile Include="Prebuild.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\FatalException.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Kernel.cs"> <Compile Include="Core\Kernel.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -95,19 +92,25 @@
<Compile Include="Core\WarningException.cs"> <Compile Include="Core\WarningException.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Attributes\DataNodeAttribute.cs"> <Compile Include="Core\FatalException.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Attributes\OptionNodeAttribute.cs"> <Compile Include="Core\Interfaces\ITarget.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Attributes\TargetAttribute.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Interfaces\IDataNode.cs"> <Compile Include="Core\Interfaces\IDataNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Interfaces\ITarget.cs"> <Compile Include="Core\Attributes\OptionNodeAttribute.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Attributes\DataNodeAttribute.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Attributes\TargetAttribute.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Nodes\ProjectNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Nodes\ConfigurationNode.cs"> <Compile Include="Core\Nodes\ConfigurationNode.cs">
@ -119,40 +122,28 @@
<Compile Include="Core\Nodes\ExcludeNode.cs"> <Compile Include="Core\Nodes\ExcludeNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Nodes\FileNode.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Nodes\FilesNode.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Nodes\MatchNode.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Nodes\OptionsNode.cs"> <Compile Include="Core\Nodes\OptionsNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Nodes\ProcessNode.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Nodes\ProjectNode.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Nodes\ReferenceNode.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Nodes\ReferencePathNode.cs"> <Compile Include="Core\Nodes\ReferencePathNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Nodes\MatchNode.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Nodes\SolutionNode.cs"> <Compile Include="Core\Nodes\SolutionNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Parse\IfContext.cs"> <Compile Include="Core\Nodes\ProcessNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Parse\Preprocessor.cs"> <Compile Include="Core\Nodes\ReferenceNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Targets\AutotoolsTarget.cs"> <Compile Include="Core\Nodes\FileNode.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Nodes\FilesNode.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Targets\DebugTarget.cs"> <Compile Include="Core\Targets\DebugTarget.cs">
@ -161,10 +152,7 @@
<Compile Include="Core\Targets\MonoDevelopTarget.cs"> <Compile Include="Core\Targets\MonoDevelopTarget.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Targets\NAntTarget.cs"> <Compile Include="Core\Targets\AutotoolsTarget.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Targets\SharpDevelop2Target.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Targets\SharpDevelopTarget.cs"> <Compile Include="Core\Targets\SharpDevelopTarget.cs">
@ -176,13 +164,19 @@
<Compile Include="Core\Targets\VS2003Target.cs"> <Compile Include="Core\Targets\VS2003Target.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Targets\SharpDevelop2Target.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Targets\VS2005Target.cs"> <Compile Include="Core\Targets\VS2005Target.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Utilities\CommandLineCollection.cs"> <Compile Include="Core\Targets\NAntTarget.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Utilities\CurrentDirectory.cs"> <Compile Include="Core\Parse\IfContext.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Parse\Preprocessor.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Utilities\Helper.cs"> <Compile Include="Core\Utilities\Helper.cs">
@ -191,6 +185,12 @@
<Compile Include="Core\Utilities\Log.cs"> <Compile Include="Core\Utilities\Log.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Core\Utilities\CommandLineCollection.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Core\Utilities\CurrentDirectory.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>

38
Prebuild/src/Prebuild.exe.build
View File

@ -14,42 +14,42 @@
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="Prebuild.cs" /> <include name="Prebuild.cs" />
<include name="Core/FatalException.cs" />
<include name="Core/Kernel.cs" /> <include name="Core/Kernel.cs" />
<include name="Core/UnknownLanguageException.cs" /> <include name="Core/UnknownLanguageException.cs" />
<include name="Core/WarningException.cs" /> <include name="Core/WarningException.cs" />
<include name="Core/Attributes/DataNodeAttribute.cs" /> <include name="Core/FatalException.cs" />
<include name="Core/Attributes/OptionNodeAttribute.cs" />
<include name="Core/Attributes/TargetAttribute.cs" />
<include name="Core/Interfaces/IDataNode.cs" />
<include name="Core/Interfaces/ITarget.cs" /> <include name="Core/Interfaces/ITarget.cs" />
<include name="Core/Interfaces/IDataNode.cs" />
<include name="Core/Attributes/OptionNodeAttribute.cs" />
<include name="Core/Attributes/DataNodeAttribute.cs" />
<include name="Core/Attributes/TargetAttribute.cs" />
<include name="Core/Nodes/ProjectNode.cs" />
<include name="Core/Nodes/ConfigurationNode.cs" /> <include name="Core/Nodes/ConfigurationNode.cs" />
<include name="Core/Nodes/DataNode.cs" /> <include name="Core/Nodes/DataNode.cs" />
<include name="Core/Nodes/ExcludeNode.cs" /> <include name="Core/Nodes/ExcludeNode.cs" />
<include name="Core/Nodes/OptionsNode.cs" />
<include name="Core/Nodes/ReferencePathNode.cs" />
<include name="Core/Nodes/MatchNode.cs" />
<include name="Core/Nodes/SolutionNode.cs" />
<include name="Core/Nodes/ProcessNode.cs" />
<include name="Core/Nodes/ReferenceNode.cs" />
<include name="Core/Nodes/FileNode.cs" /> <include name="Core/Nodes/FileNode.cs" />
<include name="Core/Nodes/FilesNode.cs" /> <include name="Core/Nodes/FilesNode.cs" />
<include name="Core/Nodes/MatchNode.cs" />
<include name="Core/Nodes/OptionsNode.cs" />
<include name="Core/Nodes/ProcessNode.cs" />
<include name="Core/Nodes/ProjectNode.cs" />
<include name="Core/Nodes/ReferenceNode.cs" />
<include name="Core/Nodes/ReferencePathNode.cs" />
<include name="Core/Nodes/SolutionNode.cs" />
<include name="Core/Parse/IfContext.cs" />
<include name="Core/Parse/Preprocessor.cs" />
<include name="Core/Targets/AutotoolsTarget.cs" />
<include name="Core/Targets/DebugTarget.cs" /> <include name="Core/Targets/DebugTarget.cs" />
<include name="Core/Targets/MonoDevelopTarget.cs" /> <include name="Core/Targets/MonoDevelopTarget.cs" />
<include name="Core/Targets/NAntTarget.cs" /> <include name="Core/Targets/AutotoolsTarget.cs" />
<include name="Core/Targets/SharpDevelop2Target.cs" />
<include name="Core/Targets/SharpDevelopTarget.cs" /> <include name="Core/Targets/SharpDevelopTarget.cs" />
<include name="Core/Targets/VS2002Target.cs" /> <include name="Core/Targets/VS2002Target.cs" />
<include name="Core/Targets/VS2003Target.cs" /> <include name="Core/Targets/VS2003Target.cs" />
<include name="Core/Targets/SharpDevelop2Target.cs" />
<include name="Core/Targets/VS2005Target.cs" /> <include name="Core/Targets/VS2005Target.cs" />
<include name="Core/Utilities/CommandLineCollection.cs" /> <include name="Core/Targets/NAntTarget.cs" />
<include name="Core/Utilities/CurrentDirectory.cs" /> <include name="Core/Parse/IfContext.cs" />
<include name="Core/Parse/Preprocessor.cs" />
<include name="Core/Utilities/Helper.cs" /> <include name="Core/Utilities/Helper.cs" />
<include name="Core/Utilities/Log.cs" /> <include name="Core/Utilities/Log.cs" />
<include name="Core/Utilities/CommandLineCollection.cs" />
<include name="Core/Utilities/CurrentDirectory.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

1
prebuild.xml
View File

@ -434,6 +434,7 @@
<Reference name="System" localCopy="false"/> <Reference name="System" localCopy="false"/>
<Reference name="System.Xml"/> <Reference name="System.Xml"/>
<Reference name="System.Data"/> <Reference name="System.Data"/>
<Reference name="XMLRPC.dll"/>
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
<Files> <Files>
<Match pattern="*.cs" recurse="true"/> <Match pattern="*.cs" recurse="true"/>