aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Examples/SimpleApp
diff options
context:
space:
mode:
authorAdam Frisby2007-06-20 21:57:22 +0000
committerAdam Frisby2007-06-20 21:57:22 +0000
commit8194d822301481c56c2e48857e6609409613dd6d (patch)
treeb2036fe5cc82334623810c67bee7b0da180ba231 /OpenSim/Examples/SimpleApp
parent* Bonus commit: "terrain save" now supports a 'PNG' method. (diff)
downloadopensim-SC-8194d822301481c56c2e48857e6609409613dd6d.zip
opensim-SC-8194d822301481c56c2e48857e6609409613dd6d.tar.gz
opensim-SC-8194d822301481c56c2e48857e6609409613dd6d.tar.bz2
opensim-SC-8194d822301481c56c2e48857e6609409613dd6d.tar.xz
* Terrain modification more robust, uses area sizes matching those employed by the client display.
* Terrain tools now account for the duration the cursor was held for. * Terrain tools now support new brushes (completing the common set) ** Smooth brush ** Flatten brush ** Revert brush ** Noise brush
Diffstat (limited to 'OpenSim/Examples/SimpleApp')
-rw-r--r--OpenSim/Examples/SimpleApp/Program.cs14
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Examples/SimpleApp/Program.cs b/OpenSim/Examples/SimpleApp/Program.cs
index 6d89cbe..de6e6d3 100644
--- a/OpenSim/Examples/SimpleApp/Program.cs
+++ b/OpenSim/Examples/SimpleApp/Program.cs
@@ -19,13 +19,13 @@ namespace SimpleApp
19{ 19{
20 class Program : IAssetReceiver, conscmd_callback 20 class Program : IAssetReceiver, conscmd_callback
21 { 21 {
22 private LogBase m_console; 22 private LogBase m_log;
23 AuthenticateSessionsBase m_circuitManager; 23 AuthenticateSessionsBase m_circuitManager;
24 24
25 private void Run() 25 private void Run()
26 { 26 {
27 m_console = new LogBase(null, "SimpleApp", this, false); 27 m_log = new LogBase(null, "SimpleApp", this, false);
28 MainLog.Instance = m_console; 28 MainLog.Instance = m_log;
29 29
30 CheckSumServer checksumServer = new CheckSumServer(12036); 30 CheckSumServer checksumServer = new CheckSumServer(12036);
31 checksumServer.ServerListener(); 31 checksumServer.ServerListener();
@@ -47,7 +47,7 @@ namespace SimpleApp
47 47
48 AssetCache assetCache = new AssetCache(assetServer); 48 AssetCache assetCache = new AssetCache(assetServer);
49 49
50 UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_console, m_circuitManager ); 50 UDPServer udpServer = new UDPServer(simPort, assetCache, inventoryCache, m_log, m_circuitManager );
51 PacketServer packetServer = new PacketServer( udpServer, (uint) simPort ); 51 PacketServer packetServer = new PacketServer( udpServer, (uint) simPort );
52 udpServer.ServerListener(); 52 udpServer.ServerListener();
53 53
@@ -68,13 +68,13 @@ namespace SimpleApp
68 httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod ); 68 httpServer.AddXmlRPCHandler( "login_to_simulator", loginServer.XmlRpcLoginMethod );
69 httpServer.Start(); 69 httpServer.Start();
70 70
71 m_console.WriteLine( LogPriority.NORMAL, "Press enter to quit."); 71 m_log.WriteLine( LogPriority.NORMAL, "Press enter to quit.");
72 m_console.ReadLine(); 72 m_log.ReadLine();
73 } 73 }
74 74
75 private bool AddNewSessionHandler(ulong regionHandle, Login loginData) 75 private bool AddNewSessionHandler(ulong regionHandle, Login loginData)
76 { 76 {
77 m_console.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last); 77 m_log.WriteLine(LogPriority.NORMAL, "Region [{0}] recieved Login from [{1}] [{2}]", regionHandle, loginData.First, loginData.Last);
78 78
79 AgentCircuitData agent = new AgentCircuitData(); 79 AgentCircuitData agent = new AgentCircuitData();
80 agent.AgentID = loginData.Agent; 80 agent.AgentID = loginData.Agent;