aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2008-06-02 16:16:07 +0000
committerTeravus Ovares2008-06-02 16:16:07 +0000
commit3991908db5b50e764112d30e5750447db67795b5 (patch)
treebc5c47d6c26b87dd04c550ed24d5597e686e7663 /OpenSim/Framework
parentFixed half completed comment in OpenSim.ini.example. (diff)
downloadopensim-SC_OLD-3991908db5b50e764112d30e5750447db67795b5.zip
opensim-SC_OLD-3991908db5b50e764112d30e5750447db67795b5.tar.gz
opensim-SC_OLD-3991908db5b50e764112d30e5750447db67795b5.tar.bz2
opensim-SC_OLD-3991908db5b50e764112d30e5750447db67795b5.tar.xz
* This update enables grid wide presence updates.
* You'll need to start-up the MessageingServer and set it up. It sets up like any of the other grid servers. * All user presence data is kept in memory for speed, while the agent is online. That means if you shutdown the messaging server or the messaging server crashes, it forgets who's online/offline. * Occasionally the region-cache will get stale if regions move around a lot. if it gets stale, run clear-cache on the messaging server console to clear the region cache.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/MessageServerConfig.cs9
-rw-r--r--OpenSim/Framework/UserConfig.cs4
2 files changed, 13 insertions, 0 deletions
diff --git a/OpenSim/Framework/MessageServerConfig.cs b/OpenSim/Framework/MessageServerConfig.cs
index c378d27..7a50c91 100644
--- a/OpenSim/Framework/MessageServerConfig.cs
+++ b/OpenSim/Framework/MessageServerConfig.cs
@@ -38,6 +38,7 @@ namespace OpenSim.Framework
38 public static bool DefaultHttpSSL = false; 38 public static bool DefaultHttpSSL = false;
39 private ConfigurationMember configMember; 39 private ConfigurationMember configMember;
40 public string DatabaseProvider = String.Empty; 40 public string DatabaseProvider = String.Empty;
41 public string DatabaseConnect = String.Empty;
41 public string DefaultStartupMsg = String.Empty; 42 public string DefaultStartupMsg = String.Empty;
42 public string GridCommsProvider = String.Empty; 43 public string GridCommsProvider = String.Empty;
43 public string GridRecvKey = String.Empty; 44 public string GridRecvKey = String.Empty;
@@ -76,6 +77,11 @@ namespace OpenSim.Framework
76 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 77 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
77 "Key to expect from user server", "null", false); 78 "Key to expect from user server", "null", false);
78 79
80
81 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
82 "Connection String for Database", "", false);
83
84
79 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 85 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
80 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 86 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
81 87
@@ -115,6 +121,9 @@ namespace OpenSim.Framework
115 case "database_provider": 121 case "database_provider":
116 DatabaseProvider = (string) configuration_result; 122 DatabaseProvider = (string) configuration_result;
117 break; 123 break;
124 case "database_connect":
125 DatabaseConnect = (string)configuration_result;
126 break;
118 case "http_port": 127 case "http_port":
119 HttpPort = (uint) configuration_result; 128 HttpPort = (uint) configuration_result;
120 break; 129 break;
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 3c0bdfa..3cb0503 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -49,6 +49,10 @@ namespace OpenSim.Framework
49 public bool HttpSSL = DefaultHttpSSL; 49 public bool HttpSSL = DefaultHttpSSL;
50 public string InventoryUrl = String.Empty; 50 public string InventoryUrl = String.Empty;
51 51
52 public UserConfig()
53 {
54 // weird, but UserManagerBase needs this.
55 }
52 public UserConfig(string description, string filename) 56 public UserConfig(string description, string filename)
53 { 57 {
54 configMember = 58 configMember =