aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJohn Hurliman2010-02-06 01:05:58 -0800
committerJohn Hurliman2010-02-06 01:05:58 -0800
commit5dc278b0d78c96b0593284e06ca3f7aa7088c71f (patch)
treec8b5f9fa53cbc250bd52875ab2e818b473d20644 /OpenSim
parentUpdated MySQL connection management to use the MySQL connection pooling. This... (diff)
parentendline fix 2 (diff)
downloadopensim-SC_OLD-5dc278b0d78c96b0593284e06ca3f7aa7088c71f.zip
opensim-SC_OLD-5dc278b0d78c96b0593284e06ca3f7aa7088c71f.tar.gz
opensim-SC_OLD-5dc278b0d78c96b0593284e06ca3f7aa7088c71f.tar.bz2
opensim-SC_OLD-5dc278b0d78c96b0593284e06ca3f7aa7088c71f.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into mysql-performance
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs24
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs12
2 files changed, 18 insertions, 18 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
index 679c871..e3c7bbf 100644
--- a/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/DynamicTexture/DynamicTextureModule.cs
@@ -358,18 +358,18 @@ namespace OpenSim.Region.CoreModules.Scripting.DynamicTexture
358 // tmptex.DefaultTexture.Fullbright = true; 358 // tmptex.DefaultTexture.Fullbright = true;
359 359
360 part.UpdateTexture(tmptex); 360 part.UpdateTexture(tmptex);
361 } 361 }
362 362
363 if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0)) 363 if (oldID != UUID.Zero && ((Disp & DISP_EXPIRE) != 0))
364 { 364 {
365 if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString()); 365 if (oldAsset == null) oldAsset = scene.AssetService.Get(oldID.ToString());
366 if (oldAsset != null) 366 if (oldAsset != null)
367 { 367 {
368 if (oldAsset.Temporary == true) 368 if (oldAsset.Temporary == true)
369 { 369 {
370 scene.AssetService.Delete(oldID.ToString()); 370 scene.AssetService.Delete(oldID.ToString());
371 } 371 }
372 } 372 }
373 } 373 }
374 } 374 }
375 375
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
index 44458d1..fa3681a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
@@ -436,12 +436,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
436 } 436 }
437 437
438 OSDMap resp = new OSDMap(2); 438 OSDMap resp = new OSDMap(2);
439 string reason = String.Empty; 439 string reason = String.Empty;
440 uint teleportFlags = 0; 440 uint teleportFlags = 0;
441 if (args.ContainsKey("teleport_flags")) 441 if (args.ContainsKey("teleport_flags"))
442 { 442 {
443 teleportFlags = args["teleport_flags"].AsUInteger(); 443 teleportFlags = args["teleport_flags"].AsUInteger();
444 } 444 }
445 445
446 // This is the meaning of POST agent 446 // This is the meaning of POST agent
447 m_regionClient.AdjustUserInformation(aCircuit); 447 m_regionClient.AdjustUserInformation(aCircuit);