aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authorgareth2007-03-14 03:34:49 +0000
committergareth2007-03-14 03:34:49 +0000
commit7a54467bed7e1da77f7e1a45ee01dfc709b5608d (patch)
treee0b575e4e87c4b127556597798186b7040d94b2a /src
parentMerged ogs-cs into trunk (diff)
downloadopensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.zip
opensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.tar.gz
opensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.tar.bz2
opensim-SC_OLD-7a54467bed7e1da77f7e1a45ee01dfc709b5608d.tar.xz
merged new OpenSim from branches/ogs-cs
Diffstat (limited to 'src')
-rw-r--r--src/CAPS/SimHttp.cs152
-rw-r--r--src/Config/SimConfig/AssemblyInfo.cs2
-rw-r--r--src/GridInterfaces/AssemblyInfo.cs2
-rw-r--r--src/GridInterfaces/IGridServer.cs17
-rw-r--r--src/LocalServers/LocalGridServers/AssemblyInfo.cs2
-rw-r--r--src/LocalServers/LocalGridServers/LocalGrid.cs9
-rw-r--r--src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs2
-rw-r--r--src/Main.cs6
-rw-r--r--src/OpenSimConsole.cs2
-rw-r--r--src/RemoteServers/RemoteGridServers/AssemblyInfo.cs2
-rw-r--r--src/RemoteServers/RemoteGridServers/RemoteGrid.cs48
-rw-r--r--src/ServerConsole/ServerConsole/AssemblyInfo.cs2
-rw-r--r--src/Util.cs10
-rw-r--r--src/VersionInfo.cs2
-rw-r--r--src/physics/AssemblyInfo.cs2
-rw-r--r--src/physics/plugins/AssemblyInfo.cs2
16 files changed, 229 insertions, 33 deletions
diff --git a/src/CAPS/SimHttp.cs b/src/CAPS/SimHttp.cs
new file mode 100644
index 0000000..eb20f3e
--- /dev/null
+++ b/src/CAPS/SimHttp.cs
@@ -0,0 +1,152 @@
1/*
2Copyright (c) OpenSimCAPS project, http://osgrid.org/
3
4
5* All rights reserved.
6*
7* Redistribution and use in source and binary forms, with or without
8* modification, are permitted provided that the following conditions are met:
9* * Redistributions of source code must retain the above copyright
10* notice, this list of conditions and the following disclaimer.
11* * Redistributions in binary form must reproduce the above copyright
12* notice, this list of conditions and the following disclaimer in the
13* documentation and/or other materials provided with the distribution.
14* * Neither the name of the <organization> nor the
15* names of its contributors may be used to endorse or promote products
16* derived from this software without specific prior written permission.
17*
18* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
19* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
20* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
21* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
22* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
23* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
24* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
25* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
27* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28*/
29
30using System;
31using System.Text;
32using Nwc.XmlRpc;
33using System.Threading;
34using System.Text.RegularExpressions;
35using System.Net;
36using System.IO;
37using System.Collections;
38using System.Collections.Generic;
39using libsecondlife;
40using ServerConsole;
41
42namespace OpenSim
43{
44 // Dummy HTTP server, does nothing useful for now
45
46 public class SimCAPSHTTPServer {
47 public Thread HTTPD;
48 public HttpListener Listener;
49
50 public SimCAPSHTTPServer() {
51 ServerConsole.MainConsole.Instance.WriteLine("Starting up HTTP Server");
52 HTTPD = new Thread(new ThreadStart(StartHTTP));
53 HTTPD.Start();
54 }
55
56 public void StartHTTP() {
57 ServerConsole.MainConsole.Instance.WriteLine("SimHttp.cs:StartHTTP() - Spawned main thread OK");
58 Listener = new HttpListener();
59
60 Listener.Prefixes.Add("http://+:" + OpenSim_Main.cfg.IPListenPort + "/");
61 Listener.Start();
62
63 HttpListenerContext context;
64 while(true) {
65 context = Listener.GetContext();
66 ThreadPool.QueueUserWorkItem(new WaitCallback(HandleRequest), context);
67 }
68 }
69
70 static string ParseXMLRPC(string requestBody) {
71 try{
72 XmlRpcRequest request = (XmlRpcRequest)(new XmlRpcRequestDeserializer()).Deserialize(requestBody);
73
74 Hashtable requestData = (Hashtable)request.Params[0];
75 switch(request.MethodName) {
76 case "expect_user":
77 GridServers.agentcircuitdata agent_data = new GridServers.agentcircuitdata();
78 agent_data.SessionID = new LLUUID((string)requestData["session_id"]);
79 agent_data.SecureSessionID = new LLUUID((string)requestData["secure_session_id"]);
80 agent_data.firstname = (string)requestData["firstname"];
81 agent_data.lastname = (string)requestData["lastname"];
82 agent_data.AgentID = new LLUUID((string)requestData["agent_id"]);
83 agent_data.circuitcode = Convert.ToUInt32(requestData["circuit_code"]);
84 OpenSim_Main.gridServers.GridServer.agentcircuits.Add((uint)agent_data.circuitcode,agent_data);
85 return "<?xml version=\"1.0\"?><methodResponse><params /></methodResponse>";
86 break;
87 }
88 } catch(Exception e) {
89 Console.WriteLine(e.ToString());
90 }
91 return "";
92 }
93
94 static string ParseREST(string requestBody, string requestURL) {
95 return "";
96 }
97
98 static string ParseLLSDXML(string requestBody) {
99 // dummy function for now - IMPLEMENT ME!
100 return "";
101 }
102
103 static void HandleRequest(Object stateinfo) {
104 HttpListenerContext context=(HttpListenerContext)stateinfo;
105
106 HttpListenerRequest request = context.Request;
107 HttpListenerResponse response = context.Response;
108
109 response.KeepAlive=false;
110 response.SendChunked=false;
111
112 System.IO.Stream body = request.InputStream;
113 System.Text.Encoding encoding = System.Text.Encoding.UTF8;
114 System.IO.StreamReader reader = new System.IO.StreamReader(body, encoding);
115
116 string requestBody = reader.ReadToEnd();
117 body.Close();
118 reader.Close();
119
120 string responseString="";
121 switch(request.ContentType) {
122 case "text/xml":
123 // must be XML-RPC, so pass to the XML-RPC parser
124
125 responseString=ParseXMLRPC(requestBody);
126 response.AddHeader("Content-type","text/xml");
127 break;
128
129 case "application/xml":
130 // probably LLSD we hope, otherwise it should be ignored by the parser
131 responseString=ParseLLSDXML(requestBody);
132 response.AddHeader("Content-type","application/xml");
133 break;
134
135 case null:
136 // must be REST or invalid crap, so pass to the REST parser
137 responseString=ParseREST(request.Url.OriginalString,requestBody);
138 break;
139 }
140
141
142 byte[] buffer = System.Text.Encoding.UTF8.GetBytes(responseString);
143 System.IO.Stream output = response.OutputStream;
144 response.SendChunked=false;
145 response.ContentLength64=buffer.Length;
146 output.Write(buffer,0,buffer.Length);
147 output.Close();
148 }
149 }
150
151
152}
diff --git a/src/Config/SimConfig/AssemblyInfo.cs b/src/Config/SimConfig/AssemblyInfo.cs
index 88a940b..daffc5e 100644
--- a/src/Config/SimConfig/AssemblyInfo.cs
+++ b/src/Config/SimConfig/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.1.*.192")] 17[assembly: AssemblyVersionAttribute("0.1.*.193206")]
18[assembly: AssemblyTitleAttribute("opensim-simconfig")] 18[assembly: AssemblyTitleAttribute("opensim-simconfig")]
19[assembly: AssemblyDescriptionAttribute("The default configuration handler")] 19[assembly: AssemblyDescriptionAttribute("The default configuration handler")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/GridInterfaces/AssemblyInfo.cs b/src/GridInterfaces/AssemblyInfo.cs
index a62dcdc..42f45fc 100644
--- a/src/GridInterfaces/AssemblyInfo.cs
+++ b/src/GridInterfaces/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.1.*.192")] 17[assembly: AssemblyVersionAttribute("0.1.*.193206")]
18[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")] 18[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
19[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")] 19[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/GridInterfaces/IGridServer.cs b/src/GridInterfaces/IGridServer.cs
index fef4c3e..c2d7172 100644
--- a/src/GridInterfaces/IGridServer.cs
+++ b/src/GridInterfaces/IGridServer.cs
@@ -32,6 +32,7 @@ using System.Net;
32using System.Net.Sockets; 32using System.Net.Sockets;
33using System.IO; 33using System.IO;
34using libsecondlife; 34using libsecondlife;
35using OpenSim;
35 36
36namespace OpenSim.GridServers 37namespace OpenSim.GridServers
37{ 38{
@@ -46,6 +47,10 @@ namespace OpenSim.GridServers
46 public interface IGridServer 47 public interface IGridServer
47 { 48 {
48 bool RequestConnection(); 49 bool RequestConnection();
50 Dictionary<uint, agentcircuitdata> agentcircuits {
51 get;
52 set;
53 }
49 UUIDBlock RequestUUIDBlock(); 54 UUIDBlock RequestUUIDBlock();
50 void RequestNeighbours(); //should return a array of neighbouring regions 55 void RequestNeighbours(); //should return a array of neighbouring regions
51 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode); 56 AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode);
@@ -91,4 +96,16 @@ namespace OpenSim.GridServers
91 { 96 {
92 IGridServer GetGridServer(); 97 IGridServer GetGridServer();
93 } 98 }
99
100 public class agentcircuitdata {
101 public agentcircuitdata() { }
102 public LLUUID AgentID;
103 public LLUUID SessionID;
104 public LLUUID SecureSessionID;
105 public string firstname;
106 public string lastname;
107 public uint circuitcode;
108 }
109
110
94} 111}
diff --git a/src/LocalServers/LocalGridServers/AssemblyInfo.cs b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
index e25895f..943f5e7 100644
--- a/src/LocalServers/LocalGridServers/AssemblyInfo.cs
+++ b/src/LocalServers/LocalGridServers/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.1.*.192")] 17[assembly: AssemblyVersionAttribute("0.1.*.193206")]
18[assembly: AssemblyTitleAttribute("opensim-localservers")] 18[assembly: AssemblyTitleAttribute("opensim-localservers")]
19[assembly: AssemblyDescriptionAttribute("local grid servers")] 19[assembly: AssemblyDescriptionAttribute("local grid servers")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/LocalServers/LocalGridServers/LocalGrid.cs b/src/LocalServers/LocalGridServers/LocalGrid.cs
index 5adce27..86a68d5 100644
--- a/src/LocalServers/LocalGridServers/LocalGrid.cs
+++ b/src/LocalServers/LocalGridServers/LocalGrid.cs
@@ -113,7 +113,14 @@ namespace LocalGridServers
113 public class LocalGridServer :IGridServer 113 public class LocalGridServer :IGridServer
114 { 114 {
115 public List<Login> Sessions = new List<Login>(); 115 public List<Login> Sessions = new List<Login>();
116 116
117 private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>();
118
119 public Dictionary<uint, agentcircuitdata> agentcircuits {
120 get {return agentcircuits;}
121 set {agentcircuits=value;}
122 }
123
117 public LocalGridServer() 124 public LocalGridServer()
118 { 125 {
119 Sessions = new List<Login>(); 126 Sessions = new List<Login>();
diff --git a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
index 28db549..3a8caf5 100644
--- a/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
+++ b/src/LocalStorage/Db4LocalStorage/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.1.*.192")] 17[assembly: AssemblyVersionAttribute("0.1.*.193206")]
18[assembly: AssemblyTitleAttribute("opensim-localstorage")] 18[assembly: AssemblyTitleAttribute("opensim-localstorage")]
19[assembly: AssemblyDescriptionAttribute("The local storage handler")] 19[assembly: AssemblyDescriptionAttribute("The local storage handler")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/Main.cs b/src/Main.cs
index 79c0782..506f87b 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -56,7 +56,8 @@ namespace OpenSim
56 public static SimConfig cfg; 56 public static SimConfig cfg;
57 public static World local_world; 57 public static World local_world;
58 public static Grid gridServers; 58 public static Grid gridServers;
59 59 public static SimCAPSHTTPServer http_server;
60
60 public static Socket Server; 61 public static Socket Server;
61 private static IPEndPoint ServerIncoming; 62 private static IPEndPoint ServerIncoming;
62 private static byte[] RecvBuffer = new byte[4096]; 63 private static byte[] RecvBuffer = new byte[4096];
@@ -169,6 +170,9 @@ namespace OpenSim
169 local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded. 170 local_world.LoadStorageDLL("Db4LocalStorage.dll"); //all these dll names shouldn't be hard coded.
170 local_world.LoadPrimsFromStorage(); 171 local_world.LoadPrimsFromStorage();
171 172
173 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
174 http_server = new SimCAPSHTTPServer();
175
172 MainServerListener(); 176 MainServerListener();
173 177
174 } 178 }
diff --git a/src/OpenSimConsole.cs b/src/OpenSimConsole.cs
index 00a4cee..cf8b648 100644
--- a/src/OpenSimConsole.cs
+++ b/src/OpenSimConsole.cs
@@ -175,7 +175,7 @@ namespace OpenSim
175 break; 175 break;
176 case "users": 176 case "users":
177 OpenSim.world.Avatar TempAv; 177 OpenSim.world.Avatar TempAv;
178 this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16},{5,-16}","Firstname", "Lastname","Agent ID", "Session ID", "Circuit", "IP")); 178 this.WriteLine(String.Format("{0,-16}{1,-16}{2,-25}{3,-25}{4,-16}{5,-16}","Firstname", "Lastname","Agent ID", "Session ID", "Circuit", "IP"));
179 foreach (libsecondlife.LLUUID UUID in OpenSim_Main.local_world.Entities.Keys) { 179 foreach (libsecondlife.LLUUID UUID in OpenSim_Main.local_world.Entities.Keys) {
180 if(OpenSim_Main.local_world.Entities[UUID].ToString()== "OpenSim.world.Avatar") 180 if(OpenSim_Main.local_world.Entities[UUID].ToString()== "OpenSim.world.Avatar")
181 { 181 {
diff --git a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
index 3978650..b6953d4 100644
--- a/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
+++ b/src/RemoteServers/RemoteGridServers/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.1.*.192")] 17[assembly: AssemblyVersionAttribute("0.1.*.193206")]
18[assembly: AssemblyTitleAttribute("opensim-remoteservers")] 18[assembly: AssemblyTitleAttribute("opensim-remoteservers")]
19[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")] 19[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
index 428d5f5..26cd137 100644
--- a/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
+++ b/src/RemoteServers/RemoteGridServers/RemoteGrid.cs
@@ -69,7 +69,13 @@ namespace RemoteGridServers
69 { 69 {
70 private string GridServerUrl; 70 private string GridServerUrl;
71 private string GridSendKey; 71 private string GridSendKey;
72 72 private Dictionary<uint, agentcircuitdata> AgentCircuits = new Dictionary<uint, agentcircuitdata>();
73
74 public Dictionary<uint, agentcircuitdata> agentcircuits {
75 get {return AgentCircuits;}
76 set {AgentCircuits=value;}
77 }
78
73 public RemoteGridServer() 79 public RemoteGridServer()
74 { 80 {
75 ServerConsole.MainConsole.Instance.WriteLine("Remote Grid Server class created"); 81 ServerConsole.MainConsole.Instance.WriteLine("Remote Grid Server class created");
@@ -79,26 +85,21 @@ namespace RemoteGridServers
79 { 85 {
80 return true; 86 return true;
81 } 87 }
82 public AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) 88
89
90 public AuthenticateResponse AuthenticateSession(LLUUID sessionID, LLUUID agentID, uint circuitcode)
83 { 91 {
92 agentcircuitdata validcircuit=this.AgentCircuits[circuitcode];
84 AuthenticateResponse user = new AuthenticateResponse(); 93 AuthenticateResponse user = new AuthenticateResponse();
85 94 if((sessionID==validcircuit.SessionID) && (agentID==validcircuit.AgentID))
86 WebRequest CheckSession = WebRequest.Create(GridServerUrl + "/usersessions/" + GridSendKey + "/" + agentID.ToString() + "/" + circuitCode.ToString() + "/exists");
87 WebResponse GridResponse = CheckSession.GetResponse();
88 StreamReader sr = new StreamReader(GridResponse.GetResponseStream());
89 String grTest = sr.ReadLine();
90 sr.Close();
91 GridResponse.Close();
92 if(String.IsNullOrEmpty(grTest) || grTest.Equals("1"))
93 { 95 {
94 // YAY! Valid login 96 // YAY! Valid login
95 user.Authorised = true; 97 user.Authorised = true;
96 user.LoginInfo = new Login(); 98 user.LoginInfo = new Login();
97 user.LoginInfo.Agent = agentID; 99 user.LoginInfo.Agent = agentID;
98 user.LoginInfo.Session = sessionID; 100 user.LoginInfo.Session = sessionID;
99 user.LoginInfo.First = ""; 101 user.LoginInfo.First = validcircuit.firstname;
100 user.LoginInfo.Last = ""; 102 user.LoginInfo.Last = validcircuit.lastname;
101
102 } 103 }
103 else 104 else
104 { 105 {
@@ -111,13 +112,18 @@ namespace RemoteGridServers
111 112
112 public bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode) 113 public bool LogoutSession(LLUUID sessionID, LLUUID agentID, uint circuitCode)
113 { 114 {
114 WebRequest DeleteSession = WebRequest.Create(GridServerUrl + "/usersessions/" + GridSendKey + "/" + agentID.ToString() + "/" + circuitCode.ToString() + "/delete"); 115 WebRequest DeleteSession = WebRequest.Create(GridServerUrl + "/usersessions/" + sessionID.ToString());
115 WebResponse GridResponse = DeleteSession.GetResponse(); 116 DeleteSession.Method="DELETE";
116 StreamReader sr = new StreamReader(GridResponse.GetResponseStream()); 117 DeleteSession.ContentType="text/plaintext";
117 String grTest = sr.ReadLine(); 118 DeleteSession.ContentLength=0;
118 sr.Close(); 119
119 GridResponse.Close(); 120 StreamWriter stOut = new StreamWriter (DeleteSession.GetRequestStream(), System.Text.Encoding.ASCII);
120 ServerConsole.MainConsole.Instance.WriteLine("DEBUG: " + grTest); 121 stOut.Write("");
122 stOut.Close();
123
124 StreamReader stIn = new StreamReader(DeleteSession.GetResponse().GetResponseStream());
125 string GridResponse = stIn.ReadToEnd();
126 stIn.Close();
121 return(true); 127 return(true);
122 } 128 }
123 129
@@ -213,7 +219,7 @@ namespace RemoteGridServers
213 } 219 }
214 } 220 }
215 } 221 }
216 222
217 public class BlockingQueue< T > { 223 public class BlockingQueue< T > {
218 private Queue< T > _queue = new Queue< T >(); 224 private Queue< T > _queue = new Queue< T >();
219 private object _queueSync = new object(); 225 private object _queueSync = new object();
diff --git a/src/ServerConsole/ServerConsole/AssemblyInfo.cs b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
index 57481fc..1c5f7a0 100644
--- a/src/ServerConsole/ServerConsole/AssemblyInfo.cs
+++ b/src/ServerConsole/ServerConsole/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.1.*.192")] 17[assembly: AssemblyVersionAttribute("0.1.*.193206")]
18[assembly: AssemblyTitleAttribute("opensim-serverconsole")] 18[assembly: AssemblyTitleAttribute("opensim-serverconsole")]
19[assembly: AssemblyDescriptionAttribute("The default server console")] 19[assembly: AssemblyDescriptionAttribute("The default server console")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/Util.cs b/src/Util.cs
index d575bee..e7ca608 100644
--- a/src/Util.cs
+++ b/src/Util.cs
@@ -59,6 +59,16 @@ namespace OpenSim
59 public bool Incoming; 59 public bool Incoming;
60 } 60 }
61 61
62 public class agentcircuitdata {
63 public agentcircuitdata() { }
64 public LLUUID AgentID;
65 public LLUUID SessionID;
66 public LLUUID SecureSessionID;
67 public string firstname;
68 public string lastname;
69 public uint circuitcode;
70 }
71
62 72
63 public class BlockingQueue< T > { 73 public class BlockingQueue< T > {
64 private Queue< T > _queue = new Queue< T >(); 74 private Queue< T > _queue = new Queue< T >();
diff --git a/src/VersionInfo.cs b/src/VersionInfo.cs
index 94f0810..5994b49 100644
--- a/src/VersionInfo.cs
+++ b/src/VersionInfo.cs
@@ -32,6 +32,6 @@ namespace OpenSim
32 /// </summary> 32 /// </summary>
33 public class VersionInfo 33 public class VersionInfo
34 { 34 {
35 public static string Version = "0.1, Build 1173785234, Revision 192M"; 35 public static string Version = "0.1, Build 1173843165, Revision 193:206M";
36 } 36 }
37} 37}
diff --git a/src/physics/AssemblyInfo.cs b/src/physics/AssemblyInfo.cs
index c78d44c..c7b2255 100644
--- a/src/physics/AssemblyInfo.cs
+++ b/src/physics/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.1.*.192")] 17[assembly: AssemblyVersionAttribute("0.1.*.193206")]
18[assembly: AssemblyTitleAttribute("opensim-physicsmanager")] 18[assembly: AssemblyTitleAttribute("opensim-physicsmanager")]
19[assembly: AssemblyDescriptionAttribute("Handles physics plugins")] 19[assembly: AssemblyDescriptionAttribute("Handles physics plugins")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
diff --git a/src/physics/plugins/AssemblyInfo.cs b/src/physics/plugins/AssemblyInfo.cs
index a24c947..dc7d0a7 100644
--- a/src/physics/plugins/AssemblyInfo.cs
+++ b/src/physics/plugins/AssemblyInfo.cs
@@ -14,7 +14,7 @@ using System.Runtime.InteropServices;
14 14
15[assembly: ComVisibleAttribute(false)] 15[assembly: ComVisibleAttribute(false)]
16[assembly: CLSCompliantAttribute(false)] 16[assembly: CLSCompliantAttribute(false)]
17[assembly: AssemblyVersionAttribute("0.1.*.192")] 17[assembly: AssemblyVersionAttribute("0.1.*.193206")]
18[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")] 18[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")]
19[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")] 19[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")]
20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")] 20[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]