diff options
author | lbsa71 | 2007-07-02 20:44:39 +0000 |
---|---|---|
committer | lbsa71 | 2007-07-02 20:44:39 +0000 |
commit | 71f1b2d87803e4fb3a0fb5a12d1e9a2f4287b6fa (patch) | |
tree | 295a9c854097b3be6d430a019cc2489e138ad93a /OpenSim | |
parent | Applied Darok's PhysicsVector ToString patch (diff) | |
download | opensim-SC-71f1b2d87803e4fb3a0fb5a12d1e9a2f4287b6fa.zip opensim-SC-71f1b2d87803e4fb3a0fb5a12d1e9a2f4287b6fa.tar.gz opensim-SC-71f1b2d87803e4fb3a0fb5a12d1e9a2f4287b6fa.tar.bz2 opensim-SC-71f1b2d87803e4fb3a0fb5a12d1e9a2f4287b6fa.tar.xz |
* Added conceptual LlsdMethod Demo to SimpleApp (work in progress)
Diffstat (limited to 'OpenSim')
7 files changed, 40 insertions, 25 deletions
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 0442b1a..5dc1f56 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -289,5 +289,10 @@ namespace OpenSim.Framework.Servers | |||
289 | OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message); | 289 | OpenSim.Framework.Console.MainLog.Instance.WriteLine(LogPriority.MEDIUM, e.Message); |
290 | } | 290 | } |
291 | } | 291 | } |
292 | |||
293 | public void AddLlsdMethod<TResponse, TRequest>(string path, LlsdMethod<TResponse, TRequest> handler ) | ||
294 | { | ||
295 | throw new Exception("The method or operation is not implemented."); | ||
296 | } | ||
292 | } | 297 | } |
293 | } | 298 | } |
diff --git a/OpenSim/Framework/Servers/LlsdMethod.cs b/OpenSim/Framework/Servers/LlsdMethod.cs index 4ce4287..c66873f 100644 --- a/OpenSim/Framework/Servers/LlsdMethod.cs +++ b/OpenSim/Framework/Servers/LlsdMethod.cs | |||
@@ -4,5 +4,6 @@ using System.Text; | |||
4 | 4 | ||
5 | namespace OpenSim.Framework.Servers | 5 | namespace OpenSim.Framework.Servers |
6 | { | 6 | { |
7 | public delegate string LlsdMethod(string request, string path, string param); | 7 | public delegate object LlsdMethod(object request, string path, string param); |
8 | public delegate TResponse LlsdMethod<TResponse, TRequest>( TRequest request ); | ||
8 | } | 9 | } |
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj index d6d0815..38d611e 100644 --- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.csproj +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.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>{2CC71860-0000-0000-0000-000000000000}</ProjectGuid> | 6 | <ProjectGuid>{2CC71860-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.Servers</AssemblyName> | 12 | <AssemblyName>OpenSim.Framework.Servers</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.Servers</RootNamespace> | 19 | <RootNamespace>OpenSim.Framework.Servers</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,24 +55,22 @@ | |||
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="libsecondlife.dll"> | 61 | <Reference Include="libsecondlife.dll" > |
69 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> | 62 | <HintPath>..\..\..\bin\libsecondlife.dll</HintPath> |
70 | <Private>False</Private> | 63 | <Private>False</Private> |
71 | </Reference> | 64 | </Reference> |
72 | <Reference Include="System"> | 65 | <Reference Include="System" > |
73 | <HintPath>System.dll</HintPath> | 66 | <HintPath>System.dll</HintPath> |
74 | <Private>False</Private> | 67 | <Private>False</Private> |
75 | </Reference> | 68 | </Reference> |
76 | <Reference Include="System.Data" /> | 69 | <Reference Include="System.Xml" > |
77 | <Reference Include="System.Xml"> | ||
78 | <HintPath>System.Xml.dll</HintPath> | 70 | <HintPath>System.Xml.dll</HintPath> |
79 | <Private>False</Private> | 71 | <Private>False</Private> |
80 | </Reference> | 72 | </Reference> |
81 | <Reference Include="XMLRPC.dll"> | 73 | <Reference Include="XMLRPC.dll" > |
82 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> | 74 | <HintPath>..\..\..\bin\XMLRPC.dll</HintPath> |
83 | <Private>False</Private> | 75 | <Private>False</Private> |
84 | </Reference> | 76 | </Reference> |
@@ -88,13 +80,13 @@ | |||
88 | <Name>OpenSim.Framework</Name> | 80 | <Name>OpenSim.Framework</Name> |
89 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> | 81 | <Project>{8ACA2445-0000-0000-0000-000000000000}</Project> |
90 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 82 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
91 | <Private>False</Private> | 83 | <Private>False</Private> |
92 | </ProjectReference> | 84 | </ProjectReference> |
93 | <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj"> | 85 | <ProjectReference Include="..\Console\OpenSim.Framework.Console.csproj"> |
94 | <Name>OpenSim.Framework.Console</Name> | 86 | <Name>OpenSim.Framework.Console</Name> |
95 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> | 87 | <Project>{A7CD0630-0000-0000-0000-000000000000}</Project> |
96 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 88 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
97 | <Private>False</Private> | 89 | <Private>False</Private> |
98 | </ProjectReference> | 90 | </ProjectReference> |
99 | </ItemGroup> | 91 | </ItemGroup> |
100 | <ItemGroup> | 92 | <ItemGroup> |
@@ -104,7 +96,9 @@ | |||
104 | <Compile Include="CheckSumServer.cs"> | 96 | <Compile Include="CheckSumServer.cs"> |
105 | <SubType>Code</SubType> | 97 | <SubType>Code</SubType> |
106 | </Compile> | 98 | </Compile> |
107 | <Compile Include="LlsdMethod.cs" /> | 99 | <Compile Include="LlsdMethod.cs"> |
100 | <SubType>Code</SubType> | ||
101 | </Compile> | ||
108 | <Compile Include="RestMethod.cs"> | 102 | <Compile Include="RestMethod.cs"> |
109 | <SubType>Code</SubType> | 103 | <SubType>Code</SubType> |
110 | </Compile> | 104 | </Compile> |
@@ -122,4 +116,4 @@ | |||
122 | <PostBuildEvent> | 116 | <PostBuildEvent> |
123 | </PostBuildEvent> | 117 | </PostBuildEvent> |
124 | </PropertyGroup> | 118 | </PropertyGroup> |
125 | </Project> \ No newline at end of file | 119 | </Project> |
diff --git a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build index 60b204d..6640a29 100644 --- a/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build +++ b/OpenSim/Framework/Servers/OpenSim.Framework.Servers.dll.build | |||
@@ -13,6 +13,7 @@ | |||
13 | <sources failonempty="true"> | 13 | <sources failonempty="true"> |
14 | <include name="BaseHttpServer.cs" /> | 14 | <include name="BaseHttpServer.cs" /> |
15 | <include name="CheckSumServer.cs" /> | 15 | <include name="CheckSumServer.cs" /> |
16 | <include name="LlsdMethod.cs" /> | ||
16 | <include name="RestMethod.cs" /> | 17 | <include name="RestMethod.cs" /> |
17 | <include name="UDPServerBase.cs" /> | 18 | <include name="UDPServerBase.cs" /> |
18 | <include name="XmlRpcMethod.cs" /> | 19 | <include name="XmlRpcMethod.cs" /> |
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 3d9dd0d..2c5fb4d 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -17,6 +17,7 @@ using OpenSim.Region.ClientStack; | |||
17 | using System.Net; | 17 | using System.Net; |
18 | using libsecondlife.Packets; | 18 | using libsecondlife.Packets; |
19 | using OpenSim.Physics.Manager; | 19 | using OpenSim.Physics.Manager; |
20 | using OpenSim.Region.Capabilities; | ||
20 | 21 | ||
21 | namespace SimpleApp | 22 | namespace SimpleApp |
22 | { | 23 | { |
@@ -63,6 +64,7 @@ namespace SimpleApp | |||
63 | udpServer.LocalWorld = world; | 64 | udpServer.LocalWorld = world; |
64 | 65 | ||
65 | httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod ); | 66 | httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod ); |
67 | httpServer.AddLlsdMethod<LLSDMapLayerResponse, LLSDMapRequest>("/Caps/test/", LlsdMethodDemo); | ||
66 | httpServer.Start(); | 68 | httpServer.Start(); |
67 | 69 | ||
68 | m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); | 70 | m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); |
@@ -75,6 +77,11 @@ namespace SimpleApp | |||
75 | 77 | ||
76 | } | 78 | } |
77 | 79 | ||
80 | private LLSDMapLayerResponse LlsdMethodDemo(LLSDMapRequest request) | ||
81 | { | ||
82 | return new LLSDMapLayerResponse(); | ||
83 | } | ||
84 | |||
78 | private bool AddNewSessionHandler(ulong regionHandle, Login loginData) | 85 | private bool AddNewSessionHandler(ulong regionHandle, Login loginData) |
79 | { | 86 | { |
80 | m_log.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last); | 87 | m_log.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last); |
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj index bb8dcc0..3ed0efc 100644 --- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.csproj | |||
@@ -116,6 +116,12 @@ | |||
116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | 116 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> |
117 | <Private>False</Private> | 117 | <Private>False</Private> |
118 | </ProjectReference> | 118 | </ProjectReference> |
119 | <ProjectReference Include="..\..\Capabilities\OpenSim.Region.Capabilities.csproj"> | ||
120 | <Name>OpenSim.Region.Capabilities</Name> | ||
121 | <Project>{39038E85-0000-0000-0000-000000000000}</Project> | ||
122 | <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package> | ||
123 | <Private>False</Private> | ||
124 | </ProjectReference> | ||
119 | <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj"> | 125 | <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj"> |
120 | <Name>OpenSim.Region.ClientStack</Name> | 126 | <Name>OpenSim.Region.ClientStack</Name> |
121 | <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> | 127 | <Project>{DC3698B2-0000-0000-0000-000000000000}</Project> |
diff --git a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build index aab0826..0c6234a 100644 --- a/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build +++ b/OpenSim/Region/Examples/SimpleApp/SimpleApp.exe.build | |||
@@ -27,6 +27,7 @@ | |||
27 | <include name="../../../../bin/OpenSim.Framework.Servers.dll" /> | 27 | <include name="../../../../bin/OpenSim.Framework.Servers.dll" /> |
28 | <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" /> | 28 | <include name="../../../../bin/OpenSim.Framework.UserManagement.dll" /> |
29 | <include name="../../../../bin/OpenSim.Region.Caches.dll" /> | 29 | <include name="../../../../bin/OpenSim.Region.Caches.dll" /> |
30 | <include name="../../../../bin/OpenSim.Region.Capabilities.dll" /> | ||
30 | <include name="../../../../bin/OpenSim.Region.ClientStack.dll" /> | 31 | <include name="../../../../bin/OpenSim.Region.ClientStack.dll" /> |
31 | <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> | 32 | <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" /> |
32 | <include name="../../../../bin/OpenSim.Region.Environment.dll" /> | 33 | <include name="../../../../bin/OpenSim.Region.Environment.dll" /> |