ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 22:26:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

cosmetics

Browse Source
This commit is contained in:
UbitUmarov
2020-09-23 21:07:07 +01:00
parent f1e9d5a878
commit d0d1ab9f2a
6 changed files with 18 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
View File

@@ -495,11 +495,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat
protected virtual void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features)
{
OSD extras = new OSDMap();
if (features.ContainsKey("OpenSimExtras"))
extras = features["OpenSimExtras"];
else
features["OpenSimExtras"] = extras;
OSD extras;
if (!features.TryGetValue("OpenSimExtras", out extras))
extras = new OSDMap();
if (m_SayRange == null)
{

12
OpenSim/Region/CoreModules/Avatar/InstantMessage/HGMessageTransferModule.cs
View File

@@ -163,10 +163,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
// Is the user a local user?
string url = string.Empty;
bool foreigner = false;
if (UserManagementModule != null && !UserManagementModule.IsLocalGridUser(toAgentID)) // foreign user
if (UserManagementModule != null) // foreign user
{
url = UserManagementModule.GetUserServerURL(toAgentID, "IMServerURI");
foreigner = true;
foreigner = UserManagementModule.IsLocalGridUser(toAgentID);
}
Util.FireAndForget(delegate
@@ -178,12 +178,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
m_log.DebugFormat("[HG MESSAGE TRANSFER]: Got UUI {0}", recipientUUI);
if (recipientUUI != string.Empty)
{
UUID id; string u = string.Empty, first = string.Empty, last = string.Empty, secret = string.Empty;
if (Util.ParseUniversalUserIdentifier(recipientUUI, out id, out u, out first, out last, out secret))
UUID id; string tourl = string.Empty, first = string.Empty, last = string.Empty, secret = string.Empty;
if (Util.ParseUniversalUserIdentifier(recipientUUI, out id, out tourl, out first, out last, out secret))
{
success = m_IMService.OutgoingInstantMessage(im, u, true);
success = m_IMService.OutgoingInstantMessage(im, tourl, true);
if (success)
UserManagementModule.AddUser(toAgentID, u + ";" + first + " " + last);
UserManagementModule.AddUser(toAgentID, first, last, tourl);
}
}
}

2
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
View File

@@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
{
float waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
renderer.AddPlane("Water", m_scene.RegionInfo.RegionSizeX * 0.5f);
renderer.AddPlane("Water", m_scene.RegionInfo.RegionSizeX * 0.5f, false);
renderer.Scene.sceneobject("Water").setPos(m_scene.RegionInfo.RegionSizeX * 0.5f,
waterHeight,
m_scene.RegionInfo.RegionSizeY * 0.5f);

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

@@ -78,6 +78,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
Util.GetConfigVarFromSections<bool>(source, "ExportMapAddScale", configSections, m_exportPrintScale);
m_exportPrintRegionName =
Util.GetConfigVarFromSections<bool>(source, "ExportMapAddRegionName", configSections, m_exportPrintRegionName);
m_localV1MapAssets =
Util.GetConfigVarFromSections<bool>(source, "LocalV1MapAssets", configSections, m_localV1MapAssets);
}
}
@@ -174,11 +176,9 @@ namespace OpenSim.Region.CoreModules.Hypergrid
{
if (m_UserManagement != null && !string.IsNullOrEmpty(m_MapImageServerURL) && !m_UserManagement.IsLocalGridUser(agentID))
{
OSD extras = new OSDMap();
if (features.ContainsKey("OpenSimExtras"))
extras = features["OpenSimExtras"];
else
features["OpenSimExtras"] = extras;
OSD extras;
if (!features.TryGetValue("OpenSimExtras", out extras))
extras = new OSDMap();
((OSDMap)extras)["map-server-url"] = m_MapImageServerURL;

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

@@ -157,7 +157,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
Util.GetConfigVarFromSections<bool>(config, "ExportMapAddRegionName", configSections, m_exportPrintRegionName);
m_localV1MapAssets =
Util.GetConfigVarFromSections<bool>(config, "LocalV1MapAssets", configSections, m_localV1MapAssets);
}
public virtual void AddRegion(Scene scene)

8
OpenSim/Region/OptionalModules/ViewerSupport/SpecialUIModule.cs
View File

@@ -119,20 +119,18 @@ namespace OpenSim.Region.OptionalModules.ViewerSupport
m_log.DebugFormat("[SPECIAL UI]: OnSimulatorFeaturesRequest in {0}", m_scene.RegionInfo.RegionName);
if (m_Helper.UserLevel(agentID) <= m_UserLevel)
{
OSDMap extrasMap;
OSD extrasMap;
OSDMap specialUI = new OSDMap();
using (StreamReader s = new StreamReader(Path.Combine(VIEWER_SUPPORT_DIR, "panel_toolbar.xml")))
{
if (features.ContainsKey("OpenSimExtras"))
extrasMap = (OSDMap)features["OpenSimExtras"];
else
if (!features.TryGetValue("OpenSimExtras", out extrasMap))
{
extrasMap = new OSDMap();
features["OpenSimExtras"] = extrasMap;
}
specialUI["toolbar"] = OSDMap.FromString(s.ReadToEnd());
extrasMap["special-ui"] = specialUI;
((OSDMap)extrasMap)["special-ui"] = specialUI;
}
m_log.DebugFormat("[SPECIAL UI]: Sending panel_toolbar.xml in {0}", m_scene.RegionInfo.RegionName);