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

enforce invariant culture on landmarks

0.9.1.1
UbitUmarov 2019-12-10 12:33:56 +00:00
parent 052e4a060c
commit 449bd9beab
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
View File

@ -118,7 +118,7 @@ namespace OpenSim.Capabilities.Handlers
class BakedTextureUploader class BakedTextureUploader
{ {
// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public event Action<UUID, byte[]> OnUpLoad; public event Action<UUID, byte[]> OnUpLoad;
@ -133,7 +133,7 @@ namespace OpenSim.Capabilities.Handlers
uploaderPath = path; uploaderPath = path;
httpListener = httpServer; httpListener = httpServer;
AgentId = uUID; AgentId = uUID;
// m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID);
} }
/// <summary> /// <summary>
@ -163,7 +163,7 @@ namespace OpenSim.Capabilities.Handlers
httpListener.RemoveStreamHandler("POST", uploaderPath); httpListener.RemoveStreamHandler("POST", uploaderPath);
// m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID); // m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID);
return res; return res;
} }

2
OpenSim/Framework/AvatarAppearance.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Framework
// regions and viewer compatibility // regions and viewer compatibility
public readonly static int TEXTURE_COUNT = 45; public readonly static int TEXTURE_COUNT = 45;
public const int TEXTURE_COUNT_PV7 = 26; public const int TEXTURE_COUNT_PV7 = 29;
public const int BAKES_COUNT_PV7 = 6; public const int BAKES_COUNT_PV7 = 6;
public const int MAXWEARABLE_PV7 = 16; public const int MAXWEARABLE_PV7 = 16;
public const int MAXWEARABLE_LEGACY = 15; public const int MAXWEARABLE_LEGACY = 15;

4
OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
View File

@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
} }
else else
m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!"); m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found");
m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(source, "serverside_object_permissions", m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(source, "serverside_object_permissions",
new string[] { "Startup", "Permissions" }, true); new string[] { "Startup", "Permissions" }, true);
@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
prefix = string.Empty; prefix = string.Empty;
suffix = " @ " + m_ThisGatekeeper; suffix = " @ " + m_ThisGatekeeper;
Vector3 pos = presence.AbsolutePosition; Vector3 pos = presence.AbsolutePosition;
return String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\ngatekeeper {5}\n", return String.Format(Culture.FormatProvider, "Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\ngatekeeper {5}\n",
presence.Scene.RegionInfo.RegionID, presence.Scene.RegionInfo.RegionID,
pos.X, pos.Y, pos.Z, pos.X, pos.Y, pos.Z,
presence.RegionHandle, presence.RegionHandle,

2
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
View File

@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
prefix = string.Empty; prefix = string.Empty;
suffix = string.Empty; suffix = string.Empty;
Vector3 pos = presence.AbsolutePosition; Vector3 pos = presence.AbsolutePosition;
return String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\n", return String.Format(Culture.FormatProvider, "Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\n",
presence.Scene.RegionInfo.RegionID, presence.Scene.RegionInfo.RegionID,
pos.X, pos.Y, pos.Z, pos.X, pos.Y, pos.Z,
presence.RegionHandle); presence.RegionHandle);