* Added conceptual LlsdMethod Demo to SimpleApp (work in progress)

3 files changed, 14 insertions, 0 deletions

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;
 using System.Net;

 using libsecondlife.Packets;

 using OpenSim.Physics.Manager;

+using OpenSim.Region.Capabilities;

 

 namespace SimpleApp

 {

@@ -63,6 +64,7 @@ namespace SimpleApp
             udpServer.LocalWorld = world;

 

             httpServer.AddXmlRPCHandler("login_to_simulator", communicationsManager.UserServices.XmlRpcLoginMethod );

+            httpServer.AddLlsdMethod<LLSDMapLayerResponse, LLSDMapRequest>("/Caps/test/", LlsdMethodDemo);

             httpServer.Start();

             

             m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");

@@ -75,6 +77,11 @@ namespace SimpleApp
 

         }

 

+        private LLSDMapLayerResponse LlsdMethodDemo(LLSDMapRequest request)

+        {

+            return new LLSDMapLayerResponse();

+        }

+        

         private bool AddNewSessionHandler(ulong regionHandle, Login loginData)

         {

             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 @@
       <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

                         <Private>False</Private>

     </ProjectReference>

+    <ProjectReference Include="..\..\Capabilities\OpenSim.Region.Capabilities.csproj">

+      <Name>OpenSim.Region.Capabilities</Name>

+      <Project>{39038E85-0000-0000-0000-000000000000}</Project>

+      <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>

+                        <Private>False</Private>

+    </ProjectReference>

     <ProjectReference Include="..\..\ClientStack\OpenSim.Region.ClientStack.csproj">

       <Name>OpenSim.Region.ClientStack</Name>

       <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 @@
                 <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.Capabilities.dll" />

                 <include name="../../../../bin/OpenSim.Region.ClientStack.dll" />

                 <include name="../../../../bin/OpenSim.Region.Communications.Local.dll" />

                 <include name="../../../../bin/OpenSim.Region.Environment.dll" />