* Adds Websocket support to baseHttpServer and IHttpServer.cs . This allows modules to set up a websocket server that websocket clients can connect to. An example module is in OptionalModules/Example/WebSocketEchoTest/WebSocketEchoModule.cs

author: teravus 2013-02-07 10:28:26 -0500
committer: teravus 2013-02-07 10:50:17 -0500
commit: 94a5232d3a07c3ff5f9b720dfc975848d750f423 (patch)
tree: f2329adf59b6525528db1e7e099e8beddaf39a6d /prebuild.xml
parent: This is the final commit that enables the Websocket handler (diff)
parent: Rename "Bounciness" to "Restitution" (diff)
download: opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.zip
opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.gz
opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.bz2
opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.xz
1 files changed, 2 insertions, 43 deletions
diff --git a/prebuild.xml b/prebuild.xml
index d8b4145..68a9539 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -1510,49 +1510,7 @@
      </Files>
    </Project>
-    <Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.TCPJSONStream" path="OpenSim/Region/ClientStack/TCPJSONStream" type="Library">
+    
-      <Configuration name="Debug">
-        <Options>
-          <OutputPath>../../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <Configuration name="Release">
-        <Options>
-          <OutputPath>../../../../bin/</OutputPath>
-        </Options>
-      </Configuration>
-      <ReferencePath>../../../../bin/</ReferencePath>
-      <Reference name="System"/>
-      <Reference name="System.Core"/>
-      <Reference name="System.Drawing"/>
-      <Reference name="System.Xml"/>
-      <Reference name="System.Web"/>
-      <Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
-      <Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
-      <Reference name="OpenMetaverse" path="../../../../bin/"/>
-      <Reference name="OpenSim.Data"/>
-      <Reference name="OpenSim.Framework"/>
-      <Reference name="OpenSim.Framework.Monitoring"/>
-      <Reference name="OpenSim.Framework.Servers"/>
-      <Reference name="OpenSim.Framework.Servers.HttpServer"/>
-      <Reference name="OpenSim.Framework.Console"/>
-      <Reference name="OpenSim.Framework.Communications"/>
-      <Reference name="OpenSim.Region.ClientStack"/>
-      <Reference name="OpenSim.Region.Framework"/>
-      <Reference name="OpenSim.Services.Interfaces"/>
-      <Reference name="Nini" path="../../../../bin/"/>
-      <Reference name="log4net" path="../../../../bin/"/>
-      <Reference name="C5" path="../../../../bin/"/>
-      <Reference name="Nini" path="../../../../bin/"/>
-      <Files>
-        <Match pattern="*.cs" recurse="true">
-          <Exclude name="Tests" pattern="Tests"/>
-        </Match>
-      </Files>
-    </Project>
    <Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
      <Configuration name="Debug">
        <Options>
@@ -3068,6 +3026,7 @@
      <Reference name="System.Drawing"/>
      <Reference name="OpenMetaverseTypes" path="../../../bin/"/>
      <Reference name="OpenMetaverse" path="../../../bin/"/>
+      <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
      <Reference name="OpenSim.Data"/>
      <Reference name="OpenSim.Data.Null"/>
      <Reference name="OpenSim.Framework"/>
author	teravus	2013-02-07 10:28:26 -0500
committer	teravus	2013-02-07 10:50:17 -0500
commit	94a5232d3a07c3ff5f9b720dfc975848d750f423 (patch)
tree	f2329adf59b6525528db1e7e099e8beddaf39a6d /prebuild.xml
parent	This is the final commit that enables the Websocket handler (diff)
parent	Rename "Bounciness" to "Restitution" (diff)
download	opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.zip opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.gz opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.bz2 opensim-SC_OLD-94a5232d3a07c3ff5f9b720dfc975848d750f423.tar.xz

diff --git a/prebuild.xml b/prebuild.xml index d8b4145..68a9539 100644 --- a/prebuild.xml +++ b/prebuild.xml
@@ -1510,49 +1510,7 @@
1510	</Files>	1510	</Files>
1511	</Project>	1511	</Project>
1512		1512
1513	<Project frameworkVersion="v3_5" name="OpenSim.Region.ClientStack.TCPJSONStream" path="OpenSim/Region/ClientStack/TCPJSONStream" type="Library">	1513
1514	<Configuration name="Debug">
1515	<Options>
1516	<OutputPath>../../../../bin/</OutputPath>
1517	</Options>
1518	</Configuration>
1519	<Configuration name="Release">
1520	<Options>
1521	<OutputPath>../../../../bin/</OutputPath>
1522	</Options>
1523	</Configuration>
1524
1525	<ReferencePath>../../../../bin/</ReferencePath>
1526	<Reference name="System"/>
1527	<Reference name="System.Core"/>
1528	<Reference name="System.Drawing"/>
1529	<Reference name="System.Xml"/>
1530	<Reference name="System.Web"/>
1531	<Reference name="OpenMetaverseTypes" path="../../../../bin/"/>
1532	<Reference name="OpenMetaverse.StructuredData" path="../../../../bin/"/>
1533	<Reference name="OpenMetaverse" path="../../../../bin/"/>
1534	<Reference name="OpenSim.Data"/>
1535	<Reference name="OpenSim.Framework"/>
1536	<Reference name="OpenSim.Framework.Monitoring"/>
1537	<Reference name="OpenSim.Framework.Servers"/>
1538	<Reference name="OpenSim.Framework.Servers.HttpServer"/>
1539	<Reference name="OpenSim.Framework.Console"/>
1540	<Reference name="OpenSim.Framework.Communications"/>
1541	<Reference name="OpenSim.Region.ClientStack"/>
1542	<Reference name="OpenSim.Region.Framework"/>
1543	<Reference name="OpenSim.Services.Interfaces"/>
1544	<Reference name="Nini" path="../../../../bin/"/>
1545	<Reference name="log4net" path="../../../../bin/"/>
1546	<Reference name="C5" path="../../../../bin/"/>
1547	<Reference name="Nini" path="../../../../bin/"/>
1548
1549	<Files>
1550	<Match pattern="*.cs" recurse="true">
1551	<Exclude name="Tests" pattern="Tests"/>
1552	</Match>
1553	</Files>
1554	</Project>
1555
1556	<Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">	1514	<Project frameworkVersion="v3_5" name="OpenSim.Region.CoreModules" path="OpenSim/Region/CoreModules" type="Library">
1557	<Configuration name="Debug">	1515	<Configuration name="Debug">
1558	<Options>	1516	<Options>
@@ -3068,6 +3026,7 @@
3068	<Reference name="System.Drawing"/>	3026	<Reference name="System.Drawing"/>
3069	<Reference name="OpenMetaverseTypes" path="../../../bin/"/>	3027	<Reference name="OpenMetaverseTypes" path="../../../bin/"/>
3070	<Reference name="OpenMetaverse" path="../../../bin/"/>	3028	<Reference name="OpenMetaverse" path="../../../bin/"/>
		3029	<Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
3071	<Reference name="OpenSim.Data"/>	3030	<Reference name="OpenSim.Data"/>
3072	<Reference name="OpenSim.Data.Null"/>	3031	<Reference name="OpenSim.Data.Null"/>
3073	<Reference name="OpenSim.Framework"/>	3032	<Reference name="OpenSim.Framework"/>