aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorDiva Canto2016-06-22 20:18:16 -0700
committerDiva Canto2016-06-22 20:18:16 -0700
commitcc9ff129880d5f27693a8cc3f4b2ca47b69d3bcb (patch)
treec91b04379af8707641d57a9953e605172a08854b
parentAmend to previous commit -- set the culture also on the receiving end. (diff)
downloadopensim-SC_OLD-cc9ff129880d5f27693a8cc3f4b2ca47b69d3bcb.zip
opensim-SC_OLD-cc9ff129880d5f27693a8cc3f4b2ca47b69d3bcb.tar.gz
opensim-SC_OLD-cc9ff129880d5f27693a8cc3f4b2ca47b69d3bcb.tar.bz2
opensim-SC_OLD-cc9ff129880d5f27693a8cc3f4b2ca47b69d3bcb.tar.xz
Set culture also in object crossings.
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
-rw-r--r--OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs2
2 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index 94d6820..696d1dd 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -2625,6 +2625,8 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
2625 { 2625 {
2626 //m_log.Debug(" >>> CrossPrimGroupIntoNewRegion <<<"); 2626 //m_log.Debug(" >>> CrossPrimGroupIntoNewRegion <<<");
2627 2627
2628 Culture.SetCurrentCulture();
2629
2628 bool successYN = false; 2630 bool successYN = false;
2629 grp.RootPart.ClearUpdateSchedule(); 2631 grp.RootPart.ClearUpdateSchedule();
2630 //int primcrossingXMLmethod = 0; 2632 //int primcrossingXMLmethod = 0;
diff --git a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
index dbb1a15..1b545ac 100644
--- a/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
+++ b/OpenSim/Server/Handlers/Simulation/ObjectHandlers.cs
@@ -69,6 +69,8 @@ namespace OpenSim.Server.Handlers.Simulation
69 //m_log.Debug(" >> http-method=" + request["http-method"]); 69 //m_log.Debug(" >> http-method=" + request["http-method"]);
70 //m_log.Debug("---------------------------\n"); 70 //m_log.Debug("---------------------------\n");
71 71
72 Culture.SetCurrentCulture();
73
72 Hashtable responsedata = new Hashtable(); 74 Hashtable responsedata = new Hashtable();
73 responsedata["content_type"] = "text/html"; 75 responsedata["content_type"] = "text/html";
74 76