OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add RegionManager level and the ability to use literal XML to the dynamic floater module

avinationmerge
Melanie 2013-05-04 00:45:27 +02:00
parent 4904d40138
commit 2332453974
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Region/Framework/Interfaces/IDynamicFloaterModule.cs
View File

@ -39,6 +39,7 @@ namespace OpenSim.Region.Framework.Interfaces
public abstract int Channel { get; } public abstract int Channel { get; }
public abstract string FloaterName { get; } public abstract string FloaterName { get; }
public virtual string XmlName { get; set; } public virtual string XmlName { get; set; }
public virtual string XmlText { get; set; }
public virtual HandlerDelegate Handler { get; set; } public virtual HandlerDelegate Handler { get; set; }
} }

1
OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs
View File

@ -43,6 +43,7 @@ namespace OpenSim.Region.Framework.Interfaces
public enum UserMode : int public enum UserMode : int
{ {
Normal = 0, Normal = 0,
RegionManager = 2,
God = 3 God = 3
} }

13
OpenSim/Region/OptionalModules/ViewerSupport/DynamicFloaterModule.cs
View File

@ -125,10 +125,17 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
m_floaters[agentID].Add(dialogData.Channel, dialogData); m_floaters[agentID].Add(dialogData.Channel, dialogData);
string xml; string xml;
using (FileStream fs = File.Open(dialogData.XmlName + ".xml", FileMode.Open)) if (dialogData.XmlText != null && dialogData.XmlText != String.Empty)
{ {
using (StreamReader sr = new StreamReader(fs)) xml = dialogData.XmlText;
xml = sr.ReadToEnd().Replace("\n", ""); }
else
{
using (FileStream fs = File.Open(dialogData.XmlName + ".xml", FileMode.Open))
{
using (StreamReader sr = new StreamReader(fs))
xml = sr.ReadToEnd().Replace("\n", "");
}
} }
List<string> xparts = new List<string>(); List<string> xparts = new List<string>();

7
OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs
View File

@ -110,8 +110,11 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
{ {
foreach (MenuItemData d in m_menuItems[UUID.Zero]) foreach (MenuItemData d in m_menuItems[UUID.Zero])
{ {
if (d.Mode == UserMode.God && (!m_scene.Permissions.IsGod(agentID))) if (!m_scene.Permissions.IsGod(agentID))
continue; {
if (d.Mode == UserMode.RegionManager && (!m_scene.Permissions.IsAdministrator(agentID)))
continue;
}
OSDMap loc = null; OSDMap loc = null;
switch (d.Location) switch (d.Location)