aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/NetworkServersInfo.cs
diff options
context:
space:
mode:
authorHomer Horwitz2008-11-01 22:09:48 +0000
committerHomer Horwitz2008-11-01 22:09:48 +0000
commit38e8853e5761d09a7e8f580dd277d9b99b834696 (patch)
tree653fe4c9075a03c05a4b5782f7309afa83062e5c /OpenSim/Framework/NetworkServersInfo.cs
parent* minor: Remove mono compiler warning (diff)
downloadopensim-SC-38e8853e5761d09a7e8f580dd277d9b99b834696.zip
opensim-SC-38e8853e5761d09a7e8f580dd277d9b99b834696.tar.gz
opensim-SC-38e8853e5761d09a7e8f580dd277d9b99b834696.tar.bz2
opensim-SC-38e8853e5761d09a7e8f580dd277d9b99b834696.tar.xz
Megapatch that fixes/adds: friend offer/deny/accept, friendship termination,
on-/offline updates, calling cards for friends. This adds methods in the DB layer and changes the MessagingServer, so a full update (incl. UGAIM) is necessary to get it working. Older regions shouldn't break, nor should older UGAIM break newer regions, but friends/presence will only work with all concerned parts (UGAIM, source region and destination region) at this revision (or later). I added the DB code for MSSQL, too, but couldn't test that. BEWARE: May contain bugs.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 9f3014d..49b8ef9 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -53,6 +53,7 @@ namespace OpenSim.Framework
53 public string HttpSSLCN = ""; 53 public string HttpSSLCN = "";
54 public uint httpSSLPort = 9001; 54 public uint httpSSLPort = 9001;
55 55
56 public string MessagingURL = String.Empty;
56 57
57 public NetworkServersInfo() 58 public NetworkServersInfo()
58 { 59 {
@@ -102,6 +103,9 @@ namespace OpenSim.Framework
102 "http://127.0.0.1:" + 103 "http://127.0.0.1:" +
103 InventoryConfig.DefaultHttpPort.ToString()); 104 InventoryConfig.DefaultHttpPort.ToString());
104 secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true); 105 secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
106
107 MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
108 "http://127.0.0.1:" + MessageServerConfig.DefaultHttpPort);
105 } 109 }
106 } 110 }
107} 111}