From ee205e7e812e170f670e690a4e0fa9caa652f226 Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Thu, 1 Oct 2009 01:00:09 +0900 Subject: Formatting cleanup. --- .../World/Archiver/ArchiveReadRequest.cs | 8 ++-- .../Archiver/ArchiveWriteRequestPreparation.cs | 6 +-- .../CoreModules/World/Archiver/ArchiverModule.cs | 10 ++--- .../CoreModules/World/Archiver/AssetsArchiver.cs | 2 +- .../CoreModules/World/Archiver/AssetsRequest.cs | 12 +++--- .../World/Archiver/Tests/ArchiverTests.cs | 10 ++--- .../Region/CoreModules/World/Land/LandObject.cs | 4 +- .../Land/RegionCombinerIndividualEventForwarder.cs | 2 +- .../CoreModules/World/Land/RegionCombinerModule.cs | 10 ++--- .../World/Permissions/PermissionsModule.cs | 50 +++++++++++----------- .../World/Serialiser/SerialiserModule.cs | 2 +- .../World/Serialiser/Tests/SerialiserTests.cs | 16 +++---- .../Region/CoreModules/World/Sound/SoundModule.cs | 12 +++--- OpenSim/Region/CoreModules/World/Sun/SunModule.cs | 4 +- .../World/Vegetation/VegetationModule.cs | 6 +-- .../World/Wind/Plugins/ConfigurableWind.cs | 2 +- .../World/Wind/Plugins/SimpleRandomWind.cs | 2 +- .../Region/CoreModules/World/Wind/WindModule.cs | 2 +- 18 files changed, 80 insertions(+), 80 deletions(-) (limited to 'OpenSim/Region/CoreModules/World') diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index 376ea8a..65f83fd 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs @@ -110,12 +110,12 @@ namespace OpenSim.Region.CoreModules.World.Archiver TarArchiveReader.TarEntryType entryType; while ((data = archive.ReadEntry(out filePath, out entryType)) != null) - { + { //m_log.DebugFormat( // "[ARCHIVER]: Successfully read {0} ({1} bytes)", filePath, data.Length); if (TarArchiveReader.TarEntryType.TYPE_DIRECTORY == entryType) - continue; + continue; if (filePath.StartsWith(ArchiveConstants.OBJECTS_PATH)) { @@ -173,7 +173,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.InfoFormat("[ARCHIVER]: Loading {0} scene objects. Please wait.", serialisedSceneObjects.Count); IRegionSerialiserModule serialiser = m_scene.RequestModuleInterface(); - int sceneObjectsLoadedCount = 0; + int sceneObjectsLoadedCount = 0; foreach (string serialisedSceneObject in serialisedSceneObjects) { @@ -499,7 +499,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver XmlParserContext context = new XmlParserContext(null, nsmgr, null, XmlSpace.None); XmlTextReader xtr - = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context); + = new XmlTextReader(m_asciiEncoding.GetString(data), XmlNodeType.Document, context); RegionSettings currentRegionSettings = m_scene.RegionInfo.RegionSettings; diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs index 63608a8..9e4fbbe 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestPreparation.cs @@ -74,14 +74,14 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_scene = scene; m_saveStream = saveStream; m_requestId = requestId; - } + } /// /// Archive the region requested. /// /// if there was an io problem with creating the file public void ArchiveRegion() - { + { Dictionary assetUuids = new Dictionary(); List entities = m_scene.GetEntities(); @@ -137,7 +137,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_scene.RequestModuleInterface(), m_scene, archiveWriter, - m_requestId); + m_requestId); new AssetsRequest( new AssetsArchiver(archiveWriter), assetUuids.Keys, diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs index 5c58b69..8d4f91b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs @@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void Close() { - } + } public void ArchiveRegion(string savePath) { @@ -90,7 +90,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.InfoFormat( "[ARCHIVER]: Writing archive for region {0} to {1}", m_scene.RegionInfo.RegionName, savePath); - new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion(); + new ArchiveWriteRequestPreparation(m_scene, savePath, requestId).ArchiveRegion(); } public void ArchiveRegion(Stream saveStream) @@ -101,7 +101,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void ArchiveRegion(Stream saveStream, Guid requestId) { new ArchiveWriteRequestPreparation(m_scene, saveStream, requestId).ArchiveRegion(); - } + } public void DearchiveRegion(string loadPath) { @@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver "[ARCHIVER]: Loading archive to region {0} from {1}", m_scene.RegionInfo.RegionName, loadPath); new ArchiveReadRequest(m_scene, loadPath, merge, requestId).DearchiveRegion(); - } + } public void DearchiveRegion(Stream loadStream) { @@ -124,6 +124,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver public void DearchiveRegion(Stream loadStream, bool merge, Guid requestId) { new ArchiveReadRequest(m_scene, loadStream, merge, requestId).DearchiveRegion(); - } + } } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs index 330fa3f..95d109c 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsArchiver.cs @@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver /// /// public void WriteAsset(AssetBase asset) - { + { //WriteMetadata(archive); WriteData(asset); } diff --git a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs index 82803bf..fe9c8d9 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/AssetsRequest.cs @@ -115,7 +115,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_requestCallbackTimer = new System.Timers.Timer(TIMEOUT); m_requestCallbackTimer.AutoReset = false; - m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout); + m_requestCallbackTimer.Elapsed += new ElapsedEventHandler(OnRequestCallbackTimeout); } protected internal void Execute() @@ -143,7 +143,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver protected void OnRequestCallbackTimeout(object source, ElapsedEventArgs args) { try - { + { lock (this) { // Take care of the possibilty that this thread started but was paused just outside the lock before @@ -155,7 +155,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver } // Calculate which uuids were not found. This is an expensive way of doing it, but this is a failure - // case anyway. + // case anyway. List uuids = new List(); foreach (UUID uuid in m_uuids) { @@ -188,7 +188,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver m_log.ErrorFormat( "[ARCHIVER]: (... {0} more not shown)", uuids.Count - MAX_UUID_DISPLAY_ON_TIMEOUT); - m_log.Error("[ARCHIVER]: OAR save aborted."); + m_log.Error("[ARCHIVER]: OAR save aborted."); } catch (Exception e) { @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver { //m_log.DebugFormat("[ARCHIVER]: Received callback for asset {0}", id); - m_requestCallbackTimer.Stop(); + m_requestCallbackTimer.Stop(); if (m_requestState == RequestState.Aborted) { @@ -258,7 +258,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver } catch (Exception e) { - m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); + m_log.ErrorFormat("[ARCHIVER]: AssetRequestCallback failed with {0}", e); } } diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index 5c42e94..edac4a4 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs @@ -59,7 +59,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests m_lastErrorMessage = errorMessage; Console.WriteLine("About to pulse ArchiverTests on LoadCompleted"); - Monitor.PulseAll(this); + Monitor.PulseAll(this); } } @@ -138,7 +138,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests archiverModule.ArchiveRegion(archiveWriteStream, requestId); //AssetServerBase assetServer = (AssetServerBase)scene.CommsManager.AssetCache.AssetServer; //while (assetServer.HasWaitingRequests()) - // assetServer.ProcessNextRequest(); + // assetServer.ProcessNextRequest(); Monitor.Wait(this, 60000); } @@ -213,7 +213,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests // Also check that direct entries which will also have a file entry containing that directory doesn't // upset load - tar.WriteDir(ArchiveConstants.TERRAINS_PATH); + tar.WriteDir(ArchiveConstants.TERRAINS_PATH); tar.WriteFile(ArchiveConstants.CONTROL_FILE_PATH, ArchiveWriteRequestExecution.Create0p2ControlFile()); @@ -251,7 +251,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests { scene.EventManager.OnOarFileLoaded += LoadCompleted; archiverModule.DearchiveRegion(archiveReadStream); - } + } Assert.That(m_lastErrorMessage, Is.Null); @@ -271,7 +271,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests /// /// Test merging a V0.2 OpenSim Region Archive into an existing scene - /// + /// //[Test] public void TestMergeOarV0_2() { diff --git a/OpenSim/Region/CoreModules/World/Land/LandObject.cs b/OpenSim/Region/CoreModules/World/Land/LandObject.cs index 2701f60..3be5f45 100644 --- a/OpenSim/Region/CoreModules/World/Land/LandObject.cs +++ b/OpenSim/Region/CoreModules/World/Land/LandObject.cs @@ -954,7 +954,7 @@ namespace OpenSim.Region.CoreModules.World.Land public void SetMediaUrl(string url) { landData.MediaURL = url; - sendLandUpdateToAvatarsOverMe(); + sendLandUpdateToAvatarsOverMe(); } /// @@ -964,7 +964,7 @@ namespace OpenSim.Region.CoreModules.World.Land public void SetMusicUrl(string url) { landData.MusicURL = url; - sendLandUpdateToAvatarsOverMe(); + sendLandUpdateToAvatarsOverMe(); } } } diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs index 65f22b1..2cbaf96 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerIndividualEventForwarder.cs @@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.World.Land private void LocalRezObject(IClientAPI remoteclient, UUID itemid, Vector3 rayend, Vector3 raystart, UUID raytargetid, byte bypassraycast, bool rayendisintersection, bool rezselected, bool removeitem, UUID fromtaskid) - { + { int differenceX = (int)m_virtScene.RegionInfo.RegionLocX - (int)m_rootScene.RegionInfo.RegionLocX; int differenceY = (int)m_virtScene.RegionInfo.RegionLocY - (int)m_rootScene.RegionInfo.RegionLocY; rayend.X += differenceX * (int)Constants.RegionSize; diff --git a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs index 710e356..d9f377b 100644 --- a/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs +++ b/OpenSim/Region/CoreModules/World/Land/RegionCombinerModule.cs @@ -880,7 +880,7 @@ namespace OpenSim.Region.CoreModules.World.Land VirtualRegion.Permissions.OnDuplicateObject += BigRegion.PermissionModule.CanDuplicateObject; VirtualRegion.Permissions.OnDeleteObject += BigRegion.PermissionModule.CanDeleteObject; //MAYBE FULLY IMPLEMENTED VirtualRegion.Permissions.OnEditObject += BigRegion.PermissionModule.CanEditObject; //MAYBE FULLY IMPLEMENTED - VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED + VirtualRegion.Permissions.OnEditParcel += BigRegion.PermissionModule.CanEditParcel; //MAYBE FULLY IMPLEMENTED VirtualRegion.Permissions.OnInstantMessage += BigRegion.PermissionModule.CanInstantMessage; VirtualRegion.Permissions.OnInventoryTransfer += BigRegion.PermissionModule.CanInventoryTransfer; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnIssueEstateCommand += BigRegion.PermissionModule.CanIssueEstateCommand; //FULLY IMPLEMENTED @@ -899,11 +899,11 @@ namespace OpenSim.Region.CoreModules.World.Land VirtualRegion.Permissions.OnDelinkObject += BigRegion.PermissionModule.CanDelinkObject; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnBuyLand += BigRegion.PermissionModule.CanBuyLand; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnViewNotecard += BigRegion.PermissionModule.CanViewNotecard; //NOT YET IMPLEMENTED - VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED - VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED - VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED + VirtualRegion.Permissions.OnViewScript += BigRegion.PermissionModule.CanViewScript; //NOT YET IMPLEMENTED + VirtualRegion.Permissions.OnEditNotecard += BigRegion.PermissionModule.CanEditNotecard; //NOT YET IMPLEMENTED + VirtualRegion.Permissions.OnEditScript += BigRegion.PermissionModule.CanEditScript; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnCreateObjectInventory += BigRegion.PermissionModule.CanCreateObjectInventory; //NOT IMPLEMENTED HERE - VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED + VirtualRegion.Permissions.OnEditObjectInventory += BigRegion.PermissionModule.CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED VirtualRegion.Permissions.OnCopyObjectInventory += BigRegion.PermissionModule.CanCopyObjectInventory; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnDeleteObjectInventory += BigRegion.PermissionModule.CanDeleteObjectInventory; //NOT YET IMPLEMENTED VirtualRegion.Permissions.OnResetScript += BigRegion.PermissionModule.CanResetScript; diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs index f360577..b09c7a1 100644 --- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs +++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs @@ -114,7 +114,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions Administrators }; - #endregion + #endregion #region Bypass Permissions / Debug Permissions Stuff @@ -136,7 +136,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// The set of users that are allowed to edit (save) scripts. This is only active if /// permissions are not being bypassed. This overrides normal permissions.- - /// + /// private UserSet m_allowedScriptEditors = UserSet.All; private Dictionary GrantLSL = new Dictionary(); @@ -190,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions m_scene.Permissions.OnDuplicateObject += CanDuplicateObject; m_scene.Permissions.OnDeleteObject += CanDeleteObject; //MAYBE FULLY IMPLEMENTED m_scene.Permissions.OnEditObject += CanEditObject; //MAYBE FULLY IMPLEMENTED - m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED + m_scene.Permissions.OnEditParcel += CanEditParcel; //MAYBE FULLY IMPLEMENTED m_scene.Permissions.OnInstantMessage += CanInstantMessage; m_scene.Permissions.OnInventoryTransfer += CanInventoryTransfer; //NOT YET IMPLEMENTED m_scene.Permissions.OnIssueEstateCommand += CanIssueEstateCommand; //FULLY IMPLEMENTED @@ -210,12 +210,12 @@ namespace OpenSim.Region.CoreModules.World.Permissions m_scene.Permissions.OnBuyLand += CanBuyLand; //NOT YET IMPLEMENTED m_scene.Permissions.OnViewNotecard += CanViewNotecard; //NOT YET IMPLEMENTED - m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED - m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED - m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED + m_scene.Permissions.OnViewScript += CanViewScript; //NOT YET IMPLEMENTED + m_scene.Permissions.OnEditNotecard += CanEditNotecard; //NOT YET IMPLEMENTED + m_scene.Permissions.OnEditScript += CanEditScript; //NOT YET IMPLEMENTED m_scene.Permissions.OnCreateObjectInventory += CanCreateObjectInventory; //NOT IMPLEMENTED HERE - m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED + m_scene.Permissions.OnEditObjectInventory += CanEditObjectInventory;//MAYBE FULLY IMPLEMENTED m_scene.Permissions.OnCopyObjectInventory += CanCopyObjectInventory; //NOT YET IMPLEMENTED m_scene.Permissions.OnDeleteObjectInventory += CanDeleteObjectInventory; //NOT YET IMPLEMENTED m_scene.Permissions.OnResetScript += CanResetScript; @@ -249,7 +249,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions foreach (string uuidl in grant.Split(',')) { string uuid = uuidl.Trim(" \t".ToCharArray()); GrantLSL.Add(uuid, true); - } + } } grant = myConfig.GetString("GrantCS",""); @@ -431,7 +431,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions m_log.ErrorFormat( "[PERMISSIONS]: {0} is not a valid {1} value, setting to {2}", rawSetting, settingName, userSet); - } + } m_log.DebugFormat("[PERMISSIONS]: {0} {1}", settingName, userSet); @@ -942,7 +942,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions if (m_bypassPermissions) return m_bypassPermissionsValue; if (m_allowedScriptEditors == UserSet.Administrators && !IsAdministrator(user)) - return false; + return false; // Ordinarily, if you can view it, you can edit it // There is no viewing a no mod script @@ -957,7 +957,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanEditNotecard(UUID notecard, UUID objectID, UUID user, Scene scene) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); @@ -1377,11 +1377,11 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanViewScript(UUID script, UUID objectID, UUID user, Scene scene) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); - if (m_bypassPermissions) return m_bypassPermissionsValue; + if (m_bypassPermissions) return m_bypassPermissionsValue; if (objectID == UUID.Zero) // User inventory { @@ -1472,7 +1472,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanViewNotecard(UUID notecard, UUID objectID, UUID user, Scene scene) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); @@ -1609,7 +1609,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanCreateUserInventory(int invType, UUID userID) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); @@ -1619,7 +1619,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions if (m_allowedScriptCreators == UserSet.Administrators && !IsAdministrator(userID)) return false; - return true; + return true; } /// @@ -1627,27 +1627,27 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanCopyUserInventory(UUID itemID, UUID userID) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } /// /// Check whether the specified user is allowed to edit the given inventory item within their own inventory. /// /// /// - /// + /// private bool CanEditUserInventory(UUID itemID, UUID userID) - { + { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; + return true; } /// @@ -1655,14 +1655,14 @@ namespace OpenSim.Region.CoreModules.World.Permissions /// /// /// - /// + /// private bool CanDeleteUserInventory(UUID itemID, UUID userID) { DebugPermissionInformation(MethodInfo.GetCurrentMethod().Name); if (m_bypassPermissions) return m_bypassPermissionsValue; - return true; - } + return true; + } private bool CanTeleport(UUID userID, Scene scene) { diff --git a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs index e0331d3..58e4261 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/SerialiserModule.cs @@ -153,7 +153,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser public void SaveNamedPrimsToXml2(Scene scene, string primName, string fileName) { SceneXmlLoader.SaveNamedPrimsToXml2(scene, primName, fileName); - } + } public SceneObjectGroup DeserializeGroupFromXml2(string xmlString) { diff --git a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs index 373b6ab..799a448 100644 --- a/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs +++ b/OpenSim/Region/CoreModules/World/Serialiser/Tests/SerialiserTests.cs @@ -238,7 +238,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests { m_serialiserModule = new SerialiserModule(); m_scene = SceneSetupHelpers.SetupScene(""); - SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule); + SceneSetupHelpers.SetupSceneModules(m_scene, m_serialiserModule); } [Test] @@ -299,7 +299,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests continue; switch (xtr.Name) - { + { case "UUID": xtr.ReadStartElement("UUID"); uuid = UUID.Parse(xtr.ReadElementString("Guid")); @@ -311,7 +311,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests case "CreatorID": xtr.ReadStartElement("CreatorID"); creatorId = UUID.Parse(xtr.ReadElementString("Guid")); - xtr.ReadEndElement(); + xtr.ReadEndElement(); break; } } @@ -325,8 +325,8 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests // TODO: More checks Assert.That(uuid, Is.EqualTo(rpUuid)); Assert.That(name, Is.EqualTo(rpName)); - Assert.That(creatorId, Is.EqualTo(rpCreatorId)); - } + Assert.That(creatorId, Is.EqualTo(rpCreatorId)); + } [Test] public void TestDeserializeXml2() @@ -372,7 +372,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests string xml2 = m_serialiserModule.SerializeGroupToXml2(so); XmlTextReader xtr = new XmlTextReader(new StringReader(xml2)); - xtr.ReadStartElement("SceneObjectGroup"); + xtr.ReadStartElement("SceneObjectGroup"); xtr.ReadStartElement("SceneObjectPart"); UUID uuid = UUID.Zero; @@ -385,7 +385,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests continue; switch (xtr.Name) - { + { case "UUID": xtr.ReadStartElement("UUID"); uuid = UUID.Parse(xtr.ReadElementString("Guid")); @@ -397,7 +397,7 @@ namespace OpenSim.Region.CoreModules.World.Serialiser.Tests case "CreatorID": xtr.ReadStartElement("CreatorID"); creatorId = UUID.Parse(xtr.ReadElementString("Guid")); - xtr.ReadEndElement(); + xtr.ReadEndElement(); break; } } diff --git a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs index 6cc0ed9..796b382 100644 --- a/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs +++ b/OpenSim/Region/CoreModules/World/Sound/SoundModule.cs @@ -33,9 +33,9 @@ using OpenSim.Region.Framework.Interfaces; using OpenSim.Region.Framework.Scenes; namespace OpenSim.Region.CoreModules.World.Sound -{ +{ public class SoundModule : IRegionModule, ISoundModule - { + { //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); protected Scene m_scene; @@ -68,11 +68,11 @@ namespace OpenSim.Region.CoreModules.World.Sound if (dis > 100.0) // Max audio distance continue; - // Scale by distance + // Scale by distance gain = (float)((double)gain*((100.0 - dis) / 100.0)); p.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags); - } + } } public virtual void TriggerSound( @@ -84,12 +84,12 @@ namespace OpenSim.Region.CoreModules.World.Sound if (dis > 100.0) // Max audio distance continue; - // Scale by distance + // Scale by distance gain = (float)((double)gain*((100.0 - dis) / 100.0)); p.ControllingClient.SendTriggeredSound( soundId, ownerID, objectID, parentID, handle, position, (float)gain); - } + } } } } diff --git a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs index aa38c09..0712a7f 100644 --- a/OpenSim/Region/CoreModules/World/Sun/SunModule.cs +++ b/OpenSim/Region/CoreModules/World/Sun/SunModule.cs @@ -322,7 +322,7 @@ namespace OpenSim.Region.CoreModules m_DayLengthHours = config.Configs["Sun"].GetDouble("day_length", d_day_length); // Horizon shift, this is used to shift the sun's orbit, this affects the day / night ratio - // must hard code to ~.5 to match sun position in LL based viewers + // must hard code to ~.5 to match sun position in LL based viewers m_HorizonShift = config.Configs["Sun"].GetDouble("day_night_offset", d_day_night); @@ -494,7 +494,7 @@ namespace OpenSim.Region.CoreModules receivedEstateToolsSunUpdate = true; // Generate shared values - GenSunPos(); + GenSunPos(); // When sun settings are updated, we should update all clients with new settings. SunUpdateToAllClients(); diff --git a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs index a09315a..c2ad7b8 100644 --- a/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs +++ b/OpenSim/Region/CoreModules/World/Vegetation/VegetationModule.cs @@ -43,7 +43,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation protected Scene m_scene; protected static readonly PCode[] creationCapabilities = new PCode[] { PCode.Grass, PCode.NewTree, PCode.Tree }; - public PCode[] CreationCapabilities { get { return creationCapabilities; } } + public PCode[] CreationCapabilities { get { return creationCapabilities; } } public void Initialise(Scene scene, IConfigSource source) { @@ -73,7 +73,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation UUID ownerID, UUID groupID, Vector3 pos, Quaternion rot, PrimitiveBaseShape shape) { if (Array.IndexOf(creationCapabilities, (PCode)shape.PCode) < 0) - { + { m_log.DebugFormat("[VEGETATION]: PCode {0} not handled by {1}", shape.PCode, Name); return null; } @@ -111,6 +111,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Vegetation tree.Scale = new Vector3(4, 4, 4); break; } - } + } } } diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs index 41d2071..dcfb5a6 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/ConfigurableWind.cs @@ -141,7 +141,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins { m_windSpeeds[y * 16 + x] = m_curPredominateWind; } - } + } } public Vector3 WindSpeed(float fX, float fY, float fZ) diff --git a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs index 2c371da..071e20b 100644 --- a/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs +++ b/OpenSim/Region/CoreModules/World/Wind/Plugins/SimpleRandomWind.cs @@ -95,7 +95,7 @@ namespace OpenSim.Region.CoreModules.World.Wind.Plugins m_windSpeeds[y * 16 + x].Y *= m_strength; } } - } + } } public Vector3 WindSpeed(float fX, float fY, float fZ) diff --git a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs index b442f6f..3283c1f 100644 --- a/OpenSim/Region/CoreModules/World/Wind/WindModule.cs +++ b/OpenSim/Region/CoreModules/World/Wind/WindModule.cs @@ -418,7 +418,7 @@ namespace OpenSim.Region.CoreModules } avatar.ControllingClient.SendWindData(windSpeeds); - } + } } private void SendWindAllClients() -- cgit v1.1