diff options
author | Diva Canto | 2011-05-14 12:57:34 -0700 |
---|---|---|
committer | Diva Canto | 2011-05-14 12:57:34 -0700 |
commit | 082a9ecd31d953fd415b515df4f67078a786f8d5 (patch) | |
tree | 0ea0bf15d6a46120b69803630141141eb477c995 /OpenSim/Server | |
parent | Stop spamming Nebadon's console when assets aren't found in the asset server. (diff) | |
parent | refactor: improve PrimLimitsModule to call ILandObject.GetSimulatorMaxPrimCou... (diff) | |
download | opensim-SC_OLD-082a9ecd31d953fd415b515df4f67078a786f8d5.zip opensim-SC_OLD-082a9ecd31d953fd415b515df4f67078a786f8d5.tar.gz opensim-SC_OLD-082a9ecd31d953fd415b515df4f67078a786f8d5.tar.bz2 opensim-SC_OLD-082a9ecd31d953fd415b515df4f67078a786f8d5.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Server')
-rw-r--r-- | OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs index cdab49e..0da9fc1 100644 --- a/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs +++ b/OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs | |||
@@ -30,6 +30,7 @@ using System.Collections; | |||
30 | using System.IO; | 30 | using System.IO; |
31 | using System.Net; | 31 | using System.Net; |
32 | using System.Reflection; | 32 | using System.Reflection; |
33 | using System.Security; | ||
33 | using System.Text; | 34 | using System.Text; |
34 | using log4net; | 35 | using log4net; |
35 | using Nini.Config; | 36 | using Nini.Config; |
@@ -143,7 +144,7 @@ namespace OpenSim.Server.Handlers.Grid | |||
143 | sb.Append("<gridinfo>\n"); | 144 | sb.Append("<gridinfo>\n"); |
144 | foreach (string k in _info.Keys) | 145 | foreach (string k in _info.Keys) |
145 | { | 146 | { |
146 | sb.AppendFormat("<{0}>{1}</{0}>\n", k, _info[k]); | 147 | sb.AppendFormat("<{0}>{1}</{0}>\n", k, SecurityElement.Escape(_info[k].ToString())); |
147 | } | 148 | } |
148 | sb.Append("</gridinfo>\n"); | 149 | sb.Append("</gridinfo>\n"); |
149 | 150 | ||