diff options
author | meta7 | 2010-08-18 02:53:27 -0700 |
---|---|---|
committer | meta7 | 2010-08-18 02:53:27 -0700 |
commit | ca8b1e488c167e5644567cb001c9c2a6504f15f7 (patch) | |
tree | 2a99b396dd4ccbd6c801efc0890fad1bd94b45e2 /OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | |
parent | Fix a nullref exception in the prioritizer (diff) | |
parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
download | opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.zip opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.gz opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.bz2 opensim-SC-ca8b1e488c167e5644567cb001c9c2a6504f15f7.tar.xz |
Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs index d1233dc..cdab49e 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | |||
@@ -102,16 +102,15 @@ namespace OpenSim.Server.Handlers.Grid | |||
102 | } | 102 | } |
103 | catch (Exception) | 103 | catch (Exception) |
104 | { | 104 | { |
105 | _log.Debug("[GRID INFO SERVICE]: Cannot get grid info from config source, using minimal defaults"); | 105 | _log.Warn("[GRID INFO SERVICE]: Cannot get grid info from config source, using minimal defaults"); |
106 | } | 106 | } |
107 | 107 | ||
108 | _log.DebugFormat("[GRID INFO SERVICE]: Grid info service initialized with {0} keys", _info.Count); | 108 | _log.DebugFormat("[GRID INFO SERVICE]: Grid info service initialized with {0} keys", _info.Count); |
109 | |||
110 | } | 109 | } |
111 | 110 | ||
112 | private void IssueWarning() | 111 | private void IssueWarning() |
113 | { | 112 | { |
114 | _log.Warn("[GRID INFO SERVICE]: found no [GridInfo] section in your OpenSim.ini"); | 113 | _log.Warn("[GRID INFO SERVICE]: found no [GridInfo] section in your configuration files"); |
115 | _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:"); | 114 | _log.Warn("[GRID INFO SERVICE]: trying to guess sensible defaults, you might want to provide better ones:"); |
116 | 115 | ||
117 | foreach (string k in _info.Keys) | 116 | foreach (string k in _info.Keys) |
@@ -125,7 +124,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
125 | XmlRpcResponse response = new XmlRpcResponse(); | 124 | XmlRpcResponse response = new XmlRpcResponse(); |
126 | Hashtable responseData = new Hashtable(); | 125 | Hashtable responseData = new Hashtable(); |
127 | 126 | ||
128 | _log.Info("[GRID INFO SERVICE]: Request for grid info"); | 127 | _log.Debug("[GRID INFO SERVICE]: Request for grid info"); |
129 | 128 | ||
130 | foreach (string k in _info.Keys) | 129 | foreach (string k in _info.Keys) |
131 | { | 130 | { |