diff options
Diffstat (limited to 'OpenSim/Framework/General/Types')
-rw-r--r-- | OpenSim/Framework/General/Types/NetworkServersInfo.cs | 5 | ||||
-rw-r--r-- | OpenSim/Framework/General/Types/UUID.cs | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/OpenSim/Framework/General/Types/NetworkServersInfo.cs b/OpenSim/Framework/General/Types/NetworkServersInfo.cs index b65488a..cf194fc 100644 --- a/OpenSim/Framework/General/Types/NetworkServersInfo.cs +++ b/OpenSim/Framework/General/Types/NetworkServersInfo.cs | |||
@@ -49,6 +49,8 @@ namespace OpenSim.Framework.Types | |||
49 | public int HttpListenerPort = 9000; | 49 | public int HttpListenerPort = 9000; |
50 | public int RemotingListenerPort = 8895; | 50 | public int RemotingListenerPort = 8895; |
51 | 51 | ||
52 | public int InventoryServerPort; | ||
53 | public string InventoryServerName = ""; | ||
52 | 54 | ||
53 | public NetworkServersInfo() | 55 | public NetworkServersInfo() |
54 | { | 56 | { |
@@ -86,7 +88,8 @@ namespace OpenSim.Framework.Types | |||
86 | UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); | 88 | UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); |
87 | UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); | 89 | UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); |
88 | AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003"); | 90 | AssetURL = config.Configs["Network"].GetString("asset_server_url", "http://127.0.0.1:8003"); |
89 | 91 | InventoryServerPort = config.Configs["Network"].GetInt("inventory_server_port", 8004); | |
92 | InventoryServerName = config.Configs["Network"].GetString("inventory_server_name", "127.0.0.1"); | ||
90 | } | 93 | } |
91 | } | 94 | } |
92 | } | 95 | } |
diff --git a/OpenSim/Framework/General/Types/UUID.cs b/OpenSim/Framework/General/Types/UUID.cs index 9e9654d..feae4ae 100644 --- a/OpenSim/Framework/General/Types/UUID.cs +++ b/OpenSim/Framework/General/Types/UUID.cs | |||
@@ -91,12 +91,12 @@ namespace OpenSim.Framework.Types | |||
91 | 91 | ||
92 | public void Combine(UUID other) | 92 | public void Combine(UUID other) |
93 | { | 93 | { |
94 | llUUID.Combine(other.GetLLUUID()); | 94 | LLUUID.Combine(llUUID, other.GetLLUUID()); |
95 | } | 95 | } |
96 | 96 | ||
97 | public void Combine(LLUUID other) | 97 | public void Combine(LLUUID other) |
98 | { | 98 | { |
99 | llUUID.Combine(other); | 99 | LLUUID.Combine(llUUID, other); |
100 | } | 100 | } |
101 | 101 | ||
102 | public override bool Equals(Object other) | 102 | public override bool Equals(Object other) |