diff options
| author | Melanie | 2013-04-10 13:20:55 +0100 |
|---|---|---|
| committer | Melanie | 2013-04-10 13:20:55 +0100 |
| commit | 7cf377fff02de4504965420baaabd56b9a5379ee (patch) | |
| tree | 5dde9202c352446232e53af9ce85efad4735a572 /OpenSim/Region/CoreModules/Scripting | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. (diff) | |
| download | opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.zip opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.tar.gz opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.tar.bz2 opensim-SC_OLD-7cf377fff02de4504965420baaabd56b9a5379ee.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs index 2b13a8b..de8539f 100644 --- a/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs +++ b/OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs | |||
| @@ -412,7 +412,6 @@ namespace OpenSim.Region.CoreModules.Scripting.HttpRequest | |||
| 412 | //public bool HttpVerboseThrottle = true; // not implemented | 412 | //public bool HttpVerboseThrottle = true; // not implemented |
| 413 | public List<string> HttpCustomHeaders = null; | 413 | public List<string> HttpCustomHeaders = null; |
| 414 | public bool HttpPragmaNoCache = true; | 414 | public bool HttpPragmaNoCache = true; |
| 415 | private Thread httpThread; | ||
| 416 | 415 | ||
| 417 | // Request info | 416 | // Request info |
| 418 | private UUID _itemID; | 417 | private UUID _itemID; |