diff options
author | Adam Frisby | 2008-04-29 14:04:55 +0000 |
---|---|---|
committer | Adam Frisby | 2008-04-29 14:04:55 +0000 |
commit | 375163a6fece8b3a57c7555246abe8338223a599 (patch) | |
tree | 163001ca96a4b4d08589e9772f78510677d5d0dc /OpenSim/Framework/NetworkServersInfo.cs | |
parent | Patch from Melanie: 0001087: Crash to bash de-linking objects. Thanks Melanie! (diff) | |
download | opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.zip opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.gz opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.bz2 opensim-SC_OLD-375163a6fece8b3a57c7555246abe8338223a599.tar.xz |
* Spring cleaning.
* Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
Diffstat (limited to 'OpenSim/Framework/NetworkServersInfo.cs')
-rw-r--r-- | OpenSim/Framework/NetworkServersInfo.cs | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs index ee11924..399a365 100644 --- a/OpenSim/Framework/NetworkServersInfo.cs +++ b/OpenSim/Framework/NetworkServersInfo.cs | |||
@@ -32,23 +32,22 @@ namespace OpenSim.Framework | |||
32 | { | 32 | { |
33 | public class NetworkServersInfo | 33 | public class NetworkServersInfo |
34 | { | 34 | { |
35 | public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/"; | 35 | public static readonly uint DefaultHttpListenerPort = 9000; |
36 | public static uint RemotingListenerPort = 8895; | ||
36 | public string AssetSendKey = String.Empty; | 37 | public string AssetSendKey = String.Empty; |
38 | public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/"; | ||
37 | 39 | ||
38 | public string GridURL = String.Empty; | ||
39 | public string GridSendKey = String.Empty; | ||
40 | public string GridRecvKey = String.Empty; | 40 | public string GridRecvKey = String.Empty; |
41 | public string UserURL = String.Empty; | 41 | public string GridSendKey = String.Empty; |
42 | public string UserSendKey = String.Empty; | 42 | public string GridURL = String.Empty; |
43 | public string UserRecvKey = String.Empty; | ||
44 | public bool isSandbox; | ||
45 | |||
46 | public string InventoryURL = String.Empty; | ||
47 | |||
48 | public static readonly uint DefaultHttpListenerPort = 9000; | ||
49 | public uint HttpListenerPort = DefaultHttpListenerPort; | 43 | public uint HttpListenerPort = DefaultHttpListenerPort; |
50 | 44 | public string InventoryURL = String.Empty; | |
51 | public static uint RemotingListenerPort = 8895; | 45 | public bool isSandbox; |
46 | private uint? m_defaultHomeLocX; | ||
47 | private uint? m_defaultHomeLocY; | ||
48 | public string UserRecvKey = String.Empty; | ||
49 | public string UserSendKey = String.Empty; | ||
50 | public string UserURL = String.Empty; | ||
52 | 51 | ||
53 | 52 | ||
54 | public NetworkServersInfo() | 53 | public NetworkServersInfo() |
@@ -61,15 +60,11 @@ namespace OpenSim.Framework | |||
61 | m_defaultHomeLocY = defaultHomeLocY; | 60 | m_defaultHomeLocY = defaultHomeLocY; |
62 | } | 61 | } |
63 | 62 | ||
64 | private uint? m_defaultHomeLocX; | ||
65 | |||
66 | public uint DefaultHomeLocX | 63 | public uint DefaultHomeLocX |
67 | { | 64 | { |
68 | get { return m_defaultHomeLocX.Value; } | 65 | get { return m_defaultHomeLocX.Value; } |
69 | } | 66 | } |
70 | 67 | ||
71 | private uint? m_defaultHomeLocY; | ||
72 | |||
73 | public uint DefaultHomeLocY | 68 | public uint DefaultHomeLocY |
74 | { | 69 | { |
75 | get { return m_defaultHomeLocY.Value; } | 70 | get { return m_defaultHomeLocY.Value; } |
@@ -100,4 +95,4 @@ namespace OpenSim.Framework | |||
100 | InventoryConfig.DefaultHttpPort.ToString()); | 95 | InventoryConfig.DefaultHttpPort.ToString()); |
101 | } | 96 | } |
102 | } | 97 | } |
103 | } | 98 | } \ No newline at end of file |