aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/Common-Source/OpenSim.Framework
diff options
context:
space:
mode:
authorMW2007-05-24 12:16:50 +0000
committerMW2007-05-24 12:16:50 +0000
commit3376b82501000692d6dac24b051af738cdaf2737 (patch)
tree90ed0a5d4955236f011fa63fce9d555186b0d179 /Common-Source/OpenSim.Framework
parentAdded "terrain save grdmap <filename> <gradientmap>" function to console. Gra... (diff)
downloadopensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.zip
opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.gz
opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.bz2
opensim-SC_OLD-3376b82501000692d6dac24b051af738cdaf2737.tar.xz
Some more code refactoring, plus a restructuring of the directories so that the Grid servers can be a separate solution to the region server.
Diffstat (limited to '')
-rw-r--r--Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs (renamed from OpenSim.Framework.Console/AssemblyInfo.cs)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/ConsoleBase.cs (renamed from OpenSim.Framework.Console/ConsoleBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs (renamed from OpenSim.Framework.Console/ConsoleCallbacksBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/MainConsole.cs (renamed from OpenSim.Framework.Console/MainConsole.cs)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj (renamed from OpenSim.Framework.Console/OpenSim.Framework.Console.csproj)0
-rw-r--r--Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user12
-rw-r--r--Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build (renamed from OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build)0
-rw-r--r--Common-Source/OpenSim.Framework/AgentInventory.cs (renamed from OpenSim.Framework/AgentInventory.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/BlockingQueue.cs (renamed from OpenSim.Framework/BlockingQueue.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/HeightMapGenHills.cs (renamed from OpenSim.Framework/HeightMapGenHills.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs (renamed from OpenSim.Framework/Interfaces/IAssetServer.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs30
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IConfig.cs (renamed from OpenSim.Framework/Interfaces/IConfig.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs (renamed from OpenSim.Framework/Interfaces/IGenericConfig.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs (renamed from OpenSim.Framework/Interfaces/IGridConfig.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs (renamed from OpenSim.Framework/Interfaces/IGridServer.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs (renamed from OpenSim.Framework/Interfaces/ILocalStorage.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs (renamed from OpenSim.Framework/Interfaces/IScriptAPI.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs (renamed from OpenSim.Framework/Interfaces/IScriptEngine.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs (renamed from OpenSim.Framework/Interfaces/IUserConfig.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs (renamed from OpenSim.Framework/Interfaces/IUserServer.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs (renamed from OpenSim.Framework/Interfaces/LocalGridBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs (renamed from OpenSim.Framework/Interfaces/RemoteGridBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/LoginService.cs (renamed from OpenSim.Framework/LoginService.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/OpenSim.Framework.csproj (renamed from OpenSim.Framework/OpenSim.Framework.csproj)37
-rw-r--r--Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user12
-rw-r--r--Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build (renamed from OpenSim.Framework/OpenSim.Framework.dll.build)1
-rw-r--r--Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs (renamed from OpenSim.Framework/Properties/AssemblyInfo.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Remoting.cs (renamed from OpenSim.Framework/Remoting.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/SimProfile.cs (renamed from OpenSim.Framework/SimProfile.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/SimProfileBase.cs (renamed from OpenSim.Framework/SimProfileBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs (renamed from OpenSim.Framework/Types/AgentCiruitData.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/AssetBase.cs (renamed from OpenSim.Framework/Types/AssetBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/AssetLandmark.cs (renamed from OpenSim.Framework/Types/AssetLandmark.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/AssetStorage.cs (renamed from OpenSim.Framework/Types/AssetStorage.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/Login.cs (renamed from OpenSim.Framework/Types/Login.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs (renamed from OpenSim.Framework/Types/NeighbourInfo.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/OSVector3.cs (renamed from OpenSim.Framework/Types/OSVector3.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Types/PrimData.cs (renamed from OpenSim.Framework/Types/PrimData.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/UserProfile.cs (renamed from OpenSim.Framework/UserProfile.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/UserProfileManager.cs (renamed from OpenSim.Framework/UserProfileManager.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/UserProfileManagerBase.cs (renamed from OpenSim.Framework/UserProfileManagerBase.cs)0
-rw-r--r--Common-Source/OpenSim.Framework/Util.cs (renamed from OpenSim.Framework/Util.cs)0
43 files changed, 78 insertions, 14 deletions
diff --git a/OpenSim.Framework.Console/AssemblyInfo.cs b/Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs
index 00a9b7d..00a9b7d 100644
--- a/OpenSim.Framework.Console/AssemblyInfo.cs
+++ b/Common-Source/OpenSim.Framework.Console/AssemblyInfo.cs
diff --git a/OpenSim.Framework.Console/ConsoleBase.cs b/Common-Source/OpenSim.Framework.Console/ConsoleBase.cs
index 6a1c53c..6a1c53c 100644
--- a/OpenSim.Framework.Console/ConsoleBase.cs
+++ b/Common-Source/OpenSim.Framework.Console/ConsoleBase.cs
diff --git a/OpenSim.Framework.Console/ConsoleCallbacksBase.cs b/Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
index bb589d2..bb589d2 100644
--- a/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
+++ b/Common-Source/OpenSim.Framework.Console/ConsoleCallbacksBase.cs
diff --git a/OpenSim.Framework.Console/MainConsole.cs b/Common-Source/OpenSim.Framework.Console/MainConsole.cs
index 02c4ae8..02c4ae8 100644
--- a/OpenSim.Framework.Console/MainConsole.cs
+++ b/Common-Source/OpenSim.Framework.Console/MainConsole.cs
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
index 0961492..0961492 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
+++ b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj
diff --git a/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
index fa90bb6..fa90bb6 100644
--- a/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
+++ b/Common-Source/OpenSim.Framework.Console/OpenSim.Framework.Console.dll.build
diff --git a/OpenSim.Framework/AgentInventory.cs b/Common-Source/OpenSim.Framework/AgentInventory.cs
index b28645e..b28645e 100644
--- a/OpenSim.Framework/AgentInventory.cs
+++ b/Common-Source/OpenSim.Framework/AgentInventory.cs
diff --git a/OpenSim.Framework/BlockingQueue.cs b/Common-Source/OpenSim.Framework/BlockingQueue.cs
index f840354..f840354 100644
--- a/OpenSim.Framework/BlockingQueue.cs
+++ b/Common-Source/OpenSim.Framework/BlockingQueue.cs
diff --git a/OpenSim.Framework/HeightMapGenHills.cs b/Common-Source/OpenSim.Framework/HeightMapGenHills.cs
index 6a729da..6a729da 100644
--- a/OpenSim.Framework/HeightMapGenHills.cs
+++ b/Common-Source/OpenSim.Framework/HeightMapGenHills.cs
diff --git a/OpenSim.Framework/Interfaces/IAssetServer.cs b/Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs
index 3f86acc..3f86acc 100644
--- a/OpenSim.Framework/Interfaces/IAssetServer.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IAssetServer.cs
diff --git a/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs b/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs
new file mode 100644
index 0000000..a991fb6
--- /dev/null
+++ b/Common-Source/OpenSim.Framework/Interfaces/IClientAPI.cs
@@ -0,0 +1,30 @@
1using System;
2using System.Collections.Generic;
3using System.Text;
4using OpenSim.Framework.Inventory;
5using libsecondlife;
6using libsecondlife.Packets;
7using OpenSim.Framework.Types;
8
9namespace OpenSim.Framework.Interfaces
10{
11 public delegate void ChatFromViewer(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
12 public delegate void RezObject(AssetBase primAsset, LLVector3 pos);
13 public delegate void ModifyTerrain(byte action, float north, float west);
14 public delegate void SetAppearance(byte[] texture, AgentSetAppearancePacket.VisualParamBlock[] visualParam);
15 public delegate void StartAnim(LLUUID animID, int seq);
16 public delegate void LinkObjects(uint parent, List<uint> children);
17
18 public interface IClientAPI
19 {
20 event ChatFromViewer OnChatFromViewer;
21 event RezObject OnRezObject;
22 event ModifyTerrain OnModifyTerrain;
23 event SetAppearance OnSetAppearance;
24 event StartAnim OnStartAnim;
25 event LinkObjects OnLinkObjects;
26
27 void SendAppearance(AvatarWearable[] wearables);
28 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
29 }
30}
diff --git a/OpenSim.Framework/Interfaces/IConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IConfig.cs
index 7b4c040..7b4c040 100644
--- a/OpenSim.Framework/Interfaces/IConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IGenericConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs
index a853fe4..a853fe4 100644
--- a/OpenSim.Framework/Interfaces/IGenericConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IGenericConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IGridConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs
index b2f26da..b2f26da 100644
--- a/OpenSim.Framework/Interfaces/IGridConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IGridConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IGridServer.cs b/Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs
index e67ea98..e67ea98 100644
--- a/OpenSim.Framework/Interfaces/IGridServer.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IGridServer.cs
diff --git a/OpenSim.Framework/Interfaces/ILocalStorage.cs b/Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs
index 4dd8868..4dd8868 100644
--- a/OpenSim.Framework/Interfaces/ILocalStorage.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/ILocalStorage.cs
diff --git a/OpenSim.Framework/Interfaces/IScriptAPI.cs b/Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs
index 3ad0f06..3ad0f06 100644
--- a/OpenSim.Framework/Interfaces/IScriptAPI.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IScriptAPI.cs
diff --git a/OpenSim.Framework/Interfaces/IScriptEngine.cs b/Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs
index ed8974c..ed8974c 100644
--- a/OpenSim.Framework/Interfaces/IScriptEngine.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IScriptEngine.cs
diff --git a/OpenSim.Framework/Interfaces/IUserConfig.cs b/Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs
index e15867d..e15867d 100644
--- a/OpenSim.Framework/Interfaces/IUserConfig.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IUserConfig.cs
diff --git a/OpenSim.Framework/Interfaces/IUserServer.cs b/Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs
index 21f2721..21f2721 100644
--- a/OpenSim.Framework/Interfaces/IUserServer.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/IUserServer.cs
diff --git a/OpenSim.Framework/Interfaces/LocalGridBase.cs b/Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs
index ff46502..ff46502 100644
--- a/OpenSim.Framework/Interfaces/LocalGridBase.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/LocalGridBase.cs
diff --git a/OpenSim.Framework/Interfaces/RemoteGridBase.cs b/Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs
index ed13ed5..ed13ed5 100644
--- a/OpenSim.Framework/Interfaces/RemoteGridBase.cs
+++ b/Common-Source/OpenSim.Framework/Interfaces/RemoteGridBase.cs
diff --git a/OpenSim.Framework/LoginService.cs b/Common-Source/OpenSim.Framework/LoginService.cs
index eba0281..eba0281 100644
--- a/OpenSim.Framework/LoginService.cs
+++ b/Common-Source/OpenSim.Framework/LoginService.cs
diff --git a/OpenSim.Framework/OpenSim.Framework.csproj b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj
index c2f01d8..1b7f3c0 100644
--- a/OpenSim.Framework/OpenSim.Framework.csproj
+++ b/Common-Source/OpenSim.Framework/OpenSim.Framework.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,7 +6,8 @@
6 <ProjectGuid>{8ACA2445-0000-0000-0000-000000000000}</ProjectGuid> 6 <ProjectGuid>{8ACA2445-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></ApplicationIcon> 9 <ApplicationIcon>
10 </ApplicationIcon>
10 <AssemblyKeyContainerName> 11 <AssemblyKeyContainerName>
11 </AssemblyKeyContainerName> 12 </AssemblyKeyContainerName>
12 <AssemblyName>OpenSim.Framework</AssemblyName> 13 <AssemblyName>OpenSim.Framework</AssemblyName>
@@ -15,9 +16,11 @@
15 <DefaultTargetSchema>IE50</DefaultTargetSchema> 16 <DefaultTargetSchema>IE50</DefaultTargetSchema>
16 <DelaySign>false</DelaySign> 17 <DelaySign>false</DelaySign>
17 <OutputType>Library</OutputType> 18 <OutputType>Library</OutputType>
18 <AppDesignerFolder></AppDesignerFolder> 19 <AppDesignerFolder>
20 </AppDesignerFolder>
19 <RootNamespace>OpenSim.Framework</RootNamespace> 21 <RootNamespace>OpenSim.Framework</RootNamespace>
20 <StartupObject></StartupObject> 22 <StartupObject>
23 </StartupObject>
21 <FileUpgradeFlags> 24 <FileUpgradeFlags>
22 </FileUpgradeFlags> 25 </FileUpgradeFlags>
23 </PropertyGroup> 26 </PropertyGroup>
@@ -28,7 +31,8 @@
28 <ConfigurationOverrideFile> 31 <ConfigurationOverrideFile>
29 </ConfigurationOverrideFile> 32 </ConfigurationOverrideFile>
30 <DefineConstants>TRACE;DEBUG</DefineConstants> 33 <DefineConstants>TRACE;DEBUG</DefineConstants>
31 <DocumentationFile></DocumentationFile> 34 <DocumentationFile>
35 </DocumentationFile>
32 <DebugSymbols>True</DebugSymbols> 36 <DebugSymbols>True</DebugSymbols>
33 <FileAlignment>4096</FileAlignment> 37 <FileAlignment>4096</FileAlignment>
34 <Optimize>False</Optimize> 38 <Optimize>False</Optimize>
@@ -37,7 +41,8 @@
37 <RemoveIntegerChecks>False</RemoveIntegerChecks> 41 <RemoveIntegerChecks>False</RemoveIntegerChecks>
38 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 42 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
39 <WarningLevel>4</WarningLevel> 43 <WarningLevel>4</WarningLevel>
40 <NoWarn></NoWarn> 44 <NoWarn>
45 </NoWarn>
41 </PropertyGroup> 46 </PropertyGroup>
42 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> 47 <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
43 <AllowUnsafeBlocks>False</AllowUnsafeBlocks> 48 <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
@@ -46,7 +51,8 @@
46 <ConfigurationOverrideFile> 51 <ConfigurationOverrideFile>
47 </ConfigurationOverrideFile> 52 </ConfigurationOverrideFile>
48 <DefineConstants>TRACE</DefineConstants> 53 <DefineConstants>TRACE</DefineConstants>
49 <DocumentationFile></DocumentationFile> 54 <DocumentationFile>
55 </DocumentationFile>
50 <DebugSymbols>False</DebugSymbols> 56 <DebugSymbols>False</DebugSymbols>
51 <FileAlignment>4096</FileAlignment> 57 <FileAlignment>4096</FileAlignment>
52 <Optimize>True</Optimize> 58 <Optimize>True</Optimize>
@@ -55,22 +61,24 @@
55 <RemoveIntegerChecks>False</RemoveIntegerChecks> 61 <RemoveIntegerChecks>False</RemoveIntegerChecks>
56 <TreatWarningsAsErrors>False</TreatWarningsAsErrors> 62 <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
57 <WarningLevel>4</WarningLevel> 63 <WarningLevel>4</WarningLevel>
58 <NoWarn></NoWarn> 64 <NoWarn>
65 </NoWarn>
59 </PropertyGroup> 66 </PropertyGroup>
60 <ItemGroup> 67 <ItemGroup>
61 <Reference Include="System" > 68 <Reference Include="System">
62 <HintPath>System.dll</HintPath> 69 <HintPath>System.dll</HintPath>
63 <Private>False</Private> 70 <Private>False</Private>
64 </Reference> 71 </Reference>
65 <Reference Include="System.Xml" > 72 <Reference Include="System.Data" />
73 <Reference Include="System.Xml">
66 <HintPath>System.Xml.dll</HintPath> 74 <HintPath>System.Xml.dll</HintPath>
67 <Private>False</Private> 75 <Private>False</Private>
68 </Reference> 76 </Reference>
69 <Reference Include="libsecondlife.dll" > 77 <Reference Include="libsecondlife.dll">
70 <HintPath>..\bin\libsecondlife.dll</HintPath> 78 <HintPath>..\bin\libsecondlife.dll</HintPath>
71 <Private>False</Private> 79 <Private>False</Private>
72 </Reference> 80 </Reference>
73 <Reference Include="Db4objects.Db4o.dll" > 81 <Reference Include="Db4objects.Db4o.dll">
74 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath> 82 <HintPath>..\bin\Db4objects.Db4o.dll</HintPath>
75 <Private>False</Private> 83 <Private>False</Private>
76 </Reference> 84 </Reference>
@@ -80,7 +88,7 @@
80 <Name>XMLRPC</Name> 88 <Name>XMLRPC</Name>
81 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project> 89 <Project>{8E81D43C-0000-0000-0000-000000000000}</Project>
82 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> 90 <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
83 <Private>False</Private> 91 <Private>False</Private>
84 </ProjectReference> 92 </ProjectReference>
85 </ItemGroup> 93 </ItemGroup>
86 <ItemGroup> 94 <ItemGroup>
@@ -93,6 +101,7 @@
93 <Compile Include="HeightMapGenHills.cs"> 101 <Compile Include="HeightMapGenHills.cs">
94 <SubType>Code</SubType> 102 <SubType>Code</SubType>
95 </Compile> 103 </Compile>
104 <Compile Include="Interfaces\IClientAPI.cs" />
96 <Compile Include="LoginService.cs"> 105 <Compile Include="LoginService.cs">
97 <SubType>Code</SubType> 106 <SubType>Code</SubType>
98 </Compile> 107 </Compile>
@@ -188,4 +197,4 @@
188 <PostBuildEvent> 197 <PostBuildEvent>
189 </PostBuildEvent> 198 </PostBuildEvent>
190 </PropertyGroup> 199 </PropertyGroup>
191</Project> 200</Project> \ No newline at end of file
diff --git a/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user
new file mode 100644
index 0000000..d47d65d
--- /dev/null
+++ b/Common-Source/OpenSim.Framework/OpenSim.Framework.csproj.user
@@ -0,0 +1,12 @@
1<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2 <PropertyGroup>
3 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
4 <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
5 <ReferencePath>C:\New Folder\second-life-viewer\opensim-dailys2\opensim15-07\bin\</ReferencePath>
6 <LastOpenVersion>8.0.50727</LastOpenVersion>
7 <ProjectView>ProjectFiles</ProjectView>
8 <ProjectTrust>0</ProjectTrust>
9 </PropertyGroup>
10 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " />
11 <PropertyGroup Condition = " '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " />
12</Project>
diff --git a/OpenSim.Framework/OpenSim.Framework.dll.build b/Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build
index 77d5ce9..fecd382 100644
--- a/OpenSim.Framework/OpenSim.Framework.dll.build
+++ b/Common-Source/OpenSim.Framework/OpenSim.Framework.dll.build
@@ -23,6 +23,7 @@
23 <include name="UserProfileManagerBase.cs" /> 23 <include name="UserProfileManagerBase.cs" />
24 <include name="Util.cs" /> 24 <include name="Util.cs" />
25 <include name="Interfaces/IAssetServer.cs" /> 25 <include name="Interfaces/IAssetServer.cs" />
26 <include name="Interfaces/IClientAPI.cs" />
26 <include name="Interfaces/IConfig.cs" /> 27 <include name="Interfaces/IConfig.cs" />
27 <include name="Interfaces/IGenericConfig.cs" /> 28 <include name="Interfaces/IGenericConfig.cs" />
28 <include name="Interfaces/IGridConfig.cs" /> 29 <include name="Interfaces/IGridConfig.cs" />
diff --git a/OpenSim.Framework/Properties/AssemblyInfo.cs b/Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs
index 86f5cdb..86f5cdb 100644
--- a/OpenSim.Framework/Properties/AssemblyInfo.cs
+++ b/Common-Source/OpenSim.Framework/Properties/AssemblyInfo.cs
diff --git a/OpenSim.Framework/Remoting.cs b/Common-Source/OpenSim.Framework/Remoting.cs
index 1212ee5..1212ee5 100644
--- a/OpenSim.Framework/Remoting.cs
+++ b/Common-Source/OpenSim.Framework/Remoting.cs
diff --git a/OpenSim.Framework/SimProfile.cs b/Common-Source/OpenSim.Framework/SimProfile.cs
index 8acb20b..8acb20b 100644
--- a/OpenSim.Framework/SimProfile.cs
+++ b/Common-Source/OpenSim.Framework/SimProfile.cs
diff --git a/OpenSim.Framework/SimProfileBase.cs b/Common-Source/OpenSim.Framework/SimProfileBase.cs
index 30e2e0f..30e2e0f 100644
--- a/OpenSim.Framework/SimProfileBase.cs
+++ b/Common-Source/OpenSim.Framework/SimProfileBase.cs
diff --git a/OpenSim.Framework/Types/AgentCiruitData.cs b/Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs
index 7314586..7314586 100644
--- a/OpenSim.Framework/Types/AgentCiruitData.cs
+++ b/Common-Source/OpenSim.Framework/Types/AgentCiruitData.cs
diff --git a/OpenSim.Framework/Types/AssetBase.cs b/Common-Source/OpenSim.Framework/Types/AssetBase.cs
index f6104f8..f6104f8 100644
--- a/OpenSim.Framework/Types/AssetBase.cs
+++ b/Common-Source/OpenSim.Framework/Types/AssetBase.cs
diff --git a/OpenSim.Framework/Types/AssetLandmark.cs b/Common-Source/OpenSim.Framework/Types/AssetLandmark.cs
index 9d1a326..9d1a326 100644
--- a/OpenSim.Framework/Types/AssetLandmark.cs
+++ b/Common-Source/OpenSim.Framework/Types/AssetLandmark.cs
diff --git a/OpenSim.Framework/Types/AssetStorage.cs b/Common-Source/OpenSim.Framework/Types/AssetStorage.cs
index 5b5b3b2..5b5b3b2 100644
--- a/OpenSim.Framework/Types/AssetStorage.cs
+++ b/Common-Source/OpenSim.Framework/Types/AssetStorage.cs
diff --git a/OpenSim.Framework/Types/Login.cs b/Common-Source/OpenSim.Framework/Types/Login.cs
index 71f9de3..71f9de3 100644
--- a/OpenSim.Framework/Types/Login.cs
+++ b/Common-Source/OpenSim.Framework/Types/Login.cs
diff --git a/OpenSim.Framework/Types/NeighbourInfo.cs b/Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs
index 58b6cb1..58b6cb1 100644
--- a/OpenSim.Framework/Types/NeighbourInfo.cs
+++ b/Common-Source/OpenSim.Framework/Types/NeighbourInfo.cs
diff --git a/OpenSim.Framework/Types/OSVector3.cs b/Common-Source/OpenSim.Framework/Types/OSVector3.cs
index 8fb840b..8fb840b 100644
--- a/OpenSim.Framework/Types/OSVector3.cs
+++ b/Common-Source/OpenSim.Framework/Types/OSVector3.cs
diff --git a/OpenSim.Framework/Types/PrimData.cs b/Common-Source/OpenSim.Framework/Types/PrimData.cs
index 68e2a22..68e2a22 100644
--- a/OpenSim.Framework/Types/PrimData.cs
+++ b/Common-Source/OpenSim.Framework/Types/PrimData.cs
diff --git a/OpenSim.Framework/UserProfile.cs b/Common-Source/OpenSim.Framework/UserProfile.cs
index f95a8fa..f95a8fa 100644
--- a/OpenSim.Framework/UserProfile.cs
+++ b/Common-Source/OpenSim.Framework/UserProfile.cs
diff --git a/OpenSim.Framework/UserProfileManager.cs b/Common-Source/OpenSim.Framework/UserProfileManager.cs
index 18b3513..18b3513 100644
--- a/OpenSim.Framework/UserProfileManager.cs
+++ b/Common-Source/OpenSim.Framework/UserProfileManager.cs
diff --git a/OpenSim.Framework/UserProfileManagerBase.cs b/Common-Source/OpenSim.Framework/UserProfileManagerBase.cs
index d1307a5..d1307a5 100644
--- a/OpenSim.Framework/UserProfileManagerBase.cs
+++ b/Common-Source/OpenSim.Framework/UserProfileManagerBase.cs
diff --git a/OpenSim.Framework/Util.cs b/Common-Source/OpenSim.Framework/Util.cs
index 400f415..400f415 100644
--- a/OpenSim.Framework/Util.cs
+++ b/Common-Source/OpenSim.Framework/Util.cs