diff options
author | MW | 2007-06-20 17:32:21 +0000 |
---|---|---|
committer | MW | 2007-06-20 17:32:21 +0000 |
commit | 3e484d1aaf6d2d893f258e7372003de9bf5e8bdb (patch) | |
tree | 78eba8a9c1e77748d73d77e9f366021235a738b8 /Common/OpenSim.Framework | |
parent | * and done the same for OGS.. (diff) | |
download | opensim-SC-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.zip opensim-SC-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.gz opensim-SC-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.bz2 opensim-SC-3e484d1aaf6d2d893f258e7372003de9bf5e8bdb.tar.xz |
Renamed Avatar to ScenePresence to avoid clash with libsl Avatar class.
Added ThirdPartyLicenses folder containing the licenses for the various third party libraries we use.
Plus some other small changes.
Diffstat (limited to '')
4 files changed, 17 insertions, 24 deletions
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj index fef5108..af6c396 100644 --- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj +++ b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj | |||
@@ -1,4 +1,4 @@ | |||
1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 1 | <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
2 | <PropertyGroup> | 2 | <PropertyGroup> |
3 | <ProjectType>Local</ProjectType> | 3 | <ProjectType>Local</ProjectType> |
4 | <ProductVersion>8.0.50727</ProductVersion> | 4 | <ProductVersion>8.0.50727</ProductVersion> |
@@ -6,8 +6,7 @@ | |||
6 | <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{A7CD0630-0000-0000-0000-000000000000}</ProjectGuid> |
7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> | 7 | <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> |
8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> | 8 | <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> |
9 | <ApplicationIcon> | 9 | <ApplicationIcon></ApplicationIcon> |
10 | </ApplicationIcon> | ||
11 | <AssemblyKeyContainerName> | 10 | <AssemblyKeyContainerName> |
12 | </AssemblyKeyContainerName> | 11 | </AssemblyKeyContainerName> |
13 | <AssemblyName>OpenSim.Framework.Console</AssemblyName> | 12 | <AssemblyName>OpenSim.Framework.Console</AssemblyName> |
@@ -16,11 +15,9 @@ | |||
16 | <DefaultTargetSchema>IE50</DefaultTargetSchema> | 15 | <DefaultTargetSchema>IE50</DefaultTargetSchema> |
17 | <DelaySign>false</DelaySign> | 16 | <DelaySign>false</DelaySign> |
18 | <OutputType>Library</OutputType> | 17 | <OutputType>Library</OutputType> |
19 | <AppDesignerFolder> | 18 | <AppDesignerFolder></AppDesignerFolder> |
20 | </AppDesignerFolder> | ||
21 | <RootNamespace>OpenSim.Framework.Console</RootNamespace> | 19 | <RootNamespace>OpenSim.Framework.Console</RootNamespace> |
22 | <StartupObject> | 20 | <StartupObject></StartupObject> |
23 | </StartupObject> | ||
24 | <FileUpgradeFlags> | 21 | <FileUpgradeFlags> |
25 | </FileUpgradeFlags> | 22 | </FileUpgradeFlags> |
26 | </PropertyGroup> | 23 | </PropertyGroup> |
@@ -31,8 +28,7 @@ | |||
31 | <ConfigurationOverrideFile> | 28 | <ConfigurationOverrideFile> |
32 | </ConfigurationOverrideFile> | 29 | </ConfigurationOverrideFile> |
33 | <DefineConstants>TRACE;DEBUG</DefineConstants> | 30 | <DefineConstants>TRACE;DEBUG</DefineConstants> |
34 | <DocumentationFile> | 31 | <DocumentationFile></DocumentationFile> |
35 | </DocumentationFile> | ||
36 | <DebugSymbols>True</DebugSymbols> | 32 | <DebugSymbols>True</DebugSymbols> |
37 | <FileAlignment>4096</FileAlignment> | 33 | <FileAlignment>4096</FileAlignment> |
38 | <Optimize>False</Optimize> | 34 | <Optimize>False</Optimize> |
@@ -41,8 +37,7 @@ | |||
41 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 37 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
42 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 38 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
43 | <WarningLevel>4</WarningLevel> | 39 | <WarningLevel>4</WarningLevel> |
44 | <NoWarn> | 40 | <NoWarn></NoWarn> |
45 | </NoWarn> | ||
46 | </PropertyGroup> | 41 | </PropertyGroup> |
47 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> | 42 | <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
48 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> | 43 | <AllowUnsafeBlocks>False</AllowUnsafeBlocks> |
@@ -51,8 +46,7 @@ | |||
51 | <ConfigurationOverrideFile> | 46 | <ConfigurationOverrideFile> |
52 | </ConfigurationOverrideFile> | 47 | </ConfigurationOverrideFile> |
53 | <DefineConstants>TRACE</DefineConstants> | 48 | <DefineConstants>TRACE</DefineConstants> |
54 | <DocumentationFile> | 49 | <DocumentationFile></DocumentationFile> |
55 | </DocumentationFile> | ||
56 | <DebugSymbols>False</DebugSymbols> | 50 | <DebugSymbols>False</DebugSymbols> |
57 | <FileAlignment>4096</FileAlignment> | 51 | <FileAlignment>4096</FileAlignment> |
58 | <Optimize>True</Optimize> | 52 | <Optimize>True</Optimize> |
@@ -61,11 +55,10 @@ | |||
61 | <RemoveIntegerChecks>False</RemoveIntegerChecks> | 55 | <RemoveIntegerChecks>False</RemoveIntegerChecks> |
62 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> | 56 | <TreatWarningsAsErrors>False</TreatWarningsAsErrors> |
63 | <WarningLevel>4</WarningLevel> | 57 | <WarningLevel>4</WarningLevel> |
64 | <NoWarn> | 58 | <NoWarn></NoWarn> |
65 | </NoWarn> | ||
66 | </PropertyGroup> | 59 | </PropertyGroup> |
67 | <ItemGroup> | 60 | <ItemGroup> |
68 | <Reference Include="System"> | 61 | <Reference Include="System" > |
69 | <HintPath>System.dll</HintPath> | 62 | <HintPath>System.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
@@ -76,10 +69,10 @@ | |||
76 | <Compile Include="AssemblyInfo.cs"> | 69 | <Compile Include="AssemblyInfo.cs"> |
77 | <SubType>Code</SubType> | 70 | <SubType>Code</SubType> |
78 | </Compile> | 71 | </Compile> |
79 | <Compile Include="LogBase.cs"> | 72 | <Compile Include="ConsoleCallbacksBase.cs"> |
80 | <SubType>Code</SubType> | 73 | <SubType>Code</SubType> |
81 | </Compile> | 74 | </Compile> |
82 | <Compile Include="ConsoleCallbacksBase.cs"> | 75 | <Compile Include="LogBase.cs"> |
83 | <SubType>Code</SubType> | 76 | <SubType>Code</SubType> |
84 | </Compile> | 77 | </Compile> |
85 | <Compile Include="MainLog.cs"> | 78 | <Compile Include="MainLog.cs"> |
@@ -93,4 +86,4 @@ | |||
93 | <PostBuildEvent> | 86 | <PostBuildEvent> |
94 | </PostBuildEvent> | 87 | </PostBuildEvent> |
95 | </PropertyGroup> | 88 | </PropertyGroup> |
96 | </Project> \ No newline at end of file | 89 | </Project> |
diff --git a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build index 9a03b54..7ebdba1 100644 --- a/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build +++ b/Common/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build | |||
@@ -12,9 +12,9 @@ | |||
12 | </resources> | 12 | </resources> |
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="AssemblyInfo.cs" /> | 14 | <include name="AssemblyInfo.cs" /> |
15 | <include name="ConsoleBase.cs" /> | ||
16 | <include name="ConsoleCallbacksBase.cs" /> | 15 | <include name="ConsoleCallbacksBase.cs" /> |
17 | <include name="MainConsole.cs" /> | 16 | <include name="LogBase.cs" /> |
17 | <include name="MainLog.cs" /> | ||
18 | </sources> | 18 | </sources> |
19 | <references basedir="${project::get-base-directory()}"> | 19 | <references basedir="${project::get-base-directory()}"> |
20 | <lib> | 20 | <lib> |
diff --git a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs index afeae1f..3b965bf 100644 --- a/Common/OpenSim.Framework/Interfaces/IClientAPI.cs +++ b/Common/OpenSim.Framework/Interfaces/IClientAPI.cs | |||
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Interfaces | |||
144 | void SendTeleportCancel(); | 144 | void SendTeleportCancel(); |
145 | void SendTeleportLocationStart(); | 145 | void SendTeleportLocationStart(); |
146 | 146 | ||
147 | void SendAvatarData(RegionInfo regionInfo, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos); | 147 | void SendAvatarData(ulong regionHandle, string firstName, string lastName, LLUUID avatarID, uint avatarLocalID, LLVector3 Pos); |
148 | void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity); | 148 | void SendAvatarTerseUpdate(ulong regionHandle, ushort timeDilation, uint localID, LLVector3 position, LLVector3 velocity); |
149 | 149 | ||
150 | void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); | 150 | void AttachObject(uint localID, LLQuaternion rotation, byte attachPoint); |
diff --git a/Common/OpenSim.Framework/Interfaces/IWorld.cs b/Common/OpenSim.Framework/Interfaces/IWorld.cs index 08077bd..4857417 100644 --- a/Common/OpenSim.Framework/Interfaces/IWorld.cs +++ b/Common/OpenSim.Framework/Interfaces/IWorld.cs | |||
@@ -35,8 +35,8 @@ namespace OpenSim.Framework.Interfaces | |||
35 | { | 35 | { |
36 | public interface IWorld | 36 | public interface IWorld |
37 | { | 37 | { |
38 | void AddNewAvatar(IClientAPI remoteClient, LLUUID agentID, bool child); | 38 | void AddNewClient(IClientAPI remoteClient, LLUUID agentID, bool child); |
39 | void RemoveAvatar(LLUUID agentID); | 39 | void RemoveClient(LLUUID agentID); |
40 | 40 | ||
41 | RegionInfo RegionInfo { get; } | 41 | RegionInfo RegionInfo { get; } |
42 | object SyncRoot { get; } | 42 | object SyncRoot { get; } |