From 65d48a5e60d5ae9c533d9d95e70a08256ea13e9a Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 22 Jun 2009 11:04:09 +0000 Subject: Formatting cleanup, ignore some generated files. --- OpenSim/Data/MSSQL/MSSQLRegionData.cs | 2 +- OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 +- OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs index bd7a281..293282e 100644 --- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs +++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs @@ -784,7 +784,7 @@ VALUES @block_show_in_search,@agent_limit,@object_bonus,@maturity,@disable_scripts,@disable_collisions,@disable_physics, @terrain_texture_1,@terrain_texture_2,@terrain_texture_3,@terrain_texture_4,@elevation_1_nw,@elevation_2_nw,@elevation_1_ne, @elevation_2_ne,@elevation_1_se,@elevation_2_se,@elevation_1_sw,@elevation_2_sw,@water_height,@terrain_raise_limit, - @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_date, @loaded_creation_time, @loaded_creation_id )"; + @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_date, @loaded_creation_time, @loaded_creation_id)"; using (AutoClosingSqlCommand cmd = _Database.Query(sql)) { diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index 380104d..92d9e6c 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -827,7 +827,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions ScenePresence sp = scene.GetScenePresence(user); IClientAPI client = sp.ControllingClient; - if((client.GetGroupPowers(group) & (ulong)GroupPowers.DeedObject) == 0) + if ((client.GetGroupPowers(group) & (ulong)GroupPowers.DeedObject) == 0) return false; return true; diff --git a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs index 4d6a86b..d18545b 100644 --- a/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs +++ b/OpenSim/Region/Framework/Scenes/Tests/SceneTests.cs @@ -113,7 +113,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests } } - public FakeStorageManager() : base( new FakeRegionDataStore() ) + public FakeStorageManager() : base(new FakeRegionDataStore()) { } @@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests RegionInfo regionInfo = new RegionInfo(0,0,null,null); FakeStorageManager storageManager = new FakeStorageManager(); - Scene scene = new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null ); + Scene scene = new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null); } } } -- cgit v1.1