diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Objects')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | 18 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | 54 |
2 files changed, 36 insertions, 36 deletions
diff --git a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs index 42141e4..b7f01be 100644 --- a/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/BuySell/BuySellModule.cs | |||
@@ -49,34 +49,34 @@ namespace OpenSim.Region.CoreModules.World.Objects.BuySell | |||
49 | 49 | ||
50 | protected Scene m_scene = null; | 50 | protected Scene m_scene = null; |
51 | protected IDialogModule m_dialogModule; | 51 | protected IDialogModule m_dialogModule; |
52 | 52 | ||
53 | public string Name { get { return "Object BuySell Module"; } } | 53 | public string Name { get { return "Object BuySell Module"; } } |
54 | public Type ReplaceableInterface { get { return null; } } | 54 | public Type ReplaceableInterface { get { return null; } } |
55 | 55 | ||
56 | public void Initialise(IConfigSource source) {} | 56 | public void Initialise(IConfigSource source) {} |
57 | 57 | ||
58 | public void AddRegion(Scene scene) | 58 | public void AddRegion(Scene scene) |
59 | { | 59 | { |
60 | m_scene = scene; | 60 | m_scene = scene; |
61 | m_scene.RegisterModuleInterface<IBuySellModule>(this); | 61 | m_scene.RegisterModuleInterface<IBuySellModule>(this); |
62 | m_scene.EventManager.OnNewClient += SubscribeToClientEvents; | 62 | m_scene.EventManager.OnNewClient += SubscribeToClientEvents; |
63 | } | 63 | } |
64 | 64 | ||
65 | public void RemoveRegion(Scene scene) | 65 | public void RemoveRegion(Scene scene) |
66 | { | 66 | { |
67 | m_scene.EventManager.OnNewClient -= SubscribeToClientEvents; | 67 | m_scene.EventManager.OnNewClient -= SubscribeToClientEvents; |
68 | } | 68 | } |
69 | 69 | ||
70 | public void RegionLoaded(Scene scene) | 70 | public void RegionLoaded(Scene scene) |
71 | { | 71 | { |
72 | m_dialogModule = scene.RequestModuleInterface<IDialogModule>(); | 72 | m_dialogModule = scene.RequestModuleInterface<IDialogModule>(); |
73 | } | 73 | } |
74 | 74 | ||
75 | public void Close() | 75 | public void Close() |
76 | { | 76 | { |
77 | RemoveRegion(m_scene); | 77 | RemoveRegion(m_scene); |
78 | } | 78 | } |
79 | 79 | ||
80 | public void SubscribeToClientEvents(IClientAPI client) | 80 | public void SubscribeToClientEvents(IClientAPI client) |
81 | { | 81 | { |
82 | client.OnObjectSaleInfo += ObjectSaleInfo; | 82 | client.OnObjectSaleInfo += ObjectSaleInfo; |
diff --git a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs index e53ab95..79c4713 100644 --- a/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs +++ b/OpenSim/Region/CoreModules/World/Objects/Commands/ObjectCommandsModule.cs | |||
@@ -53,30 +53,30 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ObjectCommandsModule")] | 53 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ObjectCommandsModule")] |
54 | public class ObjectCommandsModule : INonSharedRegionModule | 54 | public class ObjectCommandsModule : INonSharedRegionModule |
55 | { | 55 | { |
56 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 56 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
57 | 57 | ||
58 | private Scene m_scene; | 58 | private Scene m_scene; |
59 | private ICommandConsole m_console; | 59 | private ICommandConsole m_console; |
60 | 60 | ||
61 | public string Name { get { return "Object Commands Module"; } } | 61 | public string Name { get { return "Object Commands Module"; } } |
62 | 62 | ||
63 | public Type ReplaceableInterface { get { return null; } } | 63 | public Type ReplaceableInterface { get { return null; } } |
64 | 64 | ||
65 | public void Initialise(IConfigSource source) | 65 | public void Initialise(IConfigSource source) |
66 | { | 66 | { |
67 | // m_log.DebugFormat("[OBJECT COMMANDS MODULE]: INITIALIZED MODULE"); | 67 | // m_log.DebugFormat("[OBJECT COMMANDS MODULE]: INITIALIZED MODULE"); |
68 | } | 68 | } |
69 | 69 | ||
70 | public void PostInitialise() | 70 | public void PostInitialise() |
71 | { | 71 | { |
72 | // m_log.DebugFormat("[OBJECT COMMANDS MODULE]: POST INITIALIZED MODULE"); | 72 | // m_log.DebugFormat("[OBJECT COMMANDS MODULE]: POST INITIALIZED MODULE"); |
73 | } | 73 | } |
74 | 74 | ||
75 | public void Close() | 75 | public void Close() |
76 | { | 76 | { |
77 | // m_log.DebugFormat("[OBJECT COMMANDS MODULE]: CLOSED MODULE"); | 77 | // m_log.DebugFormat("[OBJECT COMMANDS MODULE]: CLOSED MODULE"); |
78 | } | 78 | } |
79 | 79 | ||
80 | public void AddRegion(Scene scene) | 80 | public void AddRegion(Scene scene) |
81 | { | 81 | { |
82 | // m_log.DebugFormat("[OBJECT COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); | 82 | // m_log.DebugFormat("[OBJECT COMMANDS MODULE]: REGION {0} ADDED", scene.RegionInfo.RegionName); |
@@ -539,13 +539,13 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
539 | 539 | ||
540 | if (!ConsoleUtil.CheckFileDoesNotExist(m_console, fileName)) | 540 | if (!ConsoleUtil.CheckFileDoesNotExist(m_console, fileName)) |
541 | return; | 541 | return; |
542 | 542 | ||
543 | using (XmlTextWriter xtw = new XmlTextWriter(fileName, Encoding.UTF8)) | 543 | using (XmlTextWriter xtw = new XmlTextWriter(fileName, Encoding.UTF8)) |
544 | { | 544 | { |
545 | xtw.Formatting = Formatting.Indented; | 545 | xtw.Formatting = Formatting.Indented; |
546 | SceneObjectSerializer.ToOriginalXmlFormat(so, xtw, true); | 546 | SceneObjectSerializer.ToOriginalXmlFormat(so, xtw, true); |
547 | } | 547 | } |
548 | 548 | ||
549 | m_console.OutputFormat("Object dumped to file {0}", fileName); | 549 | m_console.OutputFormat("Object dumped to file {0}", fileName); |
550 | } | 550 | } |
551 | 551 | ||
@@ -625,7 +625,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
625 | cdl.AddRow("FlexiSoftness", s.FlexiSoftness); | 625 | cdl.AddRow("FlexiSoftness", s.FlexiSoftness); |
626 | cdl.AddRow("HollowShape", s.HollowShape); | 626 | cdl.AddRow("HollowShape", s.HollowShape); |
627 | cdl.AddRow( | 627 | cdl.AddRow( |
628 | "LightColor", | 628 | "LightColor", |
629 | string.Format("<{0},{1},{2},{3}>", s.LightColorR, s.LightColorB, s.LightColorG, s.LightColorA)); | 629 | string.Format("<{0},{1},{2},{3}>", s.LightColorR, s.LightColorB, s.LightColorG, s.LightColorA)); |
630 | cdl.AddRow("LightCutoff", s.LightCutoff); | 630 | cdl.AddRow("LightCutoff", s.LightCutoff); |
631 | cdl.AddRow("LightEntry", s.LightEntry); | 631 | cdl.AddRow("LightEntry", s.LightEntry); |
@@ -659,7 +659,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
659 | cdl.AddRow("Rotation (World)", sop.GetWorldRotation()); | 659 | cdl.AddRow("Rotation (World)", sop.GetWorldRotation()); |
660 | cdl.AddRow("Scale", s.Scale); | 660 | cdl.AddRow("Scale", s.Scale); |
661 | cdl.AddRow( | 661 | cdl.AddRow( |
662 | "SculptData", | 662 | "SculptData", |
663 | string.Format("{0} bytes", s.SculptData != null ? s.SculptData.Length.ToString() : "n/a")); | 663 | string.Format("{0} bytes", s.SculptData != null ? s.SculptData.Length.ToString() : "n/a")); |
664 | cdl.AddRow("SculptEntry", s.SculptEntry); | 664 | cdl.AddRow("SculptEntry", s.SculptEntry); |
665 | cdl.AddRow("SculptTexture", s.SculptTexture); | 665 | cdl.AddRow("SculptTexture", s.SculptTexture); |
@@ -668,7 +668,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
668 | 668 | ||
669 | // TODO, need to display more information about textures but in a compact format | 669 | // TODO, need to display more information about textures but in a compact format |
670 | // to stop output becoming huge. | 670 | // to stop output becoming huge. |
671 | for (int i = 0; i < sop.GetNumberOfSides(); i++) | 671 | for (int i = 0; i < sop.GetNumberOfSides(); i++) |
672 | { | 672 | { |
673 | Primitive.TextureEntryFace teFace = s.Textures.FaceTextures[i]; | 673 | Primitive.TextureEntryFace teFace = s.Textures.FaceTextures[i]; |
674 | 674 | ||
@@ -765,12 +765,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
765 | if (g.OwnerID == match && !g.IsAttachment) | 765 | if (g.OwnerID == match && !g.IsAttachment) |
766 | deletes.Add(g); | 766 | deletes.Add(g); |
767 | }); | 767 | }); |
768 | 768 | ||
769 | // if (deletes.Count == 0) | 769 | // if (deletes.Count == 0) |
770 | // m_console.OutputFormat("No objects were found with owner {0}", match); | 770 | // m_console.OutputFormat("No objects were found with owner {0}", match); |
771 | 771 | ||
772 | break; | 772 | break; |
773 | 773 | ||
774 | case "creator": | 774 | case "creator": |
775 | if (!UUID.TryParse(o, out match)) | 775 | if (!UUID.TryParse(o, out match)) |
776 | return; | 776 | return; |
@@ -782,12 +782,12 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
782 | if (g.RootPart.CreatorID == match && !g.IsAttachment) | 782 | if (g.RootPart.CreatorID == match && !g.IsAttachment) |
783 | deletes.Add(g); | 783 | deletes.Add(g); |
784 | }); | 784 | }); |
785 | 785 | ||
786 | // if (deletes.Count == 0) | 786 | // if (deletes.Count == 0) |
787 | // m_console.OutputFormat("No objects were found with creator {0}", match); | 787 | // m_console.OutputFormat("No objects were found with creator {0}", match); |
788 | 788 | ||
789 | break; | 789 | break; |
790 | 790 | ||
791 | case "id": | 791 | case "id": |
792 | UUID uuid; | 792 | UUID uuid; |
793 | uint localId; | 793 | uint localId; |
@@ -808,13 +808,13 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
808 | 808 | ||
809 | // if (deletes.Count == 0) | 809 | // if (deletes.Count == 0) |
810 | // m_console.OutputFormat("No objects were found with uuid {0}", match); | 810 | // m_console.OutputFormat("No objects were found with uuid {0}", match); |
811 | 811 | ||
812 | break; | 812 | break; |
813 | 813 | ||
814 | case "name": | 814 | case "name": |
815 | deletes = GetDeleteCandidatesByName(module, cmd); | 815 | deletes = GetDeleteCandidatesByName(module, cmd); |
816 | break; | 816 | break; |
817 | 817 | ||
818 | case "outside": | 818 | case "outside": |
819 | deletes = new List<SceneObjectGroup>(); | 819 | deletes = new List<SceneObjectGroup>(); |
820 | 820 | ||
@@ -822,7 +822,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
822 | { | 822 | { |
823 | SceneObjectPart rootPart = g.RootPart; | 823 | SceneObjectPart rootPart = g.RootPart; |
824 | bool delete = false; | 824 | bool delete = false; |
825 | 825 | ||
826 | if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0) | 826 | if (rootPart.GroupPosition.Z < 0.0 || rootPart.GroupPosition.Z > 10000.0) |
827 | { | 827 | { |
828 | delete = true; | 828 | delete = true; |
@@ -831,18 +831,18 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
831 | { | 831 | { |
832 | ILandObject parcel | 832 | ILandObject parcel |
833 | = m_scene.LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y); | 833 | = m_scene.LandChannel.GetLandObject(rootPart.GroupPosition.X, rootPart.GroupPosition.Y); |
834 | 834 | ||
835 | if (parcel == null || parcel.LandData.Name == "NO LAND") | 835 | if (parcel == null || parcel.LandData.Name == "NO LAND") |
836 | delete = true; | 836 | delete = true; |
837 | } | 837 | } |
838 | 838 | ||
839 | if (delete && !g.IsAttachment && !deletes.Contains(g)) | 839 | if (delete && !g.IsAttachment && !deletes.Contains(g)) |
840 | deletes.Add(g); | 840 | deletes.Add(g); |
841 | }); | 841 | }); |
842 | 842 | ||
843 | if (deletes.Count == 0) | 843 | if (deletes.Count == 0) |
844 | m_console.OutputFormat("No objects were found outside region bounds"); | 844 | m_console.OutputFormat("No objects were found outside region bounds"); |
845 | 845 | ||
846 | break; | 846 | break; |
847 | 847 | ||
848 | case "pos": | 848 | case "pos": |
@@ -864,7 +864,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
864 | "Are you sure that you want to delete {0} objects from {1}", | 864 | "Are you sure that you want to delete {0} objects from {1}", |
865 | deletes.Count, m_scene.RegionInfo.RegionName), | 865 | deletes.Count, m_scene.RegionInfo.RegionName), |
866 | "y/N"); | 866 | "y/N"); |
867 | 867 | ||
868 | if (response.ToLower() != "y") | 868 | if (response.ToLower() != "y") |
869 | { | 869 | { |
870 | MainConsole.Instance.OutputFormat( | 870 | MainConsole.Instance.OutputFormat( |
@@ -951,7 +951,7 @@ namespace OpenSim.Region.CoreModules.World.Objects.Commands | |||
951 | { | 951 | { |
952 | m_console.OutputFormat("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector); | 952 | m_console.OutputFormat("Error: Start vector '{0}' does not have a valid format", rawConsoleStartVector); |
953 | endVector = Vector3.Zero; | 953 | endVector = Vector3.Zero; |
954 | 954 | ||
955 | return false; | 955 | return false; |
956 | } | 956 | } |
957 | 957 | ||