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

Switch the MeshUploadFlag CAP module on and off with the existing config AllowMeshUpload flag in [Mesh] (in OpenSimDefaults.ini) 

Default is on.
bulletsim
Justin Clark-Casey (justincc) 2011-07-07 23:49:19 +01:00
parent 2fbc98fa5c
commit 3bda7711b3
1 changed files with 35 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
View File

@ -45,33 +45,54 @@ namespace OpenSim.Region.ClientStack.Linden
/// <summary> /// <summary>
/// MeshUploadFlag capability. This is required for uploading Mesh. /// MeshUploadFlag capability. This is required for uploading Mesh.
/// </summary> /// </summary>
///
[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")]
public class MeshUploadFlagModule : INonSharedRegionModule public class MeshUploadFlagModule : INonSharedRegionModule
{ {
private static readonly ILog m_log = private static readonly ILog m_log =
LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
/// <summary>
/// Is this module enabled?
/// </summary>
public bool Enabled { get; private set; }
private Scene m_scene; private Scene m_scene;
private UUID m_agentID; private UUID m_agentID;
#region ISharedRegionModule Members #region ISharedRegionModule Members
public MeshUploadFlagModule()
{
Enabled = true;
}
public void Initialise(IConfigSource source) public void Initialise(IConfigSource source)
{ {
IConfig config = source.Configs["MeshUploadFlag"]; IConfig config = source.Configs["Mesh"];
if (config == null) if (config == null)
{
return; return;
}
else
{
Enabled = config.GetBoolean("AllowMeshUpload", Enabled);
}
} }
public void AddRegion(Scene s) public void AddRegion(Scene s)
{ {
if (!Enabled)
return;
m_scene = s; m_scene = s;
m_scene.EventManager.OnRegisterCaps += RegisterCaps; m_scene.EventManager.OnRegisterCaps += RegisterCaps;
} }
public void RemoveRegion(Scene s) public void RemoveRegion(Scene s)
{ {
if (!Enabled)
return;
m_scene.EventManager.OnRegisterCaps -= RegisterCaps; m_scene.EventManager.OnRegisterCaps -= RegisterCaps;
} }
@ -98,22 +119,23 @@ namespace OpenSim.Region.ClientStack.Linden
{ {
IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag); IRequestHandler reqHandler = new RestHTTPHandler("GET", "/CAPS/" + UUID.Random(), MeshUploadFlag);
caps.RegisterHandler("MeshUploadFlag", reqHandler); caps.RegisterHandler("MeshUploadFlag", reqHandler);
m_agentID = agentID; m_agentID = agentID;
} }
private Hashtable MeshUploadFlag(Hashtable mDhttpMethod) private Hashtable MeshUploadFlag(Hashtable mDhttpMethod)
{ {
m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: MeshUploadFlag request"); m_log.DebugFormat("[SIMULATOR FEATURES MODULE]: MeshUploadFlag request");
OSDMap data = new OSDMap(); OSDMap data = new OSDMap();
ScenePresence sp = m_scene.GetScenePresence(m_agentID); ScenePresence sp = m_scene.GetScenePresence(m_agentID);
data["username"] = sp.Firstname + "." + sp.Lastname; data["username"] = sp.Firstname + "." + sp.Lastname;
data["display_name_next_update"] = new OSDDate(DateTime.Now); data["display_name_next_update"] = new OSDDate(DateTime.Now);
data["legacy_first_name"] = sp.Firstname; data["legacy_first_name"] = sp.Firstname;
data["mesh_upload_status"] = "valid"; data["mesh_upload_status"] = "valid";
data["display_name"] = sp.Firstname + " " + sp.Lastname; data["display_name"] = sp.Firstname + " " + sp.Lastname;
data["legacy_last_name"] = sp.Lastname; data["legacy_last_name"] = sp.Lastname;
data["id"] = m_agentID; data["id"] = m_agentID;
data["is_display_name_default"] = true; data["is_display_name_default"] = true;
//Send back data //Send back data
Hashtable responsedata = new Hashtable(); Hashtable responsedata = new Hashtable();
@ -123,6 +145,5 @@ namespace OpenSim.Region.ClientStack.Linden
responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(data); responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(data);
return responsedata; return responsedata;
} }
} }
} }