ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2020-08-25 17:51:09 +01:00
parent 12c20b2b89
commit 3bcc313e6f
3 changed files with 19 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -950,10 +950,7 @@ namespace OpenSim.Region.CoreModules.World.Land
}
if(Util.ParseFakeParcelID(fakeID, out ulong rhandle, out uint x, out uint y) && rhandle == m_regionHandler)
{
ILandObject ret = GetLandObjectClipedXY(x, y);
if(ret != null)
m_landFakeIDs[fakeID] = ret.LandData.LocalID;
return ret;
return GetLandObjectClipedXY(x, y);
}
return null;
}
@@ -2249,7 +2246,7 @@ namespace OpenSim.Region.CoreModules.World.Land
// for this region or for somewhere else?
if (extLandData.RegionHandle == m_scene.RegionInfo.RegionHandle)
{
ILandObject extLandObject = GetLandObjectClipedXY(extLandData.X, extLandData.Y);
ILandObject extLandObject = GetLandObjectByfakeID(parcelID);
if (extLandObject == null)
break;
@@ -2286,9 +2283,7 @@ namespace OpenSim.Region.CoreModules.World.Land
else
{
// most likely still cached from building the extLandData entry
uint x = 0, y = 0;
Util.RegionHandleToWorldLoc(data.RegionHandle, out x, out y);
info = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
info = m_scene.GridService.GetRegionByHandle(m_scene.RegionInfo.ScopeID, data.RegionHandle);
}
// we need to transfer the fake parcelID, not the one in landData, so the viewer can match it to the landmark.
//m_log.DebugFormat("[LAND MANAGEMENT MODULE]: got parcelinfo for parcel {0} in region {1}; sending...",

23
OpenSim/Region/CoreModules/World/WorldMap/HGWorldMapModule.cs
View File

@@ -79,8 +79,6 @@ namespace OpenSim.Region.CoreModules.Hypergrid
Util.GetConfigVarFromSections<bool>(source, "ExportMapAddScale", configSections, m_exportPrintScale);
m_exportPrintRegionName =
Util.GetConfigVarFromSections<bool>(source, "ExportMapAddRegionName", configSections, m_exportPrintRegionName);
m_showNPCs =
Util.GetConfigVarFromSections<bool>(source, "ShowNPCs", configSections, m_showNPCs);
}
}
@@ -186,25 +184,4 @@ namespace OpenSim.Region.CoreModules.Hypergrid
}
}
}
class MapArea
{
public int minX;
public int minY;
public int maxX;
public int maxY;
public MapArea(int mix, int miy, int max, int may)
{
minX = mix;
minY = miy;
maxX = max;
maxY = may;
}
public void Print()
{
Console.WriteLine(String.Format(" --> Area is minX={0} minY={1} minY={2} maxY={3}", minX, minY, maxY, maxY));
}
}
}

53
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
View File

@@ -92,7 +92,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
protected bool m_exportPrintScale = false; // prints the scale of map in meters on exported map
protected bool m_exportPrintRegionName = false; // prints the region name exported map
protected bool m_showNPCs = true;
public WorldMapModule()
{
@@ -147,8 +146,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
Util.GetConfigVarFromSections<bool>(config, "ExportMapAddScale", configSections, m_exportPrintScale);
m_exportPrintRegionName =
Util.GetConfigVarFromSections<bool>(config, "ExportMapAddRegionName", configSections, m_exportPrintRegionName);
m_showNPCs =
Util.GetConfigVarFromSections<bool>(config, "ShowNPCs", configSections, m_showNPCs);
}
public virtual void AddRegion(Scene scene)
@@ -275,7 +272,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
/// <returns></returns>
public void MapLayerRequest(IOSHttpRequest request, IOSHttpResponse response)
{
// this is wrong but does seem i use
if(request.HttpMethod != "POST")
{
response.StatusCode = (int)HttpStatusCode.NotFound;
@@ -287,20 +283,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
response.StatusCode = (int)HttpStatusCode.OK;
}
/// <summary>
///
/// </summary>
/// <param name="mapReq"></param>
/// <returns></returns>
public LLSDMapLayerResponse GetMapLayer(LLSDMapRequest mapReq)
{
// m_log.DebugFormat("[WORLD MAP]: MapLayer Request in region: {0}", m_scene.RegionInfo.RegionName);
LLSDMapLayerResponse mapResponse = new LLSDMapLayerResponse();
mapResponse.LayerData.Array.Add(GetOSDMapLayerResponse());
return mapResponse;
}
/// <summary>
/// <summary>
///
/// </summary>
/// <returns></returns>
@@ -341,8 +324,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
}
lock (m_mapBlockRequestEvent)
{
if (m_mapBlockRequests.ContainsKey(AgentId))
m_mapBlockRequests.Remove(AgentId);
m_mapBlockRequests.Remove(AgentId);
}
}
#endregion
@@ -355,10 +337,11 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
/// <param name="o"></param>
private void StartThread(object o)
{
if (threadrunning) return;
if (threadrunning)
return;
threadrunning = true;
// m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
//m_log.Debug("[WORLD MAP]: Starting remote MapItem request thread");
WorkManager.StartThread(
process,
@@ -416,7 +399,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
{
// its Remote Map Item Request
// ensures that the blockingqueue doesn't get borked if the GetAgents() timing changes.
RequestMapItems("", remoteClient.AgentId, flags, EstateID, godlike, itemtype, regionhandle);
RequestMapItems(remoteClient.AgentId, flags, EstateID, godlike, itemtype, regionhandle);
return;
}
@@ -460,7 +443,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
// Don't send a green dot for yourself
if (sp.UUID != remoteClient.AgentId)
{
if (sp.PresenceType == PresenceType.Npc && !m_showNPCs)
if (sp.IsNPC || sp.IsDeleted || sp.IsInTransit)
return;
mapitem = new mapItemReply(
@@ -587,7 +570,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
// Don't send a green dot for yourself
if (sp.UUID != remoteClient.AgentId)
{
if (!m_showNPCs && sp.PresenceType == PresenceType.Npc)
if (sp.IsNPC || sp.IsDeleted || sp.IsInTransit)
return;
mapitem = new mapItemReply(
@@ -673,7 +656,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
/// </summary>
public void process()
{
const int MAX_ASYNC_REQUESTS = 20;
const int MAX_ASYNC_REQUESTS = 5;
ScenePresence av = null;
MapRequestState st = null;
@@ -696,7 +679,8 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
// agent gone?
m_scene.TryGetScenePresence(st.agentID, out av);
if(!m_scene.TryGetScenePresence(st.agentID, out av))
continue;
if (av == null || av.IsChildAgent || av.IsDeleted || av.IsInTransit)
continue;
@@ -778,15 +762,13 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
/// <summary>
/// Enqueue the MapItem request for remote processing
/// </summary>
/// <param name="httpserver">blank string, we discover this in the process</param>
/// <param name="id">Agent ID that we are making this request on behalf</param>
/// <param name="flags">passed in from packet</param>
/// <param name="EstateID">passed in from packet</param>
/// <param name="godlike">passed in from packet</param>
/// <param name="itemtype">passed in from packet</param>
/// <param name="regionhandle">Region we're looking up</param>
public void RequestMapItems(string httpserver, UUID id, uint flags,
uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
public void RequestMapItems(UUID id, uint flags, uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
{
MapRequestState st = new MapRequestState();
st.agentID = id;
@@ -795,11 +777,10 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
st.godlike = godlike;
st.itemtype = itemtype;
st.regionhandle = regionhandle;
requests.Add(st);
}
uint[] itemTypesForcedSend = new uint[] { 6, 1, 7, 10 }; // green dots, infohub, land sells
private static readonly uint[] itemTypesForcedSend = new uint[] { 6, 1, 7, 10 }; // green dots, infohub, land sells
/// <summary>
/// Does the actual remote mapitem request
@@ -815,8 +796,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
/// <param name="itemtype">passed in from packet</param>
/// <param name="regionhandle">Region we're looking up</param>
/// <returns></returns>
private void RequestMapItemsAsync(UUID id, uint flags,
uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
private void RequestMapItemsAsync(UUID id, uint flags, uint EstateID, bool godlike, uint itemtype, ulong regionhandle)
{
// m_log.DebugFormat("[WORLDMAP]: RequestMapItemsAsync; region handle: {0} {1}", regionhandle, itemtype);
@@ -832,8 +812,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
if (httpserver == null || httpserver.Length == 0)
{
Util.RegionHandleToWorldLoc(regionhandle, out uint x, out uint y);
GridRegion mreg = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
GridRegion mreg = m_scene.GridService.GetRegionByHandle(m_scene.RegionInfo.ScopeID, regionhandle);
if (mreg != null)
{
@@ -1515,7 +1494,7 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
OSDArray responsearr = new OSDArray(); // Don't preallocate. MT (m_scene.GetRootAgentCount());
m_scene.ForEachRootScenePresence(delegate (ScenePresence sp)
{
if (!m_showNPCs && sp.IsNPC)
if (sp.IsNPC || sp.IsDeleted || sp.IsInTransit)
return;
OSDMap responsemapdata = new OSDMap();
responsemapdata["X"] = OSD.FromInteger((int)(xstart + sp.AbsolutePosition.X));