aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorUbitUmarov2018-01-22 17:27:40 +0000
committerUbitUmarov2018-01-22 17:27:40 +0000
commite3fc272f508a7bffb8e38b409d96691ae21a9fab (patch)
treeb264e0ec6d4423758d929a7885c47553dfbd69f4
parentretire our BlockingQueue replaced by BlockingCollection and cross fingers (diff)
downloadopensim-SC-e3fc272f508a7bffb8e38b409d96691ae21a9fab.zip
opensim-SC-e3fc272f508a7bffb8e38b409d96691ae21a9fab.tar.gz
opensim-SC-e3fc272f508a7bffb8e38b409d96691ae21a9fab.tar.bz2
opensim-SC-e3fc272f508a7bffb8e38b409d96691ae21a9fab.tar.xz
missing files..
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs1
-rw-r--r--OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs1
-rw-r--r--OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs1
3 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
index 9ccfd5d..442cc65 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
@@ -44,7 +44,6 @@ using OpenSim.Framework.Servers;
44using OpenSim.Framework.Servers.HttpServer; 44using OpenSim.Framework.Servers.HttpServer;
45using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
46using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;
47using BlockingLLSDQueue = OpenSim.Framework.BlockingQueue<OpenMetaverse.StructuredData.OSD>;
48using Caps=OpenSim.Framework.Capabilities.Caps; 47using Caps=OpenSim.Framework.Capabilities.Caps;
49 48
50namespace OpenSim.Region.ClientStack.Linden 49namespace OpenSim.Region.ClientStack.Linden
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
index 39f5baf..cbcbd2d 100644
--- a/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
+++ b/OpenSim/Region/ClientStack/Linden/Caps/SimulatorFeaturesModule.cs
@@ -253,7 +253,6 @@ namespace OpenSim.Region.ClientStack.Linden
253 Hashtable responsedata = new Hashtable(); 253 Hashtable responsedata = new Hashtable();
254 responsedata["int_response_code"] = 200; 254 responsedata["int_response_code"] = 200;
255 responsedata["content_type"] = "text/plain"; 255 responsedata["content_type"] = "text/plain";
256 responsedata["keepalive"] = false;
257 256
258 responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(copy); 257 responsedata["str_response_string"] = OSDParser.SerializeLLSDXmlString(copy);
259 258
diff --git a/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs
index 480aaaf..0ed421a 100644
--- a/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs
+++ b/OpenSim/Region/OptionalModules/DataSnapshot/SnapshotStore.cs
@@ -107,6 +107,7 @@ namespace OpenSim.Region.DataSnapshot
107 snapXWriter.WriteStartDocument(); 107 snapXWriter.WriteStartDocument();
108 data.WriteTo(snapXWriter); 108 data.WriteTo(snapXWriter);
109 snapXWriter.WriteEndDocument(); 109 snapXWriter.WriteEndDocument();
110 snapXWriter.Flush();
110 } 111 }
111 } 112 }
112 catch (Exception e) 113 catch (Exception e)