diff options
author | Adam Frisby | 2007-07-16 21:23:11 +0000 |
---|---|---|
committer | Adam Frisby | 2007-07-16 21:23:11 +0000 |
commit | bcc93c0d5bf7e6ad02aa357ef44f167b4e6aae2d (patch) | |
tree | 0e172d2a737d106a90be182e13dbdabdca86ec60 /OpenSim | |
parent | * In ur trunk adding ur assets. (diff) | |
download | opensim-SC_OLD-bcc93c0d5bf7e6ad02aa357ef44f167b4e6aae2d.zip opensim-SC_OLD-bcc93c0d5bf7e6ad02aa357ef44f167b4e6aae2d.tar.gz opensim-SC_OLD-bcc93c0d5bf7e6ad02aa357ef44f167b4e6aae2d.tar.bz2 opensim-SC_OLD-bcc93c0d5bf7e6ad02aa357ef44f167b4e6aae2d.tar.xz |
* SimpleApp's IP address is slightly less hard coded (now reading from a hard coded var vs lots of use of "127.0.0.1")
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Examples/SimpleApp/Program.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/Examples/SimpleApp/Program.cs b/OpenSim/Region/Examples/SimpleApp/Program.cs index 8ff2b77..51074d6 100644 --- a/OpenSim/Region/Examples/SimpleApp/Program.cs +++ b/OpenSim/Region/Examples/SimpleApp/Program.cs | |||
@@ -40,6 +40,8 @@ namespace SimpleApp | |||
40 | { | 40 | { |
41 | base.StartUp(); | 41 | base.StartUp(); |
42 | 42 | ||
43 | string ipaddr = "127.0.0.1"; | ||
44 | |||
43 | MainLog.Instance = m_log; | 45 | MainLog.Instance = m_log; |
44 | 46 | ||
45 | m_circuitManager = new AuthenticateSessionsBase(); | 47 | m_circuitManager = new AuthenticateSessionsBase(); |
@@ -47,14 +49,14 @@ namespace SimpleApp | |||
47 | InventoryCache inventoryCache = new InventoryCache(); | 49 | InventoryCache inventoryCache = new InventoryCache(); |
48 | 50 | ||
49 | LocalAssetServer assetServer = new LocalAssetServer(); | 51 | LocalAssetServer assetServer = new LocalAssetServer(); |
50 | assetServer.SetServerInfo("http://127.0.0.1:8003/", ""); | 52 | assetServer.SetServerInfo("http://" + ipaddr + ":8003/", ""); |
51 | 53 | ||
52 | AssetCache assetCache = new AssetCache(assetServer); | 54 | AssetCache assetCache = new AssetCache(assetServer); |
53 | 55 | ||
54 | ScenePresence.LoadTextureFile("avatar-texture.dat"); | 56 | ScenePresence.LoadTextureFile("avatar-texture.dat"); |
55 | ScenePresence.PhysicsEngineFlying = true; | 57 | ScenePresence.PhysicsEngineFlying = true; |
56 | 58 | ||
57 | IPEndPoint internalEndPoint = new IPEndPoint(IPAddress.Parse("127.0.0.1"), 9000); | 59 | IPEndPoint internalEndPoint = new IPEndPoint(IPAddress.Parse(ipaddr), 9000); |
58 | 60 | ||
59 | UDPServer udpServer = new UDPServer(internalEndPoint.Port, assetCache, inventoryCache, m_log, m_circuitManager); | 61 | UDPServer udpServer = new UDPServer(internalEndPoint.Port, assetCache, inventoryCache, m_log, m_circuitManager); |
60 | PacketServer packetServer = new PacketServer(udpServer); | 62 | PacketServer packetServer = new PacketServer(udpServer); |
@@ -63,7 +65,7 @@ namespace SimpleApp | |||
63 | 65 | ||
64 | CommunicationsLocal communicationsManager = new CommunicationsLocal(m_networkServersInfo, httpServer); | 66 | CommunicationsLocal communicationsManager = new CommunicationsLocal(m_networkServersInfo, httpServer); |
65 | 67 | ||
66 | RegionInfo regionInfo = new RegionInfo(1000, 1000, internalEndPoint, "127.0.0.1"); | 68 | RegionInfo regionInfo = new RegionInfo(1000, 1000, internalEndPoint, ipaddr); |
67 | 69 | ||
68 | OpenSim.Region.Environment.StorageManager storeMan = new OpenSim.Region.Environment.StorageManager("OpenSim.DataStore.NullStorage.dll", "simpleapp.yap", "simpleapp"); | 70 | OpenSim.Region.Environment.StorageManager storeMan = new OpenSim.Region.Environment.StorageManager("OpenSim.DataStore.NullStorage.dll", "simpleapp.yap", "simpleapp"); |
69 | 71 | ||