aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2019-12-10 12:33:56 +0000
committerUbitUmarov2019-12-10 12:33:56 +0000
commit449bd9beabc64b1aa1bf7ca7faf8d2a8cefd4d4f (patch)
tree2db5362db4d4408036c47f7feea3c1607c1381aa
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 '')
-rw-r--r--OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs6
-rw-r--r--OpenSim/Framework/AvatarAppearance.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs4
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs2
4 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
index 48274c1..dc12320 100644
--- a/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
+++ b/OpenSim/Capabilities/Handlers/UploadBakedTexture/UploadBakedTextureHandler.cs
@@ -118,7 +118,7 @@ namespace OpenSim.Capabilities.Handlers
118 118
119 class BakedTextureUploader 119 class BakedTextureUploader
120 { 120 {
121// private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 121 // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
122 122
123 public event Action<UUID, byte[]> OnUpLoad; 123 public event Action<UUID, byte[]> OnUpLoad;
124 124
@@ -133,7 +133,7 @@ namespace OpenSim.Capabilities.Handlers
133 uploaderPath = path; 133 uploaderPath = path;
134 httpListener = httpServer; 134 httpListener = httpServer;
135 AgentId = uUID; 135 AgentId = uUID;
136 // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID); 136 // m_log.InfoFormat("[CAPS] baked texture upload starting for {0}",newAssetID);
137 } 137 }
138 138
139 /// <summary> 139 /// <summary>
@@ -163,7 +163,7 @@ namespace OpenSim.Capabilities.Handlers
163 163
164 httpListener.RemoveStreamHandler("POST", uploaderPath); 164 httpListener.RemoveStreamHandler("POST", uploaderPath);
165 165
166// m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID); 166 // m_log.DebugFormat("[BAKED TEXTURE UPLOADER]: baked texture upload completed for {0}", newAssetID);
167 167
168 return res; 168 return res;
169 } 169 }
diff --git a/OpenSim/Framework/AvatarAppearance.cs b/OpenSim/Framework/AvatarAppearance.cs
index 87425d8..3973d36 100644
--- a/OpenSim/Framework/AvatarAppearance.cs
+++ b/OpenSim/Framework/AvatarAppearance.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework
55 55
56 // regions and viewer compatibility 56 // regions and viewer compatibility
57 public readonly static int TEXTURE_COUNT = 45; 57 public readonly static int TEXTURE_COUNT = 45;
58 public const int TEXTURE_COUNT_PV7 = 26; 58 public const int TEXTURE_COUNT_PV7 = 29;
59 public const int BAKES_COUNT_PV7 = 6; 59 public const int BAKES_COUNT_PV7 = 6;
60 public const int MAXWEARABLE_PV7 = 16; 60 public const int MAXWEARABLE_PV7 = 16;
61 public const int MAXWEARABLE_LEGACY = 15; 61 public const int MAXWEARABLE_LEGACY = 15;
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);