aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers
diff options
context:
space:
mode:
authorSignpostMarv Martin2011-05-13 09:58:29 +0100
committerJustin Clark-Casey (justincc)2011-05-14 00:31:54 +0100
commitcb6cd3714eb051af23e45c1f4d792d12feb1f4b8 (patch)
tree62d652a00a532b5e9c108bfdf484bfe9816814f6 /OpenSim/Server/Handlers
parentSwapped the two restart command descriptions each other (diff)
downloadopensim-SC-cb6cd3714eb051af23e45c1f4d792d12feb1f4b8.zip
opensim-SC-cb6cd3714eb051af23e45c1f4d792d12feb1f4b8.tar.gz
opensim-SC-cb6cd3714eb051af23e45c1f4d792d12feb1f4b8.tar.bz2
opensim-SC-cb6cd3714eb051af23e45c1f4d792d12feb1f4b8.tar.xz
The get_grid_info REST call now encodes XML Entities
Diffstat (limited to 'OpenSim/Server/Handlers')
-rw-r--r--OpenSim/Server/Handlers/Grid/GridInfoHandlers.cs3
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;
30using System.IO; 30using System.IO;
31using System.Net; 31using System.Net;
32using System.Reflection; 32using System.Reflection;
33using System.Security;
33using System.Text; 34using System.Text;
34using log4net; 35using log4net;
35using Nini.Config; 36using 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