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

Fixed SimpleApp - aka thankgoditssundaycommit 

* Updated SimpleApp with various introduced dependencies
* Extracted ScenePrescence creation in Scene
* removed try-catchall from UserManagerBase (that actually hid a bug)
* Refactored RegionInfo
  * handle is calculated
  * it will explode upon accessing x,y,ip,port,externalip if not explicitly initialized
* Removed superfluous 'ref' keywords
* Removed a shitload of 'catch Exception e' that causes build warnings
* Lots of small refactorings, renames et c
* Ignored some bins
Sugilite
lbsa71 2007-07-01 13:17:27 +00:00
parent bacf90b5d8
commit 5e805656db
58 changed files with 498 additions and 441 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

4
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="IUserServices.cs" />
<include name="IGridServices.cs" />
<include name="CommunicationsManager.cs" /> <include name="CommunicationsManager.cs" />
<include name="IGridServices.cs" />
<include name="IInterRegionCommunications.cs" /> <include name="IInterRegionCommunications.cs" />
<include name="IUserServices.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="LogBase.cs"> <Compile Include="ConsoleCallbacksBase.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="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="LogBase.cs" />
<include name="ConsoleCallbacksBase.cs" /> <include name="ConsoleCallbacksBase.cs" />
<include name="LogBase.cs" />
<include name="MainLog.cs" /> <include name="MainLog.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">

4
OpenSim/Framework/Data.DB4o/DB4oManager.cs
View File

@ -89,7 +89,7 @@ namespace OpenSim.Framework.Data.DB4o
database.Close(); database.Close();
return true; return true;
} }
catch (Exception e) catch (Exception)
{ {
return false; return false;
} }
@ -154,7 +154,7 @@ namespace OpenSim.Framework.Data.DB4o
database.Close(); database.Close();
return true; return true;
} }
catch (Exception e) catch (Exception)
{ {
return false; return false;
} }

4
OpenSim/Framework/Data.DB4o/DB4oUserData.cs
View File

@ -100,7 +100,7 @@ namespace OpenSim.Framework.Data.DB4o
{ {
return getUserByUUID(uuid).currentAgent; return getUserByUUID(uuid).currentAgent;
} }
catch (Exception e) catch (Exception)
{ {
return null; return null;
} }
@ -128,7 +128,7 @@ namespace OpenSim.Framework.Data.DB4o
{ {
return getUserByName(fname,lname).currentAgent; return getUserByName(fname,lname).currentAgent;
} }
catch (Exception e) catch (Exception)
{ {
return null; return null;
} }

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

@ -88,13 +88,13 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="DB4oUserData.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="DB4oGridData.cs"> <Compile Include="DB4oUserData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <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 prefix="OpenSim.Framework.Data.DB4o" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="DB4oUserData.cs" />
<include name="DB4oManager.cs" />
<include name="DB4oGridData.cs" /> <include name="DB4oGridData.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()}">

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

@ -203,7 +203,7 @@ namespace OpenSim.Framework.Data.MSSQL
result.Dispose(); result.Dispose();
} }
catch (Exception e) catch (Exception)
{ {
return false; return false;
} }

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

8
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="MySQLInventoryData.cs" />
<include name="MySQLUserData.cs" />
<include name="MySQLManager.cs" />
<include name="MySQLLogData.cs" />
<include name="MySQLGridData.cs" /> <include name="MySQLGridData.cs" />
<include name="MySQLInventoryData.cs" />
<include name="MySQLLogData.cs" />
<include name="MySQLManager.cs" />
<include name="MySQLUserData.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="SQLiteManager.cs"> <Compile Include="SQLiteGridData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="SQLiteGridData.cs"> <Compile Include="SQLiteManager.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="SQLiteManager.cs" />
<include name="SQLiteGridData.cs" /> <include name="SQLiteGridData.cs" />
<include name="SQLiteManager.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()}">

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

@ -198,7 +198,7 @@ namespace OpenSim.Framework.Data.SQLite
result.Dispose(); result.Dispose();
} }
catch (Exception e) catch (Exception)
{ {
return false; return false;
} }

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

@ -78,15 +78,9 @@
<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>
<Compile Include="SimProfileData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ILogData.cs"> <Compile Include="ILogData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -96,6 +90,12 @@
<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>

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

@ -11,12 +11,12 @@
<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="SimProfileData.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="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />

2
OpenSim/Framework/Data/UserProfileData.cs
View File

@ -136,7 +136,7 @@ namespace OpenSim.Framework.Data
/// <summary> /// <summary>
/// The IP address of the user /// The IP address of the user
/// </summary> /// </summary>
public string agentIP; public string agentIP = String.Empty;
/// <summary> /// <summary>
/// The port of the user /// The port of the user
/// </summary> /// </summary>

2
OpenSim/Framework/General/Interfaces/IWorld.cs
View File

@ -35,7 +35,7 @@ namespace OpenSim.Framework.Interfaces
{ {
public interface IWorld public interface IWorld
{ {
void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child); void AddNewClient(IClientAPI client, bool child);
void RemoveClient(LLUUID agentID); void RemoveClient(LLUUID agentID);
RegionInfo RegionInfo { get; } RegionInfo RegionInfo { get; }

118
OpenSim/Framework/General/OpenSim.Framework.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,8 +6,7 @@
<ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid> <ProjectGuid>{8ACA2445-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</AssemblyName> <AssemblyName>OpenSim.Framework</AssemblyName>
@ -16,11 +15,9 @@
<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</RootNamespace> <RootNamespace>OpenSim.Framework</RootNamespace>
<StartupObject> <StartupObject></StartupObject>
</StartupObject>
<FileUpgradeFlags> <FileUpgradeFlags>
</FileUpgradeFlags> </FileUpgradeFlags>
</PropertyGroup> </PropertyGroup>
@ -31,8 +28,7 @@
<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>
@ -41,8 +37,7 @@
<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>
@ -51,8 +46,7 @@
<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>
@ -61,28 +55,26 @@
<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="Db4objects.Db4o.dll"> <Reference Include="Db4objects.Db4o.dll" >
<HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath> <HintPath>..\..\..\bin\Db4objects.Db4o.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
<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.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.dll"> <Reference Include="XMLRPC.dll" >
<HintPath>..\..\..\bin\XMLRPC.dll</HintPath> <HintPath>..\..\..\bin\XMLRPC.dll</HintPath>
<Private>False</Private> <Private>False</Private>
</Reference> </Reference>
@ -92,93 +84,80 @@
<Name>OpenSim.Framework.Console</Name> <Name>OpenSim.Framework.Console</Name>
<Project>{A7CD0630-0000-0000-0000-000000000000}</Project> <Project>{A7CD0630-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AgentInventory.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="AuthenticateSessionBase.cs"> <Compile Include="AuthenticateSessionBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Remoting.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="BlockingQueue.cs"> <Compile Include="BlockingQueue.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="IRegionCommsListener.cs"> <Compile Include="IRegionCommsListener.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\UUID.cs" /> <Compile Include="LoginService.cs">
<Compile Include="Util.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="UserProfile.cs"> <Compile Include="RegionCommsListener.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Remoting.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="SimProfile.cs"> <Compile Include="SimProfile.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LoginService.cs"> <Compile Include="UserProfile.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="AgentInventory.cs"> <Compile Include="Util.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\Config\IGenericConfig.cs"> <Compile Include="Interfaces\IUserServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Interfaces\Config\IUserConfig.cs"> <Compile Include="Interfaces\IWorld.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Interfaces\Config\IGenericConfig.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Interfaces\Config\IGridConfig.cs"> <Compile Include="Interfaces\Config\IGridConfig.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Interfaces\Config\IUserConfig.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs"> <Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\NeighbourInfo.cs"> <Compile Include="Types\AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\NetworkServersInfo.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> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\AgentWearable.cs"> <Compile Include="Types\AgentWearable.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\PrimData.cs"> <Compile Include="Types\AssetBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\MapBlockData.cs"> <Compile Include="Types\AssetLandmark.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\AssetStorage.cs"> <Compile Include="Types\AssetStorage.cs">
@ -187,16 +166,31 @@
<Compile Include="Types\EstateSettings.cs"> <Compile Include="Types\EstateSettings.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\AgentCiruitData.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Types\Login.cs"> <Compile Include="Types\Login.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\AssetLandmark.cs"> <Compile Include="Types\MapBlockData.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Types\AssetBase.cs"> <Compile Include="Types\NeighbourInfo.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>
<Compile Include="Types\UUID.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
</ItemGroup> </ItemGroup>
@ -207,4 +201,4 @@
<PostBuildEvent> <PostBuildEvent>
</PostBuildEvent> </PostBuildEvent>
</PropertyGroup> </PropertyGroup>
</Project> </Project>

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

@ -11,40 +11,41 @@
<resources prefix="OpenSim.Framework" dynamicprefix="true" > <resources prefix="OpenSim.Framework" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="AgentInventory.cs" />
<include name="AuthenticateSessionBase.cs" /> <include name="AuthenticateSessionBase.cs" />
<include name="Remoting.cs" />
<include name="RegionCommsListener.cs" />
<include name="BlockingQueue.cs" /> <include name="BlockingQueue.cs" />
<include name="IRegionCommsListener.cs" /> <include name="IRegionCommsListener.cs" />
<include name="Util.cs" />
<include name="UserProfile.cs" />
<include name="SimProfile.cs" />
<include name="LoginService.cs" /> <include name="LoginService.cs" />
<include name="AgentInventory.cs" /> <include name="RegionCommsListener.cs" />
<include name="Remoting.cs" />
<include name="SimProfile.cs" />
<include name="UserProfile.cs" />
<include name="Util.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/IUserConfig.cs" />
<include name="Interfaces/Config/IGridConfig.cs" /> <include name="Interfaces/Config/IGridConfig.cs" />
<include name="Interfaces/Config/IUserConfig.cs" />
<include name="Properties/AssemblyInfo.cs" /> <include name="Properties/AssemblyInfo.cs" />
<include name="Types/NeighbourInfo.cs" /> <include name="Types/AgentCiruitData.cs" />
<include name="Types/NetworkServersInfo.cs" />
<include name="Types/RegionHandle.cs" />
<include name="Types/RegionInfo.cs" />
<include name="Types/ParcelData.cs" />
<include name="Types/AgentWearable.cs" /> <include name="Types/AgentWearable.cs" />
<include name="Types/PrimData.cs" /> <include name="Types/AssetBase.cs" />
<include name="Types/MapBlockData.cs" /> <include name="Types/AssetLandmark.cs" />
<include name="Types/AssetStorage.cs" /> <include name="Types/AssetStorage.cs" />
<include name="Types/EstateSettings.cs" /> <include name="Types/EstateSettings.cs" />
<include name="Types/AgentCiruitData.cs" />
<include name="Types/Login.cs" /> <include name="Types/Login.cs" />
<include name="Types/AssetLandmark.cs" /> <include name="Types/MapBlockData.cs" />
<include name="Types/AssetBase.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/UUID.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>

127
OpenSim/Framework/General/Types/RegionInfo.cs
View File

@ -40,9 +40,38 @@ namespace OpenSim.Framework.Types
{ {
public LLUUID SimUUID = new LLUUID(); public LLUUID SimUUID = new LLUUID();
public string RegionName = ""; public string RegionName = "";
public uint RegionLocX = 0;
public uint RegionLocY = 0; private uint? m_regionLocX;
public ulong RegionHandle = 0; public uint RegionLocX
{
get
{
return m_regionLocX.Value;
}
}
private uint? m_regionLocY;
public uint RegionLocY
{
get
{
return m_regionLocY.Value;
}
}
private ulong? m_regionHandle;
public ulong RegionHandle
{
get
{
if (!m_regionHandle.HasValue)
{
m_regionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
}
return m_regionHandle.Value;
}
}
public string DataStore = ""; public string DataStore = "";
public bool isSandbox = false; public bool isSandbox = false;
@ -52,19 +81,43 @@ namespace OpenSim.Framework.Types
public string MasterAvatarLastName = ""; public string MasterAvatarLastName = "";
public string MasterAvatarSandboxPassword = ""; public string MasterAvatarSandboxPassword = "";
private int? m_commsIPListenPort;
/// <summary> /// <summary>
/// Port used for listening (TCP and UDP) /// Port used for listening (TCP and UDP)
/// </summary> /// </summary>
/// <remarks>Seperate TCP and UDP</remarks> /// <remarks>Seperate TCP and UDP</remarks>
public int CommsIPListenPort = 0; public int CommsIPListenPort
{
get
{
return m_commsIPListenPort.Value;
}
}
private string m_commsIPListenAddr;
/// <summary> /// <summary>
/// Address used for internal listening (default: 0.0.0.0?) /// Address used for internal listening (default: 0.0.0.0?)
/// </summary> /// </summary>
public string CommsIPListenAddr = ""; public string CommsIPListenAddr
{
get
{
return m_commsIPListenAddr;
}
}
private string m_commsExternalAddress;
/// <summary> /// <summary>
/// Address used for external addressing (DNS or IP) /// Address used for external addressing (DNS or IP)
/// </summary> /// </summary>
public string CommsExternalAddress = ""; public string CommsExternalAddress
{
get
{
return m_commsExternalAddress;
}
}
public EstateSettings estateSettings; public EstateSettings estateSettings;
@ -73,7 +126,16 @@ namespace OpenSim.Framework.Types
{ {
estateSettings = new EstateSettings(); estateSettings = new EstateSettings();
} }
public RegionInfo( uint regionLocX, uint regionLocY, string simIp, int simPort, string simUri ) : this()
{
m_regionLocX = regionLocX;
m_regionLocY = regionLocY;
m_commsIPListenAddr = simIp;
m_commsIPListenPort = simPort;
m_commsExternalAddress = simUri;
}
public void InitConfig(bool sandboxMode, IGenericConfig configData) public void InitConfig(bool sandboxMode, IGenericConfig configData)
{ {
@ -112,11 +174,11 @@ namespace OpenSim.Framework.Types
{ {
string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000"); string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location X", "1000");
configData.SetAttribute("SimLocationX", location); configData.SetAttribute("SimLocationX", location);
this.RegionLocX = (uint)Convert.ToUInt32(location); m_regionLocX = (uint)Convert.ToUInt32(location);
} }
else else
{ {
this.RegionLocX = (uint)Convert.ToUInt32(attri); m_regionLocX = (uint)Convert.ToUInt32(attri);
} }
// Sim/Grid location Y // Sim/Grid location Y
attri = ""; attri = "";
@ -125,13 +187,15 @@ namespace OpenSim.Framework.Types
{ {
string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000"); string location = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("Grid Location Y", "1000");
configData.SetAttribute("SimLocationY", location); configData.SetAttribute("SimLocationY", location);
this.RegionLocY = (uint)Convert.ToUInt32(location); m_regionLocY = (uint)Convert.ToUInt32(location);
} }
else else
{ {
this.RegionLocY = (uint)Convert.ToUInt32(attri); m_regionLocY = (uint)Convert.ToUInt32(attri);
} }
m_regionHandle = null;
// Local storage datastore // Local storage datastore
attri = ""; attri = "";
attri = configData.GetAttribute("Datastore"); attri = configData.GetAttribute("Datastore");
@ -153,11 +217,11 @@ namespace OpenSim.Framework.Types
{ {
string port = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("UDP port for client connections", "9000"); string port = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("UDP port for client connections", "9000");
configData.SetAttribute("SimListenPort", port); configData.SetAttribute("SimListenPort", port);
this.CommsIPListenPort = Convert.ToInt32(port); m_commsIPListenPort = Convert.ToInt32(port);
} }
else else
{ {
this.CommsIPListenPort = Convert.ToInt32(attri); m_commsIPListenPort = Convert.ToInt32(attri);
} }
//Sim Listen Address //Sim Listen Address
@ -165,8 +229,8 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimListenAddress"); attri = configData.GetAttribute("SimListenAddress");
if (attri == "") if (attri == "")
{ {
this.CommsIPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "0.0.0.0"); m_commsIPListenAddr = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP Address to listen on for client connections", "0.0.0.0");
configData.SetAttribute("SimListenAddress", this.CommsIPListenAddr); configData.SetAttribute("SimListenAddress", CommsIPListenAddr );
} }
else else
{ {
@ -177,26 +241,25 @@ namespace OpenSim.Framework.Types
System.Net.IPAddress[] ips = System.Net.Dns.GetHostAddresses(localhostname); System.Net.IPAddress[] ips = System.Net.Dns.GetHostAddresses(localhostname);
try try
{ {
this.CommsIPListenAddr = "0.0.0.0"; // Incase a IPv4 address isnt found m_commsIPListenAddr = "0.0.0.0"; // Incase a IPv4 address isnt found
foreach (System.Net.IPAddress ip in ips) foreach (System.Net.IPAddress ip in ips)
{ {
if (ip.AddressFamily.ToString() == System.Net.Sockets.ProtocolFamily.InterNetwork.ToString()) if (ip.AddressFamily.ToString() == System.Net.Sockets.ProtocolFamily.InterNetwork.ToString())
{ {
this.CommsIPListenAddr = ip.ToString(); m_commsIPListenAddr = ip.ToString();
break; break;
} }
} }
} }
catch (Exception e) catch (Exception)
{ {
e.ToString(); m_commsIPListenAddr = "0.0.0.0"; // Use the default if we fail
this.CommsIPListenAddr = "0.0.0.0"; // Use the default if we fail
} }
} }
else else
{ {
this.CommsIPListenAddr = attri; m_commsIPListenAddr = attri;
} }
} }
@ -205,12 +268,12 @@ namespace OpenSim.Framework.Types
attri = configData.GetAttribute("SimExternalAddress"); attri = configData.GetAttribute("SimExternalAddress");
if (attri == "") if (attri == "")
{ {
this.CommsExternalAddress = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP or DNS address to send external clients to", "localhost"); m_commsExternalAddress = OpenSim.Framework.Console.MainLog.Instance.CmdPrompt("IP or DNS address to send external clients to", "localhost");
configData.SetAttribute("SimExternalAddress", this.CommsExternalAddress); configData.SetAttribute("SimExternalAddress", CommsExternalAddress);
} }
else else
{ {
this.CommsExternalAddress = attri; m_commsExternalAddress = attri;
} }
attri = ""; attri = "";
@ -281,8 +344,6 @@ namespace OpenSim.Framework.Types
} }
} }
this.RegionHandle = Util.UIntsToLong((RegionLocX * 256), (RegionLocY * 256));
configData.Commit(); configData.Commit();
} }
catch (Exception e) catch (Exception e)
@ -292,13 +353,13 @@ namespace OpenSim.Framework.Types
} }
OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:"); OpenSim.Framework.Console.MainLog.Instance.Verbose("Sim settings loaded:");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "UUID: " + this.SimUUID.ToStringHyphenated()); OpenSim.Framework.Console.MainLog.Instance.Verbose("UUID: " + this.SimUUID.ToStringHyphenated());
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Name: " + this.RegionName); OpenSim.Framework.Console.MainLog.Instance.Verbose("Name: " + this.RegionName);
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]"); OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Location: [" + this.RegionLocX.ToString() + "," + this.RegionLocY + "]");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Region Handle: " + this.RegionHandle.ToString()); OpenSim.Framework.Console.MainLog.Instance.Verbose("Region Handle: " + this.RegionHandle.ToString());
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Listening on IP: " + this.CommsIPListenAddr + ":" + this.CommsIPListenPort); OpenSim.Framework.Console.MainLog.Instance.Verbose("Listening on IP: " + this.CommsIPListenAddr + ":" + this.CommsIPListenPort);
OpenSim.Framework.Console.MainLog.Instance.Verbose( "Sandbox Mode? " + isSandbox.ToString()); OpenSim.Framework.Console.MainLog.Instance.Verbose("Sandbox Mode? " + isSandbox.ToString());
} }
} }
} }

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

@ -93,18 +93,18 @@
<Compile Include="BaseHttpServer.cs"> <Compile Include="BaseHttpServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="IRestHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="XmlRpcMethod.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CheckSumServer.cs"> <Compile Include="CheckSumServer.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="IRestHandler.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UDPServerBase.cs"> <Compile Include="UDPServerBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="XmlRpcMethod.cs">
<SubType>Code</SubType>
</Compile>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSHARP.Targets" />
<PropertyGroup> <PropertyGroup>

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

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

4
OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.csproj
View File

@ -108,10 +108,10 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="UserManagerBase.cs"> <Compile Include="LoginResponse.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LoginResponse.cs"> <Compile Include="UserManagerBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
</ItemGroup> </ItemGroup>

2
OpenSim/Framework/UserManager/OpenSim.Framework.UserManagement.dll.build
View File

@ -11,8 +11,8 @@
<resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" > <resources prefix="OpenSim.Framework.UserManagement" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="UserManagerBase.cs" />
<include name="LoginResponse.cs" /> <include name="LoginResponse.cs" />
<include name="UserManagerBase.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>

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

@ -43,7 +43,7 @@ using System.Security.Cryptography;
namespace OpenSim.Framework.UserManagement namespace OpenSim.Framework.UserManagement
{ {
public class UserManagerBase public abstract class UserManagerBase
{ {
public OpenSim.Framework.Interfaces.UserConfig _config; public OpenSim.Framework.Interfaces.UserConfig _config;
Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>(); Dictionary<string, IUserData> _plugins = new Dictionary<string, IUserData>();
@ -142,14 +142,9 @@ namespace OpenSim.Framework.UserManagement
try try
{ {
UserProfileData profile = plugin.Value.getUserByName(fname,lname); UserProfileData profile = plugin.Value.getUserByName(fname,lname);
try
{ profile.currentAgent = getUserAgent(profile.UUID);
profile.currentAgent = getUserAgent(profile.UUID);
}
catch (Exception e)
{
// Ignore
}
return profile; return profile;
} }
catch (Exception e) catch (Exception e)
@ -238,16 +233,14 @@ namespace OpenSim.Framework.UserManagement
/// </summary> /// </summary>
/// <param name="profile">The users profile</param> /// <param name="profile">The users profile</param>
/// <param name="request">The users loginrequest</param> /// <param name="request">The users loginrequest</param>
public void CreateAgent(ref UserProfileData profile, XmlRpcRequest request) public void CreateAgent(UserProfileData profile, XmlRpcRequest request)
{ {
Hashtable requestData = (Hashtable)request.Params[0]; Hashtable requestData = (Hashtable)request.Params[0];
UserAgentData agent = new UserAgentData(); UserAgentData agent = new UserAgentData();
// User connection // User connection
agent.agentIP = "";
agent.agentOnline = true; agent.agentOnline = true;
agent.agentPort = 0;
// Generate sessions // Generate sessions
RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider(); RNGCryptoServiceProvider rand = new RNGCryptoServiceProvider();
@ -282,7 +275,7 @@ namespace OpenSim.Framework.UserManagement
//SimProfile SimInfo = new SimProfile(); //SimProfile SimInfo = new SimProfile();
//SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey); //SimInfo = SimInfo.LoadFromGrid(theUser.currentAgent.currentHandle, _config.GridServerURL, _config.GridSendKey, _config.GridRecvKey);
} }
catch (Exception e) catch (Exception)
{ {
} }
@ -319,7 +312,7 @@ namespace OpenSim.Framework.UserManagement
/// <param name="profile">The users profile</param> /// <param name="profile">The users profile</param>
/// <param name="password">The supplied password</param> /// <param name="password">The supplied password</param>
/// <returns>Authenticated?</returns> /// <returns>Authenticated?</returns>
public virtual bool AuthenticateUser(ref UserProfileData profile, string password) public virtual bool AuthenticateUser(UserProfileData profile, string password)
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose( OpenSim.Framework.Console.MainLog.Instance.Verbose(
"Authenticating " + profile.username + " " + profile.surname); "Authenticating " + profile.username + " " + profile.surname);
@ -358,10 +351,7 @@ namespace OpenSim.Framework.UserManagement
/// </summary> /// </summary>
/// <param name="response">The existing response</param> /// <param name="response">The existing response</param>
/// <param name="theUser">The user profile</param> /// <param name="theUser">The user profile</param>
public virtual void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser) public abstract void CustomiseResponse( LoginResponse response, UserProfileData theUser);
{
}
/// <summary> /// <summary>
/// Main user login function /// Main user login function
@ -379,7 +369,7 @@ namespace OpenSim.Framework.UserManagement
string lastname = ""; string lastname = "";
string passwd = ""; string passwd = "";
UserProfileData TheUser; UserProfileData userProfile;
LoginResponse logResponse = new LoginResponse(); LoginResponse logResponse = new LoginResponse();
if (GoodXML) if (GoodXML)
@ -388,11 +378,11 @@ namespace OpenSim.Framework.UserManagement
lastname = (string)requestData["last"]; lastname = (string)requestData["last"];
passwd = (string)requestData["passwd"]; passwd = (string)requestData["passwd"];
TheUser = GetTheUser(firstname, lastname); userProfile = GetTheUser(firstname, lastname);
if (TheUser == null) if (userProfile == null)
return logResponse.CreateLoginFailedResponse(); return logResponse.CreateLoginFailedResponse();
GoodLogin = AuthenticateUser(ref TheUser, passwd); GoodLogin = AuthenticateUser(userProfile, passwd);
} }
else else
{ {
@ -406,19 +396,19 @@ namespace OpenSim.Framework.UserManagement
else else
{ {
// If we already have a session... // If we already have a session...
if (TheUser.currentAgent != null && TheUser.currentAgent.agentOnline) if (userProfile.currentAgent != null && userProfile.currentAgent.agentOnline)
{ {
// Reject the login // Reject the login
return logResponse.CreateAlreadyLoggedInResponse(); return logResponse.CreateAlreadyLoggedInResponse();
} }
// Otherwise... // Otherwise...
// Create a new agent session // Create a new agent session
CreateAgent(ref TheUser, request); CreateAgent( userProfile, request);
try try
{ {
LLUUID AgentID = TheUser.UUID; LLUUID AgentID = userProfile.UUID;
// Inventory Library Section // Inventory Library Section
ArrayList AgentInventoryArray = new ArrayList(); ArrayList AgentInventoryArray = new ArrayList();
@ -446,32 +436,32 @@ namespace OpenSim.Framework.UserManagement
// Circuit Code // Circuit Code
uint circode = (uint)(Util.RandomClass.Next()); uint circode = (uint)(Util.RandomClass.Next());
logResponse.Lastname = TheUser.surname; logResponse.Lastname = userProfile.surname;
logResponse.Firstname = TheUser.username; logResponse.Firstname = userProfile.username;
logResponse.AgentID = AgentID.ToStringHyphenated(); logResponse.AgentID = AgentID.ToStringHyphenated();
logResponse.SessionID = TheUser.currentAgent.sessionID.ToStringHyphenated(); logResponse.SessionID = userProfile.currentAgent.sessionID.ToStringHyphenated();
logResponse.SecureSessionID = TheUser.currentAgent.secureSessionID.ToStringHyphenated(); logResponse.SecureSessionID = userProfile.currentAgent.secureSessionID.ToStringHyphenated();
logResponse.InventoryRoot = InventoryRoot; logResponse.InventoryRoot = InventoryRoot;
logResponse.InventorySkeleton = AgentInventoryArray; logResponse.InventorySkeleton = AgentInventoryArray;
logResponse.CircuitCode = (Int32)circode; logResponse.CircuitCode = (Int32)circode;
logResponse.RegionX = 0; //overwritten //logResponse.RegionX = 0; //overwritten
logResponse.RegionY = 0; //overwritten //logResponse.RegionY = 0; //overwritten
logResponse.Home = "!!null temporary value {home}!!"; // Overwritten logResponse.Home = "!!null temporary value {home}!!"; // Overwritten
//logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n"; //logResponse.LookAt = "\n[r" + TheUser.homeLookAt.X.ToString() + ",r" + TheUser.homeLookAt.Y.ToString() + ",r" + TheUser.homeLookAt.Z.ToString() + "]\n";
logResponse.SimAddress = "127.0.0.1"; //overwritten //logResponse.SimAddress = "127.0.0.1"; //overwritten
logResponse.SimPort = 0; //overwritten //logResponse.SimPort = 0; //overwritten
logResponse.Message = this.GetMessage(); logResponse.Message = this.GetMessage();
try try
{ {
this.CustomiseResponse(ref logResponse, ref TheUser); this.CustomiseResponse( logResponse, userProfile);
} }
catch (Exception e) catch (Exception e)
{ {
System.Console.WriteLine(e.ToString()); System.Console.WriteLine(e.ToString());
return logResponse.CreateDeadRegionResponse(); return logResponse.CreateDeadRegionResponse();
} }
CommitAgent(ref TheUser); CommitAgent(ref userProfile);
return logResponse.ToXmlRpcResponse(); return logResponse.ToXmlRpcResponse();
} }

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

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

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

@ -11,8 +11,8 @@
<resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" > <resources prefix="OpenSim.Grid.AssetServer" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="Main.cs" />
<include name="AssetHttpServer.cs" /> <include name="AssetHttpServer.cs" />
<include name="Main.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()}">

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

@ -108,7 +108,7 @@ namespace OpenSim.Grid.GridServer
{ {
kvp.Value.saveLog("Gridserver", target, method, args, priority, message); kvp.Value.saveLog("Gridserver", target, method, args, priority, message);
} }
catch (Exception e) catch (Exception)
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key); OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: unable to write log via " + kvp.Key);
} }
@ -127,7 +127,7 @@ namespace OpenSim.Grid.GridServer
{ {
return kvp.Value.GetProfileByLLUUID(uuid); return kvp.Value.GetProfileByLLUUID(uuid);
} }
catch (Exception e) catch (Exception)
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key); OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + uuid.ToStringHyphenated() + " via " + kvp.Key);
} }
@ -148,7 +148,7 @@ namespace OpenSim.Grid.GridServer
{ {
return kvp.Value.GetProfileByHandle(handle); return kvp.Value.GetProfileByHandle(handle);
} }
catch (Exception e) catch
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key); OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to find region " + handle.ToString() + " via " + kvp.Key);
} }
@ -172,7 +172,7 @@ namespace OpenSim.Grid.GridServer
regions[neighbour.regionHandle] = neighbour; regions[neighbour.regionHandle] = neighbour;
} }
} }
catch (Exception e) catch
{ {
OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key); OpenSim.Framework.Console.MainLog.Instance.Warn("Storage: Unable to query regionblock via " + kvp.Key);
} }

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

@ -262,7 +262,7 @@ namespace OpenSim.Grid.GridServer
} }
configData.Commit(); configData.Commit();
} }
catch (Exception e) catch
{ {
} }

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

@ -178,7 +178,7 @@ namespace OpenSim.Grid.UserServer
} }
configData.Commit(); configData.Commit();
} }
catch (Exception e) catch
{ {
} }

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

@ -56,7 +56,7 @@ namespace OpenSim.Grid.UserServer
/// </summary> /// </summary>
/// <param name="response">The existing response</param> /// <param name="response">The existing response</param>
/// <param name="theUser">The user profile</param> /// <param name="theUser">The user profile</param>
public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser) public override void CustomiseResponse( LoginResponse response, UserProfileData theUser)
{ {
// Load information from the gridserver // Load information from the gridserver
SimProfile SimInfo = new SimProfile(); SimProfile SimInfo = new SimProfile();

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

@ -170,15 +170,15 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Application.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="OpenSimMain.cs"> <Compile Include="OpenSimMain.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="VersionInfo.cs"> <Compile Include="VersionInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Application.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="Application.cs" />
<include name="OpenSimMain.cs" /> <include name="OpenSimMain.cs" />
<include name="VersionInfo.cs" /> <include name="VersionInfo.cs" />
<include name="Application.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>

36
OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.csproj
View File

@ -96,40 +96,40 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="LLSDCapsDetails.cs"> <Compile Include="Caps.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LLSDArray.cs"> <Compile Include="LLSDArray.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LLSDCapEvent.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDCapsDetails.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDEmpty.cs"> <Compile Include="LLSDEmpty.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LLSDTest.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDUploadReply.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDType.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDHelpers.cs"> <Compile Include="LLSDHelpers.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LLSDCapEvent.cs"> <Compile Include="LLSDMapLayer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDMapRequest.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Caps.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LLSDMapLayerResponse.cs"> <Compile Include="LLSDMapLayerResponse.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="LLSDMapLayer.cs"> <Compile Include="LLSDMapRequest.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDTest.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDType.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="LLSDUploadReply.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
</ItemGroup> </ItemGroup>

20
OpenSim/Region/Capabilities/OpenSim.Region.Capabilities.dll.build
View File

@ -11,18 +11,18 @@
<resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" > <resources prefix="OpenSim.Region.Capabilities" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="LLSDCapsDetails.cs" />
<include name="LLSDArray.cs" />
<include name="LLSDEmpty.cs" />
<include name="LLSDTest.cs" />
<include name="LLSDUploadReply.cs" />
<include name="LLSDType.cs" />
<include name="LLSDHelpers.cs" />
<include name="LLSDCapEvent.cs" />
<include name="LLSDMapRequest.cs" />
<include name="Caps.cs" /> <include name="Caps.cs" />
<include name="LLSDMapLayerResponse.cs" /> <include name="LLSDArray.cs" />
<include name="LLSDCapEvent.cs" />
<include name="LLSDCapsDetails.cs" />
<include name="LLSDEmpty.cs" />
<include name="LLSDHelpers.cs" />
<include name="LLSDMapLayer.cs" /> <include name="LLSDMapLayer.cs" />
<include name="LLSDMapLayerResponse.cs" />
<include name="LLSDMapRequest.cs" />
<include name="LLSDTest.cs" />
<include name="LLSDType.cs" />
<include name="LLSDUploadReply.cs" />
</sources> </sources>
<references basedir="${project::get-base-directory()}"> <references basedir="${project::get-base-directory()}">
<lib> <lib>

2
OpenSim/Region/ClientStack/ClientView.cs
View File

@ -211,7 +211,7 @@ namespace OpenSim.Region.ClientStack
protected virtual void InitNewClient() protected virtual void InitNewClient()
{ {
OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); OpenSim.Framework.Console.MainLog.Instance.Verbose( "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world");
this.m_world.AddNewClient(this, this.AgentID, false); this.m_world.AddNewClient(this, false);
} }
protected virtual void AuthUser() protected virtual void AuthUser()

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

@ -122,34 +122,34 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ClientView.AgentAssetUpload.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientStackNetworkHandler.cs"> <Compile Include="ClientStackNetworkHandler.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="PacketServer.cs"> <Compile Include="ClientView.AgentAssetUpload.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UDPServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.PacketHandlers.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientView.API.cs"> <Compile Include="ClientView.API.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientView.ProcessPackets.cs"> <Compile Include="ClientView.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="RegionApplicationBase.cs"> <Compile Include="ClientView.PacketHandlers.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="ClientView.ProcessPackets.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientViewBase.cs"> <Compile Include="ClientViewBase.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ClientView.cs"> <Compile Include="PacketServer.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="RegionApplicationBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="UDPServer.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="ClientView.AgentAssetUpload.cs" />
<include name="ClientStackNetworkHandler.cs" /> <include name="ClientStackNetworkHandler.cs" />
<include name="PacketServer.cs" /> <include name="ClientView.AgentAssetUpload.cs" />
<include name="UDPServer.cs" />
<include name="ClientView.PacketHandlers.cs" />
<include name="ClientView.API.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="ClientView.cs" />
<include name="ClientView.PacketHandlers.cs" />
<include name="ClientView.ProcessPackets.cs" />
<include name="ClientViewBase.cs" />
<include name="PacketServer.cs" />
<include name="RegionApplicationBase.cs" />
<include name="UDPServer.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()}">

4
OpenSim/Region/Communications/Local/LocalUserServices.cs
View File

@ -69,14 +69,14 @@ namespace OpenSim.Region.Communications.Local
return profile; return profile;
} }
public override bool AuthenticateUser(ref UserProfileData profile, string password) public override bool AuthenticateUser(UserProfileData profile, string password)
{ {
//for now we will accept any password in sandbox mode //for now we will accept any password in sandbox mode
Console.WriteLine("authorising user"); Console.WriteLine("authorising user");
return true; return true;
} }
public override void CustomiseResponse(ref LoginResponse response, ref UserProfileData theUser) public override void CustomiseResponse(LoginResponse response, UserProfileData theUser)
{ {
ulong currentRegion = theUser.currentAgent.currentHandle; ulong currentRegion = theUser.currentAgent.currentHandle;
RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion); RegionInfo reg = m_Parent.GridServer.RequestNeighbourInfo(currentRegion);

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()}">

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

@ -75,18 +75,14 @@ namespace OpenSim.Region.Communications.OGS1
foreach (Hashtable n in (Hashtable)respData.Values) foreach (Hashtable n in (Hashtable)respData.Values)
{ {
RegionInfo neighbour = new RegionInfo(); RegionInfo neighbour = new RegionInfo( (uint)n["x"], (uint)n["y"], (string)n["sim_ip"], (int)n["sim_port"], (string)n["sim_uri"] );
//OGS1 //OGS1
neighbour.RegionHandle = (ulong)n["regionhandle"]; //neighbour.RegionHandle = (ulong)n["regionhandle"]; is now calculated locally
neighbour.RegionLocX = (uint)n["x"];
neighbour.RegionLocY = (uint)n["y"];
neighbour.RegionName = (string)n["name"]; neighbour.RegionName = (string)n["name"];
//OGS1+ //OGS1+
neighbour.CommsIPListenAddr = (string)n["sim_ip"];
neighbour.CommsIPListenPort = (int)n["sim_port"];
neighbour.CommsExternalAddress = (string)n["sim_uri"];
neighbour.SimUUID = (string)n["uuid"]; neighbour.SimUUID = (string)n["uuid"];
neighbours.Add(neighbour); neighbours.Add(neighbour);

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

@ -116,9 +116,6 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="OGS1UserServices.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="CommunicationsOGS1.cs"> <Compile Include="CommunicationsOGS1.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
@ -128,6 +125,9 @@
<Compile Include="OGS1InterSimComms.cs"> <Compile Include="OGS1InterSimComms.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="OGS1UserServices.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/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="OGS1UserServices.cs" />
<include name="CommunicationsOGS1.cs" /> <include name="CommunicationsOGS1.cs" />
<include name="OGS1GridServices.cs" /> <include name="OGS1GridServices.cs" />
<include name="OGS1InterSimComms.cs" /> <include name="OGS1InterSimComms.cs" />
<include name="OGS1UserServices.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()}">

64
OpenSim/Region/Environment/OpenSim.Region.Environment.csproj
View File

@ -144,55 +144,55 @@
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="RegionManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="EstateManager.cs"> <Compile Include="EstateManager.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="ParcelManager.cs"> <Compile Include="ParcelManager.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="RegionManager.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\Entity.cs"> <Compile Include="Scenes\Entity.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Scenes\Scene.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\ScenePresence.Body.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\SceneEvents.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\ScenePresence.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\ScenePresence.Animations.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\Scene.PacketHandlers.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\SceneObject.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\Primitive.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\SceneBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\IScenePresenceBody.cs"> <Compile Include="Scenes\IScenePresenceBody.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Scenes\scripting\ScriptManager.cs"> <Compile Include="Scenes\Primitive.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\Scene.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\Scene.PacketHandlers.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\SceneBase.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\SceneEvents.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\SceneObject.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\ScenePresence.Animations.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\ScenePresence.Body.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\ScenePresence.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Scenes\scripting\Script.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Scenes\scripting\ScriptInfo.cs"> <Compile Include="Scenes\scripting\ScriptInfo.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Scenes\scripting\Script.cs"> <Compile Include="Scenes\scripting\ScriptManager.cs">
<SubType>Code</SubType> <SubType>Code</SubType>
</Compile> </Compile>
<Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs"> <Compile Include="Scenes\scripting\Engines\CSharpScriptEngine.cs">

24
OpenSim/Region/Environment/OpenSim.Region.Environment.dll.build
View File

@ -11,23 +11,23 @@
<resources prefix="OpenSim.Region.Environment" dynamicprefix="true" > <resources prefix="OpenSim.Region.Environment" dynamicprefix="true" >
</resources> </resources>
<sources failonempty="true"> <sources failonempty="true">
<include name="RegionManager.cs" />
<include name="EstateManager.cs" /> <include name="EstateManager.cs" />
<include name="ParcelManager.cs" /> <include name="ParcelManager.cs" />
<include name="RegionManager.cs" />
<include name="Scenes/Entity.cs" /> <include name="Scenes/Entity.cs" />
<include name="Scenes/Scene.cs" />
<include name="Scenes/ScenePresence.Body.cs" />
<include name="Scenes/SceneEvents.cs" />
<include name="Scenes/ScenePresence.cs" />
<include name="Scenes/ScenePresence.Animations.cs" />
<include name="Scenes/Scene.PacketHandlers.cs" />
<include name="Scenes/SceneObject.cs" />
<include name="Scenes/Primitive.cs" />
<include name="Scenes/SceneBase.cs" />
<include name="Scenes/IScenePresenceBody.cs" /> <include name="Scenes/IScenePresenceBody.cs" />
<include name="Scenes/scripting/ScriptManager.cs" /> <include name="Scenes/Primitive.cs" />
<include name="Scenes/scripting/ScriptInfo.cs" /> <include name="Scenes/Scene.cs" />
<include name="Scenes/Scene.PacketHandlers.cs" />
<include name="Scenes/SceneBase.cs" />
<include name="Scenes/SceneEvents.cs" />
<include name="Scenes/SceneObject.cs" />
<include name="Scenes/ScenePresence.Animations.cs" />
<include name="Scenes/ScenePresence.Body.cs" />
<include name="Scenes/ScenePresence.cs" />
<include name="Scenes/scripting/Script.cs" /> <include name="Scenes/scripting/Script.cs" />
<include name="Scenes/scripting/ScriptInfo.cs" />
<include name="Scenes/scripting/ScriptManager.cs" />
<include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" /> <include name="Scenes/scripting/Engines/CSharpScriptEngine.cs" />
<include name="Scenes/scripting/Engines/JScriptEngine.cs" /> <include name="Scenes/scripting/Engines/JScriptEngine.cs" />
</sources> </sources>

63
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@ -493,19 +493,19 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="remoteClient"></param /// <param name="remoteClient"></param
/// <param name="agentID"></param> /// <param name="agentID"></param>
/// <param name="child"></param> /// <param name="child"></param>
public override void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child) public override void AddNewClient(IClientAPI client, bool child)
{ {
remoteClient.OnRegionHandShakeReply += this.SendLayerData; client.OnRegionHandShakeReply += this.SendLayerData;
//remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims); //remoteClient.OnRequestWearables += new GenericCall(this.GetInitialPrims);
remoteClient.OnChatFromViewer += this.SimChat; client.OnChatFromViewer += this.SimChat;
remoteClient.OnRequestWearables += this.InformClientOfNeighbours; client.OnRequestWearables += this.InformClientOfNeighbours;
remoteClient.OnAddPrim += this.AddNewPrim; client.OnAddPrim += this.AddNewPrim;
remoteClient.OnUpdatePrimPosition += this.UpdatePrimPosition; client.OnUpdatePrimPosition += this.UpdatePrimPosition;
remoteClient.OnRequestMapBlocks += this.RequestMapBlocks; client.OnRequestMapBlocks += this.RequestMapBlocks;
remoteClient.OnTeleportLocationRequest += this.RequestTeleportLocation; client.OnTeleportLocationRequest += this.RequestTeleportLocation;
//remoteClient.OnObjectSelect += this.SelectPrim; //remoteClient.OnObjectSelect += this.SelectPrim;
remoteClient.OnGrapUpdate += this.MoveObject; client.OnGrapUpdate += this.MoveObject;
remoteClient.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest; client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
/* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest); /* remoteClient.OnParcelPropertiesRequest += new ParcelPropertiesRequest(parcelManager.handleParcelPropertiesRequest);
remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest); remoteClient.OnParcelDivideRequest += new ParcelDivideRequest(parcelManager.handleParcelDivideRequest);
@ -513,19 +513,21 @@ namespace OpenSim.Region.Environment.Scenes
remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest); remoteClient.OnParcelPropertiesUpdateRequest += new ParcelPropertiesUpdateRequest(parcelManager.handleParcelPropertiesUpdateRequest);
remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage); remoteClient.OnEstateOwnerMessage += new EstateOwnerMessageRequest(estateManager.handleEstateOwnerMessage);
*/ */
this.estateManager.sendRegionHandshake(client);
ScenePresence newAvatar = null;
try
{
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent"); CreateAndAddScenePresence(client);
newAvatar = new ScenePresence(remoteClient, this, this.m_regInfo); return;
}
protected void CreateAndAddScenePresence(IClientAPI client)
{
ScenePresence newAvatar = null;
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
newAvatar = new ScenePresence(client, this, this.m_regInfo);
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world"); OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Adding new avatar to world");
OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake "); OpenSim.Framework.Console.MainLog.Instance.Verbose( "World.cs:AddViewerAgent() - Starting RegionHandshake ");
//newAvatar.SendRegionHandshake();
this.estateManager.sendRegionHandshake(remoteClient);
PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z); PhysicsVector pVec = new PhysicsVector(newAvatar.Pos.X, newAvatar.Pos.Y, newAvatar.Pos.Z);
lock (this.m_syncRoot) lock (this.m_syncRoot)
{ {
@ -534,36 +536,29 @@ namespace OpenSim.Region.Environment.Scenes
lock (Entities) lock (Entities)
{ {
if (!Entities.ContainsKey(agentID)) if (!Entities.ContainsKey(client.AgentId))
{ {
this.Entities.Add(agentID, newAvatar); this.Entities.Add(client.AgentId, newAvatar);
} }
else else
{ {
Entities[agentID] = newAvatar; Entities[client.AgentId] = newAvatar;
} }
} }
lock (Avatars) lock (Avatars)
{ {
if (Avatars.ContainsKey(agentID)) if (Avatars.ContainsKey(client.AgentId))
{ {
Avatars[agentID] = newAvatar; Avatars[client.AgentId] = newAvatar;
} }
else else
{ {
this.Avatars.Add(agentID, newAvatar); this.Avatars.Add(client.AgentId, newAvatar);
} }
} }
}
catch (Exception e)
{
OpenSim.Framework.Console.MainLog.Instance.Warn("World.cs: AddViewerAgent() - Failed with exception " + e.ToString());
}
return;
} }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
@ -642,8 +637,8 @@ namespace OpenSim.Region.Environment.Scenes
this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings); this.regionCommsHost = this.commsManager.GridServer.RegisterRegion(this.m_regInfo,gridSettings);
if (this.regionCommsHost != null) if (this.regionCommsHost != null)
{ {
this.regionCommsHost.OnExpectUser += new ExpectUserDelegate(this.NewUserConnection); this.regionCommsHost.OnExpectUser += this.NewUserConnection;
this.regionCommsHost.OnAvatarCrossingIntoRegion += new AgentCrossing(this.AgentCrossing); this.regionCommsHost.OnAvatarCrossingIntoRegion += this.AgentCrossing;
} }
} }

2
OpenSim/Region/Environment/Scenes/SceneBase.cs
View File

@ -148,7 +148,7 @@ namespace OpenSim.Region.Environment.Scenes
/// <param name="remoteClient"></param> /// <param name="remoteClient"></param>
/// <param name="agentID"></param> /// <param name="agentID"></param>
/// <param name="child"></param> /// <param name="child"></param>
public abstract void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child); public abstract void AddNewClient(IClientAPI client, bool child);
/// <summary> /// <summary>
/// ///

18
OpenSim/Region/Examples/SimpleApp/MyWorld.cs
View File

@ -44,7 +44,7 @@ namespace SimpleApp
#region IWorld Members #region IWorld Members
override public void AddNewClient(IClientAPI client, LLUUID agentID, bool child) override public void AddNewClient(IClientAPI client, bool child)
{ {
LLVector3 pos = new LLVector3(128, 128, 128); LLVector3 pos = new LLVector3(128, 128, 128);
@ -59,7 +59,13 @@ namespace SimpleApp
}; };
client.OnRequestWearables += SendWearables; client.OnRequestWearables += SendWearables;
client.OnAddPrim += AddNewPrim;
client.OnUpdatePrimPosition += this.UpdatePrimPosition;
client.OnRequestMapBlocks += this.RequestMapBlocks;
client.OnTeleportLocationRequest += this.RequestTeleportLocation;
client.OnGrapUpdate += this.MoveObject;
client.OnNameFromUUIDRequest += this.commsManager.HandleUUIDNameRequest;
client.OnCompleteMovementToRegion += delegate() client.OnCompleteMovementToRegion += delegate()
{ {
client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero ); client.MoveAgentIntoRegion(m_regionInfo, pos, LLVector3.Zero );
@ -76,7 +82,7 @@ namespace SimpleApp
client.SendRegionHandshake(m_regionInfo); client.SendRegionHandshake(m_regionInfo);
OpenSim.Region.Environment.Scenes.ScenePresence avatar = new Avatar( client, this, m_regionInfo ); CreateAndAddScenePresence(client);
} }
@ -85,12 +91,6 @@ namespace SimpleApp
client.SendWearables( AvatarWearable.DefaultWearables ); client.SendWearables( AvatarWearable.DefaultWearables );
} }
override public void RemoveClient(LLUUID agentID)
{
}
public RegionInfo RegionInfo public RegionInfo RegionInfo
{ {
get { return m_regionInfo; } get { return m_regionInfo; }

24
OpenSim/Region/Examples/SimpleApp/Program.cs
View File

@ -14,6 +14,7 @@ using OpenSim.Region.Caches;
using OpenSim.Framework.Communications; using OpenSim.Framework.Communications;
using OpenSim.Region.Communications.Local; using OpenSim.Region.Communications.Local;
using OpenSim.Region.ClientStack; using OpenSim.Region.ClientStack;
using OpenSim.Region.Physics.BasicPhysicsPlugin;
namespace SimpleApp namespace SimpleApp
{ {
@ -32,11 +33,7 @@ namespace SimpleApp
string simAddr = "127.0.0.1"; string simAddr = "127.0.0.1";
int simPort = 9000; int simPort = 9000;
/*
LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );
loginServer.Startup();
loginServer.SetSessionHandler( AddNewSessionHandler );*/
m_circuitManager = new AuthenticateSessionsBase(); m_circuitManager = new AuthenticateSessionsBase();
InventoryCache inventoryCache = new InventoryCache(); InventoryCache inventoryCache = new InventoryCache();
@ -53,18 +50,17 @@ namespace SimpleApp
ClientView.TerrainManager = new TerrainManager(new SecondLife()); ClientView.TerrainManager = new TerrainManager(new SecondLife());
CommunicationsManager communicationsManager = new CommunicationsLocal(null); NetworkServersInfo serverInfo = new NetworkServersInfo();
CommunicationsLocal communicationsManager = new CommunicationsLocal(serverInfo);
RegionInfo regionInfo = new RegionInfo( 1000, 1000, simAddr, simPort, simAddr );
RegionInfo regionInfo = new RegionInfo( );
BaseHttpServer httpServer = new BaseHttpServer(simPort); BaseHttpServer httpServer = new BaseHttpServer(simPort);
udpServer.LocalWorld = new MyWorld( packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer ); MyWorld world = new MyWorld(packetServer.ClientAPIs, regionInfo, m_circuitManager, communicationsManager, assetCache, httpServer);
world.PhysScene = new BasicScene();
udpServer.LocalWorld = world;
// World world = new World(udpServer.PacketServer.ClientAPIs, regionInfo); httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );
// PhysicsScene physicsScene = new NullPhysicsScene();
// world.PhysicsScene = physicsScene;
// udpServer.LocalWorld = world;
// httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );
httpServer.Start(); httpServer.Start();
m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");

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

@ -104,6 +104,12 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\..\Framework\UserManager\OpenSim.Framework.UserManagement.csproj">
<Name>OpenSim.Framework.UserManagement</Name>
<Project>{586E2916-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj"> <ProjectReference Include="..\..\Caches\OpenSim.Region.Caches.csproj">
<Name>OpenSim.Region.Caches</Name> <Name>OpenSim.Region.Caches</Name>
<Project>{61FCCDB3-0000-0000-0000-000000000000}</Project> <Project>{61FCCDB3-0000-0000-0000-000000000000}</Project>
@ -134,6 +140,18 @@
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private> <Private>False</Private>
</ProjectReference> </ProjectReference>
<ProjectReference Include="..\..\Physics\BasicPhysicsPlugin\OpenSim.Region.Physics.BasicPhysicsPlugin.csproj">
<Name>OpenSim.Region.Physics.BasicPhysicsPlugin</Name>
<Project>{15B4FEF3-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
<ProjectReference Include="..\..\Physics\Manager\OpenSim.Region.Physics.Manager.csproj">
<Name>OpenSim.Region.Physics.Manager</Name>
<Project>{F4FF31EB-0000-0000-0000-000000000000}</Project>
<Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
<Private>False</Private>
</ProjectReference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="MyWorld.cs"> <Compile Include="MyWorld.cs">

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

@ -25,11 +25,14 @@
<include name="../../../../bin/OpenSim.Framework.Communications.dll" /> <include name="../../../../bin/OpenSim.Framework.Communications.dll" />
<include name="../../../../bin/OpenSim.Framework.Console.dll" /> <include name="../../../../bin/OpenSim.Framework.Console.dll" />
<include name="../../../../bin/OpenSim.Framework.Servers.dll" /> <include name="../../../../bin/OpenSim.Framework.Servers.dll" />
<include name="../../../../bin/OpenSim.Framework.UserManagement.dll" />
<include name="../../../../bin/OpenSim.Region.Caches.dll" /> <include name="../../../../bin/OpenSim.Region.Caches.dll" />
<include name="../../../../bin/OpenSim.Region.ClientStack.dll" /> <include name="../../../../bin/OpenSim.Region.ClientStack.dll" />
<include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />
<include name="../../../../bin/OpenSim.Region.Environment.dll" /> <include name="../../../../bin/OpenSim.Region.Environment.dll" />
<include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" /> <include name="../../../../bin/OpenSim.Region.GridInterfaces.Local.dll" />
<include name="../../../../bin/OpenSim.Region.Physics.BasicPhysicsPlugin.dll" />
<include name="../../../../bin/OpenSim.Region.Physics.Manager.dll" />
<include name="System.dll" /> <include name="System.dll" />
<include name="System.Data.dll.dll" /> <include name="System.Data.dll.dll" />
<include name="System.Xml.dll" /> <include name="System.Xml.dll" />

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

@ -93,6 +93,9 @@
<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>
@ -102,9 +105,6 @@
<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>

70
Prebuild/src/Prebuild.csproj
View File

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

36
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/FatalException.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/DataNodeAttribute.cs" />
<include name="Core/Attributes/OptionNodeAttribute.cs" />
<include name="Core/Attributes/TargetAttribute.cs" /> <include name="Core/Attributes/TargetAttribute.cs" />
<include name="Core/Nodes/ProjectNode.cs" /> <include name="Core/Interfaces/IDataNode.cs" />
<include name="Core/Interfaces/ITarget.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/AutotoolsTarget.cs" /> <include name="Core/Targets/NAntTarget.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/Targets/NAntTarget.cs" />
<include name="Core/Parse/IfContext.cs" />
<include name="Core/Parse/Preprocessor.cs" />
<include name="Core/Utilities/Helper.cs" />
<include name="Core/Utilities/Log.cs" />
<include name="Core/Utilities/CommandLineCollection.cs" /> <include name="Core/Utilities/CommandLineCollection.cs" />
<include name="Core/Utilities/CurrentDirectory.cs" /> <include name="Core/Utilities/CurrentDirectory.cs" />
<include name="Core/Utilities/Helper.cs" />
<include name="Core/Utilities/Log.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
prebuild.xml
View File

@ -707,6 +707,9 @@
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.UserManagement"/>
<Reference name="OpenSim.Region.Physics.Manager"/>
<Reference name="OpenSim.Region.Physics.BasicPhysicsPlugin"/>
<Reference name="XMLRPC.dll"/> <Reference name="XMLRPC.dll"/>
<Reference name="OpenSim.Region.GridInterfaces.Local"/> <Reference name="OpenSim.Region.GridInterfaces.Local"/>
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>