aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2019-12-10 12:33:56 +0000
committerUbitUmarov2019-12-10 12:33:56 +0000
commit449bd9beabc64b1aa1bf7ca7faf8d2a8cefd4d4f (patch)
tree2db5362db4d4408036c47f7feea3c1607c1381aa /OpenSim/Region
parentmantis 8632: stop trigering Changed on just scale checks (diff)
downloadopensim-SC-449bd9beabc64b1aa1bf7ca7faf8d2a8cefd4d4f.zip
opensim-SC-449bd9beabc64b1aa1bf7ca7faf8d2a8cefd4d4f.tar.gz
opensim-SC-449bd9beabc64b1aa1bf7ca7faf8d2a8cefd4d4f.tar.bz2
opensim-SC-449bd9beabc64b1aa1bf7ca7faf8d2a8cefd4d4f.tar.xz
enforce invariant culture on landmarks
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index ba3a7c9..ae0fa59 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
114 114
115 } 115 }
116 else 116 else
117 m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!"); 117 m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found");
118 118
119 m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(source, "serverside_object_permissions", 119 m_bypassPermissions = !Util.GetConfigVarFromSections<bool>(source, "serverside_object_permissions",
120 new string[] { "Startup", "Permissions" }, true); 120 new string[] { "Startup", "Permissions" }, true);
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
240 prefix = string.Empty; 240 prefix = string.Empty;
241 suffix = " @ " + m_ThisGatekeeper; 241 suffix = " @ " + m_ThisGatekeeper;
242 Vector3 pos = presence.AbsolutePosition; 242 Vector3 pos = presence.AbsolutePosition;
243 return String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\ngatekeeper {5}\n", 243 return String.Format(Culture.FormatProvider, "Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\ngatekeeper {5}\n",
244 presence.Scene.RegionInfo.RegionID, 244 presence.Scene.RegionInfo.RegionID,
245 pos.X, pos.Y, pos.Z, 245 pos.X, pos.Y, pos.Z,
246 presence.RegionHandle, 246 presence.RegionHandle,
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 4c4db3a..facb7a0 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
249 prefix = string.Empty; 249 prefix = string.Empty;
250 suffix = string.Empty; 250 suffix = string.Empty;
251 Vector3 pos = presence.AbsolutePosition; 251 Vector3 pos = presence.AbsolutePosition;
252 return String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\n", 252 return String.Format(Culture.FormatProvider, "Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\n",
253 presence.Scene.RegionInfo.RegionID, 253 presence.Scene.RegionInfo.RegionID,
254 pos.X, pos.Y, pos.Z, 254 pos.X, pos.Y, pos.Z,
255 presence.RegionHandle); 255 presence.RegionHandle);