diff options
author | Jeff Ames | 2009-06-22 11:04:09 +0000 |
---|---|---|
committer | Jeff Ames | 2009-06-22 11:04:09 +0000 |
commit | 65d48a5e60d5ae9c533d9d95e70a08256ea13e9a (patch) | |
tree | 1c57350da007ef19227db8065a4889497e1142e7 | |
parent | Update svn properties. (diff) | |
download | opensim-SC-65d48a5e60d5ae9c533d9d95e70a08256ea13e9a.zip opensim-SC-65d48a5e60d5ae9c533d9d95e70a08256ea13e9a.tar.gz opensim-SC-65d48a5e60d5ae9c533d9d95e70a08256ea13e9a.tar.bz2 opensim-SC-65d48a5e60d5ae9c533d9d95e70a08256ea13e9a.tar.xz |
Formatting cleanup, ignore some generated files.
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLRegionData.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs | 2 | ||||
-rw-r--r-- | 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 | |||
784 | @block_show_in_search,@agent_limit,@object_bonus,@maturity,@disable_scripts,@disable_collisions,@disable_physics, | 784 | @block_show_in_search,@agent_limit,@object_bonus,@maturity,@disable_scripts,@disable_collisions,@disable_physics, |
785 | @terrain_texture_1,@terrain_texture_2,@terrain_texture_3,@terrain_texture_4,@elevation_1_nw,@elevation_2_nw,@elevation_1_ne, | 785 | @terrain_texture_1,@terrain_texture_2,@terrain_texture_3,@terrain_texture_4,@elevation_1_nw,@elevation_2_nw,@elevation_1_ne, |
786 | @elevation_2_ne,@elevation_1_se,@elevation_2_se,@elevation_1_sw,@elevation_2_sw,@water_height,@terrain_raise_limit, | 786 | @elevation_2_ne,@elevation_1_se,@elevation_2_se,@elevation_1_sw,@elevation_2_sw,@water_height,@terrain_raise_limit, |
787 | @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_date, @loaded_creation_time, @loaded_creation_id )"; | 787 | @terrain_lower_limit,@use_estate_sun,@fixed_sun,@sun_position,@covenant,@sunvectorx,@sunvectory, @sunvectorz, @Sandbox, @loaded_creation_date, @loaded_creation_time, @loaded_creation_id)"; |
788 | 788 | ||
789 | using (AutoClosingSqlCommand cmd = _Database.Query(sql)) | 789 | using (AutoClosingSqlCommand cmd = _Database.Query(sql)) |
790 | { | 790 | { |
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 | |||
827 | ScenePresence sp = scene.GetScenePresence(user); | 827 | ScenePresence sp = scene.GetScenePresence(user); |
828 | IClientAPI client = sp.ControllingClient; | 828 | IClientAPI client = sp.ControllingClient; |
829 | 829 | ||
830 | if((client.GetGroupPowers(group) & (ulong)GroupPowers.DeedObject) == 0) | 830 | if ((client.GetGroupPowers(group) & (ulong)GroupPowers.DeedObject) == 0) |
831 | return false; | 831 | return false; |
832 | 832 | ||
833 | return true; | 833 | 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 | |||
113 | } | 113 | } |
114 | } | 114 | } |
115 | 115 | ||
116 | public FakeStorageManager() : base( new FakeRegionDataStore() ) | 116 | public FakeStorageManager() : base(new FakeRegionDataStore()) |
117 | { | 117 | { |
118 | } | 118 | } |
119 | 119 | ||
@@ -132,7 +132,7 @@ namespace OpenSim.Region.Framework.Scenes.Tests | |||
132 | RegionInfo regionInfo = new RegionInfo(0,0,null,null); | 132 | RegionInfo regionInfo = new RegionInfo(0,0,null,null); |
133 | FakeStorageManager storageManager = new FakeStorageManager(); | 133 | FakeStorageManager storageManager = new FakeStorageManager(); |
134 | 134 | ||
135 | Scene scene = new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null ); | 135 | Scene scene = new Scene(regionInfo, null, null, null, storageManager, null, false, false, false, null, null); |
136 | } | 136 | } |
137 | } | 137 | } |
138 | } | 138 | } |