diff options
Diffstat (limited to 'OpenSim')
4 files changed, 9 insertions, 6 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs index 3fb2d3f..0d7ae1f 100644 --- a/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs +++ b/OpenSim/Data/SQLite/SQLiteGenericTableHandler.cs | |||
@@ -280,7 +280,7 @@ namespace OpenSim.Data.SQLite | |||
280 | 280 | ||
281 | string where = String.Join(" and ", terms.ToArray()); | 281 | string where = String.Join(" and ", terms.ToArray()); |
282 | 282 | ||
283 | string query = String.Format("delete * from {0} where {1}", m_Realm, where); | 283 | string query = String.Format("delete from {0} where {1}", m_Realm, where); |
284 | 284 | ||
285 | cmd.CommandText = query; | 285 | cmd.CommandText = query; |
286 | 286 | ||
diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index b888698..3078ab3 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs | |||
@@ -230,6 +230,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
230 | /// <param name="asset"></param> | 230 | /// <param name="asset"></param> |
231 | public void AssetRequestCallback(string id, object sender, AssetBase asset) | 231 | public void AssetRequestCallback(string id, object sender, AssetBase asset) |
232 | { | 232 | { |
233 | Culture.SetCurrentCulture(); | ||
234 | |||
233 | try | 235 | try |
234 | { | 236 | { |
235 | lock (this) | 237 | lock (this) |
@@ -293,6 +295,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver | |||
293 | /// </summary> | 295 | /// </summary> |
294 | protected void PerformAssetsRequestCallback(object o) | 296 | protected void PerformAssetsRequestCallback(object o) |
295 | { | 297 | { |
298 | Culture.SetCurrentCulture(); | ||
299 | |||
296 | try | 300 | try |
297 | { | 301 | { |
298 | m_assetsRequestCallback(m_foundAssetUuids, m_notFoundAssetUuids); | 302 | m_assetsRequestCallback(m_foundAssetUuids, m_notFoundAssetUuids); |
diff --git a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs index 47af0dd..6ae4f38 100644 --- a/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs +++ b/OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs | |||
@@ -121,7 +121,6 @@ namespace OpenSim.Region.Framework.Scenes.Serialization | |||
121 | } | 121 | } |
122 | } | 122 | } |
123 | 123 | ||
124 | |||
125 | /// <summary> | 124 | /// <summary> |
126 | /// Serialize a scene object to the original xml format | 125 | /// Serialize a scene object to the original xml format |
127 | /// </summary> | 126 | /// </summary> |
diff --git a/OpenSim/Services/FreeswitchService/FreeswitchService.cs b/OpenSim/Services/FreeswitchService/FreeswitchService.cs index c3f1056..201e72f 100644 --- a/OpenSim/Services/FreeswitchService/FreeswitchService.cs +++ b/OpenSim/Services/FreeswitchService/FreeswitchService.cs | |||
@@ -54,10 +54,10 @@ namespace OpenSim.Services.FreeswitchService | |||
54 | 54 | ||
55 | Hashtable response = new Hashtable(); | 55 | Hashtable response = new Hashtable(); |
56 | 56 | ||
57 | foreach (DictionaryEntry item in request) | 57 | // foreach (DictionaryEntry item in request) |
58 | { | 58 | // { |
59 | // m_log.InfoFormat("[FreeSwitchDirectory]: requestBody item {0} {1}",item.Key, item.Value); | 59 | //// m_log.InfoFormat("[FreeSwitchDirectory]: requestBody item {0} {1}",item.Key, item.Value); |
60 | } | 60 | // } |
61 | 61 | ||
62 | string requestcontext = (string) request["Hunt-Context"]; | 62 | string requestcontext = (string) request["Hunt-Context"]; |
63 | response["content_type"] = "text/xml"; | 63 | response["content_type"] = "text/xml"; |