aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Client/Linden/LLClientStackModule.cs136
-rw-r--r--OpenSim/Client/Linden/Resources/LindenModules.addin.xml13
-rw-r--r--prebuild.xml40
3 files changed, 0 insertions, 189 deletions
diff --git a/OpenSim/Client/Linden/LLClientStackModule.cs b/OpenSim/Client/Linden/LLClientStackModule.cs
deleted file mode 100644
index f882d5d..0000000
--- a/OpenSim/Client/Linden/LLClientStackModule.cs
+++ /dev/null
@@ -1,136 +0,0 @@
1/*
2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met:
7 * * Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer.
9 * * Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution.
12 * * Neither the name of the OpenSimulator Project nor the
13 * names of its contributors may be used to endorse or promote products
14 * derived from this software without specific prior written permission.
15 *
16 * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
17 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
18 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
19 * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
20 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
21 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
22 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
23 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */
27
28using System;
29using System.Collections.Generic;
30using System.Net;
31using System.Reflection;
32using System.Text;
33using log4net;
34using Nini.Config;
35using OpenMetaverse;
36using OpenSim.Region.ClientStack;
37using OpenSim.Region.ClientStack.LindenUDP;
38using OpenSim.Framework;
39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Region.Framework.Interfaces;
41
42namespace OpenSim.Client.Linden
43{
44 /// <summary>
45 /// Linden UDP Stack Region Module
46 /// </summary>
47 public class LLClientStackModule : INonSharedRegionModule
48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50
51 #region IRegionModule Members
52
53 /// <summary>
54 /// Scene that contains the region's data
55 /// </summary>
56 protected Scene m_scene;
57 protected bool m_createClientStack = false;
58 protected IClientNetworkServer m_clientServer;
59 protected ClientStackManager m_clientStackManager;
60 protected IConfigSource m_source;
61
62 protected string m_clientStackDll = "OpenSim.Region.ClientStack.LindenUDP.dll";
63
64 public void Initialise(IConfigSource source)
65 {
66 if (m_scene == null)
67 {
68 m_source = source;
69
70 IConfig startupConfig = m_source.Configs["Startup"];
71 if (startupConfig != null)
72 {
73 m_clientStackDll = startupConfig.GetString("clientstack_plugin", "OpenSim.Region.ClientStack.LindenUDP.dll");
74 }
75 }
76 }
77
78 public void AddRegion(Scene scene)
79 {
80
81 }
82
83 public void RemoveRegion(Scene scene)
84 {
85
86 }
87
88 public void RegionLoaded(Scene scene)
89 {
90 if (m_scene == null)
91 {
92 m_scene = scene;
93 }
94
95 if ((m_scene != null) && (m_createClientStack))
96 {
97 m_log.Info("[LLClientStackModule] Starting up LLClientStack.");
98 IPEndPoint endPoint = m_scene.RegionInfo.InternalEndPoint;
99
100 uint port = (uint)endPoint.Port;
101 m_clientStackManager = new ClientStackManager(m_clientStackDll);
102
103 m_clientServer
104 = m_clientStackManager.CreateServer(endPoint.Address,
105 ref port, m_scene.RegionInfo.ProxyOffset, m_scene.RegionInfo.m_allow_alternate_ports, m_source,
106 m_scene.AuthenticateHandler);
107
108 m_clientServer.AddScene(m_scene);
109
110 m_clientServer.Start();
111 }
112 }
113
114 public void Close()
115 {
116
117 }
118
119 public Type ReplaceableInterface
120 {
121 get { return null; }
122 }
123
124 public string Name
125 {
126 get { return "LLClientStackModule"; }
127 }
128
129 public bool IsSharedModule
130 {
131 get { return false; }
132 }
133
134 #endregion
135 }
136}
diff --git a/OpenSim/Client/Linden/Resources/LindenModules.addin.xml b/OpenSim/Client/Linden/Resources/LindenModules.addin.xml
deleted file mode 100644
index af41e98..0000000
--- a/OpenSim/Client/Linden/Resources/LindenModules.addin.xml
+++ /dev/null
@@ -1,13 +0,0 @@
1<Addin id="OpenSim.Client.Linden.LindenModules" version="0.2">
2 <Runtime>
3 <Import assembly="OpenSim.Client.Linden.dll"/>
4 </Runtime>
5
6 <Dependencies>
7 <Addin id="OpenSim" version="0.5" />
8 </Dependencies>
9
10 <Extension path = "/OpenSim/RegionModules">
11 <RegionModule id="LLClientStackModule" type="OpenSim.Client.Linden.LLClientStackModule" />
12 </Extension>
13</Addin>
diff --git a/prebuild.xml b/prebuild.xml
index 0d6d6fb..cbe539e 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1991,7 +1991,6 @@
1991 </Files> 1991 </Files>
1992 </Project> 1992 </Project>
1993 1993
1994
1995 <Project frameworkVersion="v3_5" name="OpenSim.Client.VWoHTTP" path="OpenSim/Client/VWoHTTP" type="Library"> 1994 <Project frameworkVersion="v3_5" name="OpenSim.Client.VWoHTTP" path="OpenSim/Client/VWoHTTP" type="Library">
1996 <Configuration name="Debug"> 1995 <Configuration name="Debug">
1997 <Options> 1996 <Options>
@@ -2023,45 +2022,6 @@
2023 </Files> 2022 </Files>
2024 </Project> 2023 </Project>
2025 2024
2026 <Project frameworkVersion="v3_5" name="OpenSim.Client.Linden" path="OpenSim/Client/Linden" type="Library">
2027 <Configuration name="Debug">
2028 <Options>
2029 <OutputPath>../../../bin/</OutputPath>
2030 </Options>
2031 </Configuration>
2032 <Configuration name="Release">
2033 <Options>
2034 <OutputPath>../../../bin/</OutputPath>
2035 </Options>
2036 </Configuration>
2037
2038 <ReferencePath>../../../bin/</ReferencePath>
2039
2040 <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
2041 <Reference name="OpenMetaverse" path="../../../bin/"/>
2042 <Reference name="System"/>
2043 <Reference name="OpenSim.Framework"/>
2044 <Reference name="OpenSim.Region.Framework"/>
2045 <Reference name="OpenSim.Framework.Communications"/>
2046 <Reference name="Nini" path="../../../bin/"/>
2047 <Reference name="log4net" path="../../../bin/"/>
2048 <Reference name="OpenSim.Framework.Capabilities"/>
2049 <Reference name="OpenSim.Framework.Servers"/>
2050 <Reference name="OpenSim.Framework.Servers.HttpServer"/>
2051 <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
2052 <Reference name="OpenSim.Region.ClientStack"/>
2053 <Reference name="OpenSim.Region.ClientStack.LindenUDP"/>
2054 <Reference name="OpenSim.Services.Interfaces"/>
2055 <Reference name="XMLRPC" path="../../../bin/"/>
2056 <Reference name="OpenSim.Region.Framework"/>
2057 <Files>
2058 <Match pattern="*.cs" recurse="true"/>
2059 <Match buildAction="EmbeddedResource" path="Resources" pattern="*.addin.xml" recurse="true"/>
2060 </Files>
2061 </Project>
2062
2063
2064
2065 <!-- Data Base Modules --> 2025 <!-- Data Base Modules -->
2066 <Project frameworkVersion="v3_5" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library"> 2026 <Project frameworkVersion="v3_5" name="OpenSim.Data.MySQL" path="OpenSim/Data/MySQL" type="Library">
2067 <Configuration name="Debug"> 2027 <Configuration name="Debug">
generated by cgit v1.1 at 2024-11-09 08:09:23 +0000