aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Examples/SimpleApp/Program.cs7
-rw-r--r--OpenSim/OpenSim.Region/Caps.cs1
-rw-r--r--OpenSim/OpenSim.Region/Scenes/ScenePresence.cs5
-rw-r--r--OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs1
-rw-r--r--OpenSim/OpenSim.RegionServer/UDPServer.cs1
-rw-r--r--OpenSim/OpenSim/Application.cs1
-rw-r--r--OpenSim/OpenSim/OpenSimMain.cs13
7 files changed, 6 insertions, 23 deletions
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index 378a09c..e1465d1 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -8,7 +8,6 @@ using OpenSim.Framework.Types;
8using OpenSim.Framework.Console; 8using OpenSim.Framework.Console;
9using OpenSim.Assets; 9using OpenSim.Assets;
10using libsecondlife; 10using libsecondlife;
11using OpenSim.UserServer;
12using OpenSim.Servers; 11using OpenSim.Servers;
13using OpenSim.Framework; 12using OpenSim.Framework;
14using OpenSim.Caches; 13using OpenSim.Caches;
@@ -32,10 +31,10 @@ namespace SimpleApp
32 31
33 string simAddr = "127.0.0.1"; 32 string simAddr = "127.0.0.1";
34 int simPort = 9000; 33 int simPort = 9000;
35 34 /*
36 LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false ); 35 LoginServer loginServer = new LoginServer( simAddr, simPort, 0, 0, false );
37 loginServer.Startup(); 36 loginServer.Startup();
38 loginServer.SetSessionHandler( AddNewSessionHandler ); 37 loginServer.SetSessionHandler( AddNewSessionHandler );*/
39 38
40 m_circuitManager = new AuthenticateSessionsBase(); 39 m_circuitManager = new AuthenticateSessionsBase();
41 40
@@ -64,7 +63,7 @@ namespace SimpleApp
64 // world.PhysicsScene = physicsScene; 63 // world.PhysicsScene = physicsScene;
65 // udpServer.LocalWorld = world; 64 // udpServer.LocalWorld = world;
66 65
67 httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod ); 66 // httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );
68 httpServer.Start(); 67 httpServer.Start();
69 68
70 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit."); 69 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
diff --git a/OpenSim/OpenSim.Region/Caps.cs b/OpenSim/OpenSim.Region/Caps.cs
index 27d4828..13a351d 100644
--- a/OpenSim/OpenSim.Region/Caps.cs
+++ b/OpenSim/OpenSim.Region/Caps.cs
@@ -17,7 +17,6 @@ namespace OpenSim.Region
17 17
18 public class Caps 18 public class Caps
19 { 19 {
20
21 private string httpListenerAddress; 20 private string httpListenerAddress;
22 private uint httpListenPort; 21 private uint httpListenPort;
23 private string capsObjectPath = "00001-"; 22 private string capsObjectPath = "00001-";
diff --git a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
index ffec3e5..45d3fed 100644
--- a/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
+++ b/OpenSim/OpenSim.Region/Scenes/ScenePresence.cs
@@ -99,7 +99,7 @@ namespace OpenSim.Region.Scenes
99 99
100 m_regionInfo = reginfo; 100 m_regionInfo = reginfo;
101 m_regionHandle = reginfo.RegionHandle; 101 m_regionHandle = reginfo.RegionHandle;
102 OpenSim.Framework.Console.MainLog.Instance.Verbose( "Avatar.cs - Loading details from grid (DUMMY)"); 102 OpenSim.Framework.Console.MainLog.Instance.Verbose("Avatar.cs ");
103 ControllingClient = theClient; 103 ControllingClient = theClient;
104 this.firstname = ControllingClient.FirstName; 104 this.firstname = ControllingClient.FirstName;
105 this.lastname = ControllingClient.LastName; 105 this.lastname = ControllingClient.LastName;
@@ -216,8 +216,7 @@ namespace OpenSim.Region.Scenes
216 /// </summary> 216 /// </summary>
217 /// <param name="pack"></param> 217 /// <param name="pack"></param>
218 public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation) 218 public void HandleAgentUpdate(IClientAPI remoteClient, uint flags, LLQuaternion bodyRotation)
219 { 219 {
220
221 if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0) 220 if ((flags & (uint)MainAvatar.ControlFlags.AGENT_CONTROL_AT_POS) != 0)
222 { 221 {
223 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z); 222 Axiom.MathLib.Quaternion q = new Axiom.MathLib.Quaternion(bodyRotation.W, bodyRotation.X, bodyRotation.Y, bodyRotation.Z);
diff --git a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
index fd16e93..68a140b 100644
--- a/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
+++ b/OpenSim/OpenSim.RegionServer/RegionApplicationBase.cs
@@ -41,7 +41,6 @@ using OpenSim.Terrain;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types; 42using OpenSim.Framework.Types;
43using OpenSim.Framework; 43using OpenSim.Framework;
44using OpenSim.UserServer;
45using OpenSim.Assets; 44using OpenSim.Assets;
46using OpenSim.Caches; 45using OpenSim.Caches;
47using OpenSim.Framework.Console; 46using OpenSim.Framework.Console;
diff --git a/OpenSim/OpenSim.RegionServer/UDPServer.cs b/OpenSim/OpenSim.RegionServer/UDPServer.cs
index 002e664..f2a02d9 100644
--- a/OpenSim/OpenSim.RegionServer/UDPServer.cs
+++ b/OpenSim/OpenSim.RegionServer/UDPServer.cs
@@ -40,7 +40,6 @@ using libsecondlife.Packets;
40using OpenSim.Terrain; 40using OpenSim.Terrain;
41using OpenSim.Framework.Interfaces; 41using OpenSim.Framework.Interfaces;
42using OpenSim.Framework.Types; 42using OpenSim.Framework.Types;
43using OpenSim.UserServer;
44using OpenSim.Assets; 43using OpenSim.Assets;
45using OpenSim.Caches; 44using OpenSim.Caches;
46using OpenSim.Framework.Console; 45using OpenSim.Framework.Console;
diff --git a/OpenSim/OpenSim/Application.cs b/OpenSim/OpenSim/Application.cs
index 7254560..40701b0 100644
--- a/OpenSim/OpenSim/Application.cs
+++ b/OpenSim/OpenSim/Application.cs
@@ -28,7 +28,6 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Text; 30using System.Text;
31using OpenSim.UserServer;
32using OpenSim.Framework.Console; 31using OpenSim.Framework.Console;
33 32
34namespace OpenSim 33namespace OpenSim
diff --git a/OpenSim/OpenSim/OpenSimMain.cs b/OpenSim/OpenSim/OpenSimMain.cs
index a6ad15d..7da2263 100644
--- a/OpenSim/OpenSim/OpenSimMain.cs
+++ b/OpenSim/OpenSim/OpenSimMain.cs
@@ -44,7 +44,6 @@ using OpenSim.Terrain;
44using OpenSim.Framework.Interfaces; 44using OpenSim.Framework.Interfaces;
45using OpenSim.Framework.Types; 45using OpenSim.Framework.Types;
46using OpenSim.Framework; 46using OpenSim.Framework;
47using OpenSim.UserServer;
48using OpenSim.Assets; 47using OpenSim.Assets;
49using OpenSim.Caches; 48using OpenSim.Caches;
50using OpenSim.Framework.Console; 49using OpenSim.Framework.Console;
@@ -129,21 +128,11 @@ namespace OpenSim
129 128
130 m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server"); 129 m_log.Verbose( "Main.cs:Startup() - Initialising HTTP server");
131 130
132 //Login server setup 131
133 LoginServer loginServer = null;
134 LoginServer adminLoginServer = null;
135 132
136 if (m_sandbox) 133 if (m_sandbox)
137 { 134 {
138 httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod); 135 httpServer.AddXmlRPCHandler("login_to_simulator", sandboxCommunications.UserServices.XmlRpcLoginMethod);
139
140 /*
141 loginServer = new LoginServer(regionData[0].IPListenAddr, regionData[0].IPListenPort, regionData[0].RegionLocX, regionData[0].RegionLocY, false);
142 loginServer.Startup();
143 loginServer.SetSessionHandler(sandboxCommunications.SandBoxServices.AddNewSession);
144 //sandbox mode with loginserver not using accounts
145 httpServer.AddXmlRPCHandler("login_to_simulator", loginServer.XmlRpcLoginMethod);
146 */
147 } 136 }
148 137
149 //Start http server 138 //Start http server