aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
diff options
context:
space:
mode:
authorMelanie2013-05-04 00:45:27 +0200
committerMelanie2013-05-04 00:45:27 +0200
commit23324539745848f28308f3de28aa0278b662e1b5 (patch)
tree5d1d610386dca3e245f71b8ed6b4690b4c4f0434 /OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
parentAdd llGetPhysicsMaterial (diff)
downloadopensim-SC-23324539745848f28308f3de28aa0278b662e1b5.zip
opensim-SC-23324539745848f28308f3de28aa0278b662e1b5.tar.gz
opensim-SC-23324539745848f28308f3de28aa0278b662e1b5.tar.bz2
opensim-SC-23324539745848f28308f3de28aa0278b662e1b5.tar.xz
Add RegionManager level and the ability to use literal XML to the dynamic floater module
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs13
1 files changed, 10 insertions, 3 deletions
diff --git a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
index 7919fef..4524a05 100644
--- a/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
+++ b/OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
@@ -125,10 +125,17 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
125 m_floaters[agentID].Add(dialogData.Channel, dialogData); 125 m_floaters[agentID].Add(dialogData.Channel, dialogData);
126 126
127 string xml; 127 string xml;
128 using (FileStream fs = File.Open(dialogData.XmlName + ".xml", FileMode.Open)) 128 if (dialogData.XmlText != null && dialogData.XmlText != String.Empty)
129 { 129 {
130 using (StreamReader sr = new StreamReader(fs)) 130 xml = dialogData.XmlText;
131 xml = sr.ReadToEnd().Replace("\n", ""); 131 }
132 else
133 {
134 using (FileStream fs = File.Open(dialogData.XmlName + ".xml", FileMode.Open))
135 {
136 using (StreamReader sr = new StreamReader(fs))
137 xml = sr.ReadToEnd().Replace("\n", "");
138 }
132 } 139 }
133 140
134 List<string> xparts = new List<string>(); 141 List<string> xparts = new List<string>();