diff options
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar')
19 files changed, 2241 insertions, 188 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 6495f3f..d47ca4b 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -29,6 +29,7 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Reflection; | 30 | using System.Reflection; |
31 | using System.IO; | 31 | using System.IO; |
32 | using System.Threading; | ||
32 | using System.Xml; | 33 | using System.Xml; |
33 | using log4net; | 34 | using log4net; |
34 | using Mono.Addins; | 35 | using Mono.Addins; |
@@ -51,6 +52,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
51 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 52 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
52 | 53 | ||
53 | public int DebugLevel { get; set; } | 54 | public int DebugLevel { get; set; } |
55 | |||
56 | /// <summary> | ||
57 | /// Period to sleep per 100 prims in order to avoid CPU spikes when an avatar with many attachments logs in/changes | ||
58 | /// outfit or many avatars with a medium levels of attachments login/change outfit simultaneously. | ||
59 | /// </summary> | ||
60 | /// <remarks> | ||
61 | /// A value of 0 will apply no pause. The pause is specified in milliseconds. | ||
62 | /// </remarks> | ||
63 | public int ThrottlePer100PrimsRezzed { get; set; } | ||
54 | 64 | ||
55 | private Scene m_scene; | 65 | private Scene m_scene; |
56 | private IInventoryAccessModule m_invAccessModule; | 66 | private IInventoryAccessModule m_invAccessModule; |
@@ -67,18 +77,26 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
67 | { | 77 | { |
68 | IConfig config = source.Configs["Attachments"]; | 78 | IConfig config = source.Configs["Attachments"]; |
69 | if (config != null) | 79 | if (config != null) |
80 | { | ||
70 | Enabled = config.GetBoolean("Enabled", true); | 81 | Enabled = config.GetBoolean("Enabled", true); |
82 | |||
83 | ThrottlePer100PrimsRezzed = config.GetInt("ThrottlePer100PrimsRezzed", 0); | ||
84 | } | ||
71 | else | 85 | else |
86 | { | ||
72 | Enabled = true; | 87 | Enabled = true; |
88 | } | ||
73 | } | 89 | } |
74 | 90 | ||
75 | public void AddRegion(Scene scene) | 91 | public void AddRegion(Scene scene) |
76 | { | 92 | { |
77 | m_scene = scene; | 93 | m_scene = scene; |
78 | m_scene.RegisterModuleInterface<IAttachmentsModule>(this); | ||
79 | |||
80 | if (Enabled) | 94 | if (Enabled) |
81 | { | 95 | { |
96 | // Only register module with scene if it is enabled. All callers check for a null attachments module. | ||
97 | // Ideally, there should be a null attachments module for when this core attachments module has been | ||
98 | // disabled. Registering only when enabled allows for other attachments module implementations. | ||
99 | m_scene.RegisterModuleInterface<IAttachmentsModule>(this); | ||
82 | m_scene.EventManager.OnNewClient += SubscribeToClientEvents; | 100 | m_scene.EventManager.OnNewClient += SubscribeToClientEvents; |
83 | m_scene.EventManager.OnStartScript += (localID, itemID) => HandleScriptStateChange(localID, true); | 101 | m_scene.EventManager.OnStartScript += (localID, itemID) => HandleScriptStateChange(localID, true); |
84 | m_scene.EventManager.OnStopScript += (localID, itemID) => HandleScriptStateChange(localID, false); | 102 | m_scene.EventManager.OnStopScript += (localID, itemID) => HandleScriptStateChange(localID, false); |
@@ -86,24 +104,43 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
86 | MainConsole.Instance.Commands.AddCommand( | 104 | MainConsole.Instance.Commands.AddCommand( |
87 | "Debug", | 105 | "Debug", |
88 | false, | 106 | false, |
89 | "debug attachments", | 107 | "debug attachments log", |
90 | "debug attachments [0|1]", | 108 | "debug attachments log [0|1]", |
91 | "Turn on attachments debugging\n" | 109 | "Turn on attachments debug logging", |
92 | + " <= 0 - turns off debugging\n" | 110 | " <= 0 - turns off debug logging\n" |
93 | + " >= 1 - turns on attachment message logging\n", | 111 | + " >= 1 - turns on attachment message debug logging", |
94 | HandleDebugAttachments); | 112 | HandleDebugAttachmentsLog); |
113 | |||
114 | MainConsole.Instance.Commands.AddCommand( | ||
115 | "Debug", | ||
116 | false, | ||
117 | "debug attachments throttle", | ||
118 | "debug attachments throttle <ms>", | ||
119 | "Turn on attachments throttling.", | ||
120 | "This requires a millisecond value. " + | ||
121 | " == 0 - disable throttling.\n" | ||
122 | + " > 0 - sleeps for this number of milliseconds per 100 prims rezzed.", | ||
123 | HandleDebugAttachmentsThrottle); | ||
124 | |||
125 | MainConsole.Instance.Commands.AddCommand( | ||
126 | "Debug", | ||
127 | false, | ||
128 | "debug attachments status", | ||
129 | "debug attachments status", | ||
130 | "Show current attachments debug status", | ||
131 | HandleDebugAttachmentsStatus); | ||
95 | } | 132 | } |
96 | 133 | ||
97 | // TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI | 134 | // TODO: Should probably be subscribing to CloseClient too, but this doesn't yet give us IClientAPI |
98 | } | 135 | } |
99 | 136 | ||
100 | private void HandleDebugAttachments(string module, string[] args) | 137 | private void HandleDebugAttachmentsLog(string module, string[] args) |
101 | { | 138 | { |
102 | int debugLevel; | 139 | int debugLevel; |
103 | 140 | ||
104 | if (!(args.Length == 3 && int.TryParse(args[2], out debugLevel))) | 141 | if (!(args.Length == 4 && int.TryParse(args[3], out debugLevel))) |
105 | { | 142 | { |
106 | MainConsole.Instance.OutputFormat("Usage: debug attachments [0|1]"); | 143 | MainConsole.Instance.OutputFormat("Usage: debug attachments log [0|1]"); |
107 | } | 144 | } |
108 | else | 145 | else |
109 | { | 146 | { |
@@ -113,6 +150,29 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
113 | } | 150 | } |
114 | } | 151 | } |
115 | 152 | ||
153 | private void HandleDebugAttachmentsThrottle(string module, string[] args) | ||
154 | { | ||
155 | int ms; | ||
156 | |||
157 | if (args.Length == 4 && int.TryParse(args[3], out ms)) | ||
158 | { | ||
159 | ThrottlePer100PrimsRezzed = ms; | ||
160 | MainConsole.Instance.OutputFormat( | ||
161 | "Attachments rez throttle per 100 prims is now {0} in {1}", ThrottlePer100PrimsRezzed, m_scene.Name); | ||
162 | |||
163 | return; | ||
164 | } | ||
165 | |||
166 | MainConsole.Instance.OutputFormat("Usage: debug attachments throttle <ms>"); | ||
167 | } | ||
168 | |||
169 | private void HandleDebugAttachmentsStatus(string module, string[] args) | ||
170 | { | ||
171 | MainConsole.Instance.OutputFormat("Settings for {0}", m_scene.Name); | ||
172 | MainConsole.Instance.OutputFormat("Debug logging level: {0}", DebugLevel); | ||
173 | MainConsole.Instance.OutputFormat("Throttle per 100 prims: {0}ms", ThrottlePer100PrimsRezzed); | ||
174 | } | ||
175 | |||
116 | /// <summary> | 176 | /// <summary> |
117 | /// Listen for client triggered running state changes so that we can persist the script's object if necessary. | 177 | /// Listen for client triggered running state changes so that we can persist the script's object if necessary. |
118 | /// </summary> | 178 | /// </summary> |
@@ -273,7 +333,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
273 | List<AvatarAttachment> attachments = sp.Appearance.GetAttachments(); | 333 | List<AvatarAttachment> attachments = sp.Appearance.GetAttachments(); |
274 | foreach (AvatarAttachment attach in attachments) | 334 | foreach (AvatarAttachment attach in attachments) |
275 | { | 335 | { |
276 | uint p = (uint)attach.AttachPoint; | 336 | uint attachmentPt = (uint)attach.AttachPoint; |
277 | 337 | ||
278 | // m_log.DebugFormat( | 338 | // m_log.DebugFormat( |
279 | // "[ATTACHMENTS MODULE]: Doing initial rez of attachment with itemID {0}, assetID {1}, point {2} for {3} in {4}", | 339 | // "[ATTACHMENTS MODULE]: Doing initial rez of attachment with itemID {0}, assetID {1}, point {2} for {3} in {4}", |
@@ -302,13 +362,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
302 | // If we're an NPC then skip all the item checks and manipulations since we don't have an | 362 | // If we're an NPC then skip all the item checks and manipulations since we don't have an |
303 | // inventory right now. | 363 | // inventory right now. |
304 | RezSingleAttachmentFromInventoryInternal( | 364 | RezSingleAttachmentFromInventoryInternal( |
305 | sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, p, true, d); | 365 | sp, sp.PresenceType == PresenceType.Npc ? UUID.Zero : attach.ItemID, attach.AssetID, attachmentPt, true, d); |
306 | } | 366 | } |
307 | catch (Exception e) | 367 | catch (Exception e) |
308 | { | 368 | { |
309 | UUID agentId = (sp.ControllingClient == null) ? (UUID)null : sp.ControllingClient.AgentId; | 369 | UUID agentId = (sp.ControllingClient == null) ? default(UUID) : sp.ControllingClient.AgentId; |
310 | m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment with itemID {0}, assetID {1}, point {2} for {3}: {4}\n{5}", | 370 | m_log.ErrorFormat("[ATTACHMENTS MODULE]: Unable to rez attachment with itemID {0}, assetID {1}, point {2} for {3}: {4}\n{5}", |
311 | attach.ItemID, attach.AssetID, p, agentId, e.Message, e.StackTrace); | 371 | attach.ItemID, attach.AssetID, attachmentPt, agentId, e.Message, e.StackTrace); |
312 | } | 372 | } |
313 | } | 373 | } |
314 | } | 374 | } |
@@ -422,13 +482,28 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
422 | attachPos = Vector3.Zero; | 482 | attachPos = Vector3.Zero; |
423 | } | 483 | } |
424 | 484 | ||
425 | // AttachmentPt 0 (default) means the client chose to 'wear' the attachment. | 485 | // if the attachment point is the same as previous, make sure we get the saved |
486 | // position info. | ||
487 | if (attachmentPt != 0 && attachmentPt == group.RootPart.Shape.LastAttachPoint) | ||
488 | { | ||
489 | attachPos = group.RootPart.AttachedPos; | ||
490 | } | ||
491 | |||
492 | // AttachmentPt 0 means the client chose to 'wear' the attachment. | ||
426 | if (attachmentPt == (uint)AttachmentPoint.Default) | 493 | if (attachmentPt == (uint)AttachmentPoint.Default) |
427 | { | 494 | { |
428 | // Check object for stored attachment point | 495 | // Check object for stored attachment point |
429 | attachmentPt = group.AttachmentPoint; | 496 | attachmentPt = group.AttachmentPoint; |
430 | } | 497 | } |
431 | 498 | ||
499 | // if we didn't find an attach point, look for where it was last attached | ||
500 | if (attachmentPt == 0) | ||
501 | { | ||
502 | attachmentPt = (uint)group.RootPart.Shape.LastAttachPoint; | ||
503 | attachPos = group.RootPart.AttachedPos; | ||
504 | group.HasGroupChanged = true; | ||
505 | } | ||
506 | |||
432 | // if we still didn't find a suitable attachment point....... | 507 | // if we still didn't find a suitable attachment point....... |
433 | if (attachmentPt == 0) | 508 | if (attachmentPt == 0) |
434 | { | 509 | { |
@@ -610,6 +685,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
610 | if (changed && m_scene.AvatarFactory != null) | 685 | if (changed && m_scene.AvatarFactory != null) |
611 | m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); | 686 | m_scene.AvatarFactory.QueueAppearanceSave(sp.UUID); |
612 | 687 | ||
688 | so.RootPart.Shape.LastAttachPoint = (byte)so.AttachmentPoint; | ||
689 | |||
613 | sp.RemoveAttachment(so); | 690 | sp.RemoveAttachment(so); |
614 | so.FromItemID = UUID.Zero; | 691 | so.FromItemID = UUID.Zero; |
615 | 692 | ||
@@ -841,7 +918,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
841 | m_scene.ForEachClient( | 918 | m_scene.ForEachClient( |
842 | client => | 919 | client => |
843 | { if (client.AgentId != so.AttachedAvatar) | 920 | { if (client.AgentId != so.AttachedAvatar) |
844 | client.SendKillObject(m_scene.RegionInfo.RegionHandle, new List<uint>() { so.LocalId }); | 921 | client.SendKillObject(new List<uint>() { so.LocalId }); |
845 | }); | 922 | }); |
846 | } | 923 | } |
847 | 924 | ||
@@ -982,8 +1059,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
982 | 1059 | ||
983 | if (DebugLevel > 0) | 1060 | if (DebugLevel > 0) |
984 | m_log.DebugFormat( | 1061 | m_log.DebugFormat( |
985 | "[ATTACHMENTS MODULE]: Rezzed single object {0} for attachment to {1} on point {2} in {3}", | 1062 | "[ATTACHMENTS MODULE]: Rezzed single object {0} with {1} prims for attachment to {2} on point {3} in {4}", |
986 | objatt.Name, sp.Name, attachmentPt, m_scene.Name); | 1063 | objatt.Name, objatt.PrimCount, sp.Name, attachmentPt, m_scene.Name); |
987 | 1064 | ||
988 | // HasGroupChanged is being set from within RezObject. Ideally it would be set by the caller. | 1065 | // HasGroupChanged is being set from within RezObject. Ideally it would be set by the caller. |
989 | objatt.HasGroupChanged = false; | 1066 | objatt.HasGroupChanged = false; |
@@ -1020,7 +1097,19 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
1020 | } | 1097 | } |
1021 | 1098 | ||
1022 | if (tainted) | 1099 | if (tainted) |
1023 | objatt.HasGroupChanged = true; | 1100 | objatt.HasGroupChanged = true; |
1101 | |||
1102 | if (ThrottlePer100PrimsRezzed > 0) | ||
1103 | { | ||
1104 | int throttleMs = (int)Math.Round((float)objatt.PrimCount / 100 * ThrottlePer100PrimsRezzed); | ||
1105 | |||
1106 | if (DebugLevel > 0) | ||
1107 | m_log.DebugFormat( | ||
1108 | "[ATTACHMENTS MODULE]: Throttling by {0}ms after rez of {1} with {2} prims for attachment to {3} on point {4} in {5}", | ||
1109 | throttleMs, objatt.Name, objatt.PrimCount, sp.Name, attachmentPt, m_scene.Name); | ||
1110 | |||
1111 | Thread.Sleep(throttleMs); | ||
1112 | } | ||
1024 | 1113 | ||
1025 | return objatt; | 1114 | return objatt; |
1026 | } | 1115 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs index 1a38619..f023e77 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs | |||
@@ -38,6 +38,8 @@ using NUnit.Framework; | |||
38 | using OpenMetaverse; | 38 | using OpenMetaverse; |
39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
40 | using OpenSim.Framework.Communications; | 40 | using OpenSim.Framework.Communications; |
41 | using OpenSim.Framework.Servers; | ||
42 | using OpenSim.Framework.Servers.HttpServer; | ||
41 | using OpenSim.Region.CoreModules.Avatar.Attachments; | 43 | using OpenSim.Region.CoreModules.Avatar.Attachments; |
42 | using OpenSim.Region.CoreModules.Framework; | 44 | using OpenSim.Region.CoreModules.Framework; |
43 | using OpenSim.Region.CoreModules.Framework.EntityTransfer; | 45 | using OpenSim.Region.CoreModules.Framework.EntityTransfer; |
@@ -717,7 +719,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
717 | SceneObjectGroup rezzedAtt = presence.GetAttachments()[0]; | 719 | SceneObjectGroup rezzedAtt = presence.GetAttachments()[0]; |
718 | 720 | ||
719 | m_numberOfAttachEventsFired = 0; | 721 | m_numberOfAttachEventsFired = 0; |
720 | scene.IncomingCloseAgent(presence.UUID, false); | 722 | scene.CloseAgent(presence.UUID, false); |
721 | 723 | ||
722 | // Check that we can't retrieve this attachment from the scene. | 724 | // Check that we can't retrieve this attachment from the scene. |
723 | Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null); | 725 | Assert.That(scene.GetSceneObjectGroup(rezzedAtt.UUID), Is.Null); |
@@ -797,11 +799,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
797 | } | 799 | } |
798 | 800 | ||
799 | [Test] | 801 | [Test] |
800 | public void TestSameSimulatorNeighbouringRegionsTeleport() | 802 | public void TestSameSimulatorNeighbouringRegionsTeleportV1() |
801 | { | 803 | { |
802 | TestHelpers.InMethod(); | 804 | TestHelpers.InMethod(); |
803 | // TestHelpers.EnableLogging(); | 805 | // TestHelpers.EnableLogging(); |
804 | 806 | ||
807 | BaseHttpServer httpServer = new BaseHttpServer(99999); | ||
808 | MainServer.AddHttpServer(httpServer); | ||
809 | MainServer.Instance = httpServer; | ||
810 | |||
805 | AttachmentsModule attModA = new AttachmentsModule(); | 811 | AttachmentsModule attModA = new AttachmentsModule(); |
806 | AttachmentsModule attModB = new AttachmentsModule(); | 812 | AttachmentsModule attModB = new AttachmentsModule(); |
807 | EntityTransferModule etmA = new EntityTransferModule(); | 813 | EntityTransferModule etmA = new EntityTransferModule(); |
@@ -830,14 +836,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
830 | SceneHelpers.SetupSceneModules( | 836 | SceneHelpers.SetupSceneModules( |
831 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); | 837 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); |
832 | 838 | ||
839 | // FIXME: Hack - this is here temporarily to revert back to older entity transfer behaviour | ||
840 | lscm.ServiceVersion = "SIMULATION/0.1"; | ||
841 | |||
833 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); | 842 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); |
834 | 843 | ||
835 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); | 844 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); |
836 | TestClient tc = new TestClient(acd, sceneA, sh.SceneManager); | 845 | TestClient tc = new TestClient(acd, sceneA); |
837 | List<TestClient> destinationTestClients = new List<TestClient>(); | 846 | List<TestClient> destinationTestClients = new List<TestClient>(); |
838 | EntityTransferHelpers.SetUpInformClientOfNeighbour(tc, destinationTestClients); | 847 | EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients); |
839 | 848 | ||
840 | ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd, sh.SceneManager); | 849 | ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd); |
841 | beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32); | 850 | beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32); |
842 | 851 | ||
843 | InventoryItemBase attItem = CreateAttachmentItem(sceneA, ua1.PrincipalID, "att", 0x10, 0x20); | 852 | InventoryItemBase attItem = CreateAttachmentItem(sceneA, ua1.PrincipalID, "att", 0x10, 0x20); |
@@ -895,5 +904,115 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments.Tests | |||
895 | // Check events | 904 | // Check events |
896 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); | 905 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); |
897 | } | 906 | } |
907 | |||
908 | [Test] | ||
909 | public void TestSameSimulatorNeighbouringRegionsTeleportV2() | ||
910 | { | ||
911 | TestHelpers.InMethod(); | ||
912 | // TestHelpers.EnableLogging(); | ||
913 | |||
914 | BaseHttpServer httpServer = new BaseHttpServer(99999); | ||
915 | MainServer.AddHttpServer(httpServer); | ||
916 | MainServer.Instance = httpServer; | ||
917 | |||
918 | AttachmentsModule attModA = new AttachmentsModule(); | ||
919 | AttachmentsModule attModB = new AttachmentsModule(); | ||
920 | EntityTransferModule etmA = new EntityTransferModule(); | ||
921 | EntityTransferModule etmB = new EntityTransferModule(); | ||
922 | LocalSimulationConnectorModule lscm = new LocalSimulationConnectorModule(); | ||
923 | |||
924 | IConfigSource config = new IniConfigSource(); | ||
925 | IConfig modulesConfig = config.AddConfig("Modules"); | ||
926 | modulesConfig.Set("EntityTransferModule", etmA.Name); | ||
927 | modulesConfig.Set("SimulationServices", lscm.Name); | ||
928 | |||
929 | modulesConfig.Set("InventoryAccessModule", "BasicInventoryAccessModule"); | ||
930 | |||
931 | SceneHelpers sh = new SceneHelpers(); | ||
932 | TestScene sceneA = sh.SetupScene("sceneA", TestHelpers.ParseTail(0x100), 1000, 1000); | ||
933 | TestScene sceneB = sh.SetupScene("sceneB", TestHelpers.ParseTail(0x200), 1001, 1000); | ||
934 | |||
935 | SceneHelpers.SetupSceneModules(new Scene[] { sceneA, sceneB }, config, lscm); | ||
936 | SceneHelpers.SetupSceneModules( | ||
937 | sceneA, config, new CapabilitiesModule(), etmA, attModA, new BasicInventoryAccessModule()); | ||
938 | SceneHelpers.SetupSceneModules( | ||
939 | sceneB, config, new CapabilitiesModule(), etmB, attModB, new BasicInventoryAccessModule()); | ||
940 | |||
941 | UserAccount ua1 = UserAccountHelpers.CreateUserWithInventory(sceneA, 0x1); | ||
942 | |||
943 | AgentCircuitData acd = SceneHelpers.GenerateAgentData(ua1.PrincipalID); | ||
944 | TestClient tc = new TestClient(acd, sceneA); | ||
945 | List<TestClient> destinationTestClients = new List<TestClient>(); | ||
946 | EntityTransferHelpers.SetupInformClientOfNeighbourTriggersNeighbourClientCreate(tc, destinationTestClients); | ||
947 | |||
948 | ScenePresence beforeTeleportSp = SceneHelpers.AddScenePresence(sceneA, tc, acd); | ||
949 | beforeTeleportSp.AbsolutePosition = new Vector3(30, 31, 32); | ||
950 | |||
951 | Assert.That(destinationTestClients.Count, Is.EqualTo(1)); | ||
952 | Assert.That(destinationTestClients[0], Is.Not.Null); | ||
953 | |||
954 | InventoryItemBase attItem = CreateAttachmentItem(sceneA, ua1.PrincipalID, "att", 0x10, 0x20); | ||
955 | |||
956 | sceneA.AttachmentsModule.RezSingleAttachmentFromInventory( | ||
957 | beforeTeleportSp, attItem.ID, (uint)AttachmentPoint.Chest); | ||
958 | |||
959 | Vector3 teleportPosition = new Vector3(10, 11, 12); | ||
960 | Vector3 teleportLookAt = new Vector3(20, 21, 22); | ||
961 | |||
962 | // Here, we need to make clientA's receipt of SendRegionTeleport trigger clientB's CompleteMovement(). This | ||
963 | // is to operate the teleport V2 mechanism where the EntityTransferModule will first request the client to | ||
964 | // CompleteMovement to the region and then call UpdateAgent to the destination region to confirm the receipt | ||
965 | // Both these operations will occur on different threads and will wait for each other. | ||
966 | // We have to do this via ThreadPool directly since FireAndForget has been switched to sync for the V1 | ||
967 | // test protocol, where we are trying to avoid unpredictable async operations in regression tests. | ||
968 | tc.OnTestClientSendRegionTeleport | ||
969 | += (regionHandle, simAccess, regionExternalEndPoint, locationID, flags, capsURL) | ||
970 | => ThreadPool.UnsafeQueueUserWorkItem(o => destinationTestClients[0].CompleteMovement(), null); | ||
971 | |||
972 | m_numberOfAttachEventsFired = 0; | ||
973 | sceneA.RequestTeleportLocation( | ||
974 | beforeTeleportSp.ControllingClient, | ||
975 | sceneB.RegionInfo.RegionHandle, | ||
976 | teleportPosition, | ||
977 | teleportLookAt, | ||
978 | (uint)TeleportFlags.ViaLocation); | ||
979 | |||
980 | // Check attachments have made it into sceneB | ||
981 | ScenePresence afterTeleportSceneBSp = sceneB.GetScenePresence(ua1.PrincipalID); | ||
982 | |||
983 | // This is appearance data, as opposed to actually rezzed attachments | ||
984 | List<AvatarAttachment> sceneBAttachments = afterTeleportSceneBSp.Appearance.GetAttachments(); | ||
985 | Assert.That(sceneBAttachments.Count, Is.EqualTo(1)); | ||
986 | Assert.That(sceneBAttachments[0].AttachPoint, Is.EqualTo((int)AttachmentPoint.Chest)); | ||
987 | Assert.That(sceneBAttachments[0].ItemID, Is.EqualTo(attItem.ID)); | ||
988 | Assert.That(sceneBAttachments[0].AssetID, Is.EqualTo(attItem.AssetID)); | ||
989 | Assert.That(afterTeleportSceneBSp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest)); | ||
990 | |||
991 | // This is the actual attachment | ||
992 | List<SceneObjectGroup> actualSceneBAttachments = afterTeleportSceneBSp.GetAttachments(); | ||
993 | Assert.That(actualSceneBAttachments.Count, Is.EqualTo(1)); | ||
994 | SceneObjectGroup actualSceneBAtt = actualSceneBAttachments[0]; | ||
995 | Assert.That(actualSceneBAtt.Name, Is.EqualTo(attItem.Name)); | ||
996 | Assert.That(actualSceneBAtt.AttachmentPoint, Is.EqualTo((uint)AttachmentPoint.Chest)); | ||
997 | |||
998 | Assert.That(sceneB.GetSceneObjectGroups().Count, Is.EqualTo(1)); | ||
999 | |||
1000 | // Check attachments have been removed from sceneA | ||
1001 | ScenePresence afterTeleportSceneASp = sceneA.GetScenePresence(ua1.PrincipalID); | ||
1002 | |||
1003 | // Since this is appearance data, it is still present on the child avatar! | ||
1004 | List<AvatarAttachment> sceneAAttachments = afterTeleportSceneASp.Appearance.GetAttachments(); | ||
1005 | Assert.That(sceneAAttachments.Count, Is.EqualTo(1)); | ||
1006 | Assert.That(afterTeleportSceneASp.Appearance.GetAttachpoint(attItem.ID), Is.EqualTo((int)AttachmentPoint.Chest)); | ||
1007 | |||
1008 | // This is the actual attachment, which should no longer exist | ||
1009 | List<SceneObjectGroup> actualSceneAAttachments = afterTeleportSceneASp.GetAttachments(); | ||
1010 | Assert.That(actualSceneAAttachments.Count, Is.EqualTo(0)); | ||
1011 | |||
1012 | Assert.That(sceneA.GetSceneObjectGroups().Count, Is.EqualTo(0)); | ||
1013 | |||
1014 | // Check events | ||
1015 | Assert.That(m_numberOfAttachEventsFired, Is.EqualTo(0)); | ||
1016 | } | ||
898 | } | 1017 | } |
899 | } | 1018 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs index bc79944..09cc998 100644 --- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs | |||
@@ -55,6 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
55 | 55 | ||
56 | private int m_savetime = 5; // seconds to wait before saving changed appearance | 56 | private int m_savetime = 5; // seconds to wait before saving changed appearance |
57 | private int m_sendtime = 2; // seconds to wait before sending changed appearance | 57 | private int m_sendtime = 2; // seconds to wait before sending changed appearance |
58 | private bool m_reusetextures = false; | ||
58 | 59 | ||
59 | private int m_checkTime = 500; // milliseconds to wait between checks for appearance updates | 60 | private int m_checkTime = 500; // milliseconds to wait between checks for appearance updates |
60 | private System.Timers.Timer m_updateTimer = new System.Timers.Timer(); | 61 | private System.Timers.Timer m_updateTimer = new System.Timers.Timer(); |
@@ -73,6 +74,8 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
73 | { | 74 | { |
74 | m_savetime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime))); | 75 | m_savetime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSave",Convert.ToString(m_savetime))); |
75 | m_sendtime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime))); | 76 | m_sendtime = Convert.ToInt32(appearanceConfig.GetString("DelayBeforeAppearanceSend",Convert.ToString(m_sendtime))); |
77 | m_reusetextures = appearanceConfig.GetBoolean("ReuseTextures",m_reusetextures); | ||
78 | |||
76 | // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime); | 79 | // m_log.InfoFormat("[AVFACTORY] configured for {0} save and {1} send",m_savetime,m_sendtime); |
77 | } | 80 | } |
78 | 81 | ||
@@ -131,6 +134,7 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
131 | client.OnRequestWearables += Client_OnRequestWearables; | 134 | client.OnRequestWearables += Client_OnRequestWearables; |
132 | client.OnSetAppearance += Client_OnSetAppearance; | 135 | client.OnSetAppearance += Client_OnSetAppearance; |
133 | client.OnAvatarNowWearing += Client_OnAvatarNowWearing; | 136 | client.OnAvatarNowWearing += Client_OnAvatarNowWearing; |
137 | client.OnCachedTextureRequest += Client_OnCachedTextureRequest; | ||
134 | } | 138 | } |
135 | 139 | ||
136 | #endregion | 140 | #endregion |
@@ -1068,6 +1072,61 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory | |||
1068 | QueueAppearanceSave(client.AgentId); | 1072 | QueueAppearanceSave(client.AgentId); |
1069 | } | 1073 | } |
1070 | } | 1074 | } |
1075 | |||
1076 | /// <summary> | ||
1077 | /// Respond to the cached textures request from the client | ||
1078 | /// </summary> | ||
1079 | /// <param name="client"></param> | ||
1080 | /// <param name="serial"></param> | ||
1081 | /// <param name="cachedTextureRequest"></param> | ||
1082 | private void Client_OnCachedTextureRequest(IClientAPI client, int serial, List<CachedTextureRequestArg> cachedTextureRequest) | ||
1083 | { | ||
1084 | // m_log.WarnFormat("[AVFACTORY]: Client_OnCachedTextureRequest called for {0} ({1})", client.Name, client.AgentId); | ||
1085 | ScenePresence sp = m_scene.GetScenePresence(client.AgentId); | ||
1086 | |||
1087 | List<CachedTextureResponseArg> cachedTextureResponse = new List<CachedTextureResponseArg>(); | ||
1088 | foreach (CachedTextureRequestArg request in cachedTextureRequest) | ||
1089 | { | ||
1090 | UUID texture = UUID.Zero; | ||
1091 | int index = request.BakedTextureIndex; | ||
1092 | |||
1093 | if (m_reusetextures) | ||
1094 | { | ||
1095 | // this is the most insanely dumb way to do this... however it seems to | ||
1096 | // actually work. if the appearance has been reset because wearables have | ||
1097 | // changed then the texture entries are zero'd out until the bakes are | ||
1098 | // uploaded. on login, if the textures exist in the cache (eg if you logged | ||
1099 | // into the simulator recently, then the appearance will pull those and send | ||
1100 | // them back in the packet and you won't have to rebake. if the textures aren't | ||
1101 | // in the cache then the intial makeroot() call in scenepresence will zero | ||
1102 | // them out. | ||
1103 | // | ||
1104 | // a better solution (though how much better is an open question) is to | ||
1105 | // store the hashes in the appearance and compare them. Thats's coming. | ||
1106 | |||
1107 | Primitive.TextureEntryFace face = sp.Appearance.Texture.FaceTextures[index]; | ||
1108 | if (face != null) | ||
1109 | texture = face.TextureID; | ||
1110 | |||
1111 | // m_log.WarnFormat("[AVFACTORY]: reuse texture {0} for index {1}",texture,index); | ||
1112 | } | ||
1113 | |||
1114 | CachedTextureResponseArg response = new CachedTextureResponseArg(); | ||
1115 | response.BakedTextureIndex = index; | ||
1116 | response.BakedTextureID = texture; | ||
1117 | response.HostName = null; | ||
1118 | |||
1119 | cachedTextureResponse.Add(response); | ||
1120 | } | ||
1121 | |||
1122 | // m_log.WarnFormat("[AVFACTORY]: serial is {0}",serial); | ||
1123 | // The serial number appears to be used to match requests and responses | ||
1124 | // in the texture transaction. We just send back the serial number | ||
1125 | // that was provided in the request. The viewer bumps this for us. | ||
1126 | client.SendCachedTextureResponse(sp, serial, cachedTextureResponse); | ||
1127 | } | ||
1128 | |||
1129 | |||
1071 | #endregion | 1130 | #endregion |
1072 | 1131 | ||
1073 | public void WriteBakedTexturesReport(IScenePresence sp, ReportOutputAction outputAction) | 1132 | public void WriteBakedTexturesReport(IScenePresence sp, ReportOutputAction outputAction) |
diff --git a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs index 174642d..5cbfec6 100644 --- a/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs | |||
@@ -32,6 +32,7 @@ using log4net; | |||
32 | using Nini.Config; | 32 | using Nini.Config; |
33 | using Mono.Addins; | 33 | using Mono.Addins; |
34 | using OpenMetaverse; | 34 | using OpenMetaverse; |
35 | using OpenMetaverse.StructuredData; | ||
35 | using OpenSim.Framework; | 36 | using OpenSim.Framework; |
36 | using OpenSim.Region.Framework.Interfaces; | 37 | using OpenSim.Region.Framework.Interfaces; |
37 | using OpenSim.Region.Framework.Scenes; | 38 | using OpenSim.Region.Framework.Scenes; |
@@ -103,6 +104,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
103 | 104 | ||
104 | public virtual void RegionLoaded(Scene scene) | 105 | public virtual void RegionLoaded(Scene scene) |
105 | { | 106 | { |
107 | if (!m_enabled) | ||
108 | return; | ||
109 | |||
110 | ISimulatorFeaturesModule featuresModule = scene.RequestModuleInterface<ISimulatorFeaturesModule>(); | ||
111 | |||
112 | if (featuresModule != null) | ||
113 | featuresModule.OnSimulatorFeaturesRequest += OnSimulatorFeaturesRequest; | ||
114 | |||
106 | } | 115 | } |
107 | 116 | ||
108 | public virtual void RemoveRegion(Scene scene) | 117 | public virtual void RemoveRegion(Scene scene) |
@@ -372,21 +381,24 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
372 | UUID fromAgentID, UUID ownerID, string fromName, ChatTypeEnum type, | 381 | UUID fromAgentID, UUID ownerID, string fromName, ChatTypeEnum type, |
373 | string message, ChatSourceType src, bool ignoreDistance) | 382 | string message, ChatSourceType src, bool ignoreDistance) |
374 | { | 383 | { |
375 | // don't send chat to child agents | 384 | if (presence.LifecycleState != ScenePresenceState.Running) |
376 | if (presence.IsChildAgent) return false; | 385 | return false; |
377 | |||
378 | Vector3 fromRegionPos = fromPos + regionPos; | ||
379 | Vector3 toRegionPos = presence.AbsolutePosition + | ||
380 | new Vector3(presence.Scene.RegionInfo.RegionLocX * Constants.RegionSize, | ||
381 | presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); | ||
382 | 386 | ||
383 | int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos); | 387 | if (!ignoreDistance) |
384 | |||
385 | if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance || | ||
386 | type == ChatTypeEnum.Say && dis > m_saydistance || | ||
387 | type == ChatTypeEnum.Shout && dis > m_shoutdistance) | ||
388 | { | 388 | { |
389 | return false; | 389 | Vector3 fromRegionPos = fromPos + regionPos; |
390 | Vector3 toRegionPos = presence.AbsolutePosition + | ||
391 | new Vector3(presence.Scene.RegionInfo.RegionLocX * Constants.RegionSize, | ||
392 | presence.Scene.RegionInfo.RegionLocY * Constants.RegionSize, 0); | ||
393 | |||
394 | int dis = (int)Util.GetDistanceTo(toRegionPos, fromRegionPos); | ||
395 | |||
396 | if (type == ChatTypeEnum.Whisper && dis > m_whisperdistance || | ||
397 | type == ChatTypeEnum.Say && dis > m_saydistance || | ||
398 | type == ChatTypeEnum.Shout && dis > m_shoutdistance) | ||
399 | { | ||
400 | return false; | ||
401 | } | ||
390 | } | 402 | } |
391 | 403 | ||
392 | // TODO: should change so the message is sent through the avatar rather than direct to the ClientView | 404 | // TODO: should change so the message is sent through the avatar rather than direct to the ClientView |
@@ -426,5 +438,32 @@ namespace OpenSim.Region.CoreModules.Avatar.Chat | |||
426 | Timers.Remove(target); | 438 | Timers.Remove(target); |
427 | Timer.Dispose(); | 439 | Timer.Dispose(); |
428 | } | 440 | } |
441 | #region SimulatorFeaturesRequest | ||
442 | |||
443 | static OSDInteger m_SayRange, m_WhisperRange, m_ShoutRange; | ||
444 | |||
445 | private void OnSimulatorFeaturesRequest(UUID agentID, ref OSDMap features) | ||
446 | { | ||
447 | OSD extras = new OSDMap(); | ||
448 | if (features.ContainsKey("OpenSimExtras")) | ||
449 | extras = features["OpenSimExtras"]; | ||
450 | else | ||
451 | features["OpenSimExtras"] = extras; | ||
452 | |||
453 | if (m_SayRange == null) | ||
454 | { | ||
455 | // Do this only once | ||
456 | m_SayRange = new OSDInteger(m_saydistance); | ||
457 | m_WhisperRange = new OSDInteger(m_whisperdistance); | ||
458 | m_ShoutRange = new OSDInteger(m_shoutdistance); | ||
459 | } | ||
460 | |||
461 | ((OSDMap)extras)["say-range"] = m_SayRange; | ||
462 | ((OSDMap)extras)["whisper-range"] = m_WhisperRange; | ||
463 | ((OSDMap)extras)["shout-range"] = m_ShoutRange; | ||
464 | |||
465 | } | ||
466 | |||
467 | #endregion | ||
429 | } | 468 | } |
430 | } | 469 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs index 8056030..b693f2d 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | |||
@@ -371,7 +371,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
371 | foreach (string fid in outstanding) | 371 | foreach (string fid in outstanding) |
372 | { | 372 | { |
373 | UUID fromAgentID; | 373 | UUID fromAgentID; |
374 | string firstname = "Unknown", lastname = "User"; | 374 | string firstname = "Unknown", lastname = "UserFMSFOIN"; |
375 | if (!GetAgentInfo(client.Scene.RegionInfo.ScopeID, fid, out fromAgentID, out firstname, out lastname)) | 375 | if (!GetAgentInfo(client.Scene.RegionInfo.ScopeID, fid, out fromAgentID, out firstname, out lastname)) |
376 | { | 376 | { |
377 | m_log.DebugFormat("[FRIENDS MODULE]: skipping malformed friend {0}", fid); | 377 | m_log.DebugFormat("[FRIENDS MODULE]: skipping malformed friend {0}", fid); |
@@ -397,7 +397,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
397 | 397 | ||
398 | protected virtual bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last) | 398 | protected virtual bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last) |
399 | { | 399 | { |
400 | first = "Unknown"; last = "User"; | 400 | first = "Unknown"; last = "UserFMGAI"; |
401 | if (!UUID.TryParse(fid, out agentID)) | 401 | if (!UUID.TryParse(fid, out agentID)) |
402 | return false; | 402 | return false; |
403 | 403 | ||
@@ -498,6 +498,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
498 | 498 | ||
499 | protected virtual void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online) | 499 | protected virtual void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online) |
500 | { | 500 | { |
501 | //m_log.DebugFormat("[FRIENDS]: Entering StatusNotify for {0}", userID); | ||
502 | |||
501 | List<string> friendStringIds = friendList.ConvertAll<string>(friend => friend.Friend); | 503 | List<string> friendStringIds = friendList.ConvertAll<string>(friend => friend.Friend); |
502 | List<string> remoteFriendStringIds = new List<string>(); | 504 | List<string> remoteFriendStringIds = new List<string>(); |
503 | foreach (string friendStringId in friendStringIds) | 505 | foreach (string friendStringId in friendStringIds) |
@@ -523,12 +525,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
523 | foreach (PresenceInfo friendSession in friendSessions) | 525 | foreach (PresenceInfo friendSession in friendSessions) |
524 | { | 526 | { |
525 | // let's guard against sessions-gone-bad | 527 | // let's guard against sessions-gone-bad |
526 | if (friendSession.RegionID != UUID.Zero) | 528 | if (friendSession != null && friendSession.RegionID != UUID.Zero) |
527 | { | 529 | { |
530 | //m_log.DebugFormat("[FRIENDS]: Get region {0}", friendSession.RegionID); | ||
528 | GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); | 531 | GridRegion region = GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID, friendSession.RegionID); |
529 | //m_log.DebugFormat("[FRIENDS]: Remote Notify to region {0}", region.RegionName); | 532 | if (region != null) |
530 | m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online); | 533 | { |
534 | m_FriendsSimConnector.StatusNotify(region, userID, friendSession.UserID, online); | ||
535 | } | ||
531 | } | 536 | } |
537 | //else | ||
538 | // m_log.DebugFormat("[FRIENDS]: friend session is null or the region is UUID.Zero"); | ||
532 | } | 539 | } |
533 | } | 540 | } |
534 | 541 | ||
@@ -685,7 +692,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
685 | // | 692 | // |
686 | 693 | ||
687 | // Try local | 694 | // Try local |
688 | if (LocalFriendshipTerminated(exfriendID)) | 695 | if (LocalFriendshipTerminated(client.AgentId, exfriendID)) |
689 | return; | 696 | return; |
690 | 697 | ||
691 | PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() }); | 698 | PresenceInfo[] friendSessions = PresenceService.GetAgents(new string[] { exfriendID.ToString() }); |
@@ -827,13 +834,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
827 | return false; | 834 | return false; |
828 | } | 835 | } |
829 | 836 | ||
830 | public bool LocalFriendshipTerminated(UUID exfriendID) | 837 | public bool LocalFriendshipTerminated(UUID userID, UUID exfriendID) |
831 | { | 838 | { |
832 | IClientAPI friendClient = LocateClientObject(exfriendID); | 839 | IClientAPI friendClient = LocateClientObject(exfriendID); |
833 | if (friendClient != null) | 840 | if (friendClient != null) |
834 | { | 841 | { |
835 | // the friend in this sim as root agent | 842 | // the friend in this sim as root agent |
836 | friendClient.SendTerminateFriend(exfriendID); | 843 | friendClient.SendTerminateFriend(userID); |
837 | // update local cache | 844 | // update local cache |
838 | RecacheFriends(friendClient); | 845 | RecacheFriends(friendClient); |
839 | // we're done | 846 | // we're done |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs index 637beef..ff87ece 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsRequestHandler.cs | |||
@@ -42,19 +42,27 @@ using log4net; | |||
42 | 42 | ||
43 | namespace OpenSim.Region.CoreModules.Avatar.Friends | 43 | namespace OpenSim.Region.CoreModules.Avatar.Friends |
44 | { | 44 | { |
45 | public class FriendsRequestHandler : BaseStreamHandler | 45 | public class FriendsRequestHandler : BaseStreamHandlerBasicDOSProtector |
46 | { | 46 | { |
47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 47 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
48 | 48 | ||
49 | private FriendsModule m_FriendsModule; | 49 | private FriendsModule m_FriendsModule; |
50 | 50 | ||
51 | public FriendsRequestHandler(FriendsModule fmodule) | 51 | public FriendsRequestHandler(FriendsModule fmodule) |
52 | : base("POST", "/friends") | 52 | : base("POST", "/friends", new BasicDosProtectorOptions() |
53 | { | ||
54 | AllowXForwardedFor = true, | ||
55 | ForgetTimeSpan = TimeSpan.FromMinutes(2), | ||
56 | MaxRequestsInTimeframe = 20, | ||
57 | ReportingName = "FRIENDSDOSPROTECTOR", | ||
58 | RequestTimeSpan = TimeSpan.FromSeconds(5), | ||
59 | ThrottledAction = BasicDOSProtector.ThrottleAction.DoThrottledMethod | ||
60 | }) | ||
53 | { | 61 | { |
54 | m_FriendsModule = fmodule; | 62 | m_FriendsModule = fmodule; |
55 | } | 63 | } |
56 | 64 | ||
57 | public override byte[] Handle( | 65 | protected override byte[] ProcessRequest( |
58 | string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) | 66 | string path, Stream requestData, IOSHttpRequest httpRequest, IOSHttpResponse httpResponse) |
59 | { | 67 | { |
60 | StreamReader sr = new StreamReader(requestData); | 68 | StreamReader sr = new StreamReader(requestData); |
@@ -193,7 +201,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
193 | if (!UUID.TryParse(request["ToID"].ToString(), out toID)) | 201 | if (!UUID.TryParse(request["ToID"].ToString(), out toID)) |
194 | return FailureResult(); | 202 | return FailureResult(); |
195 | 203 | ||
196 | if (m_FriendsModule.LocalFriendshipTerminated(toID)) | 204 | if (m_FriendsModule.LocalFriendshipTerminated(fromID, toID)) |
197 | return SuccessResult(); | 205 | return SuccessResult(); |
198 | 206 | ||
199 | return FailureResult(); | 207 | return FailureResult(); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs index bf5c0bb..d00945e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Friends/HGFriendsModule.cs | |||
@@ -183,6 +183,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
183 | if (Util.ParseUniversalUserIdentifier(finfo.Friend, out id, out url, out first, out last, out tmp)) | 183 | if (Util.ParseUniversalUserIdentifier(finfo.Friend, out id, out url, out first, out last, out tmp)) |
184 | { | 184 | { |
185 | IUserManagement uMan = m_Scenes[0].RequestModuleInterface<IUserManagement>(); | 185 | IUserManagement uMan = m_Scenes[0].RequestModuleInterface<IUserManagement>(); |
186 | m_log.DebugFormat("[HGFRIENDS MODULE]: caching {0}", finfo.Friend); | ||
186 | uMan.AddUser(id, url + ";" + first + " " + last); | 187 | uMan.AddUser(id, url + ";" + first + " " + last); |
187 | } | 188 | } |
188 | } | 189 | } |
@@ -251,7 +252,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
251 | 252 | ||
252 | protected override void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online) | 253 | protected override void StatusNotify(List<FriendInfo> friendList, UUID userID, bool online) |
253 | { | 254 | { |
254 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering StatusNotify for {0}", userID); | 255 | //m_log.DebugFormat("[HGFRIENDS MODULE]: Entering StatusNotify for {0}", userID); |
255 | 256 | ||
256 | // First, let's divide the friends on a per-domain basis | 257 | // First, let's divide the friends on a per-domain basis |
257 | Dictionary<string, List<FriendInfo>> friendsPerDomain = new Dictionary<string, List<FriendInfo>>(); | 258 | Dictionary<string, List<FriendInfo>> friendsPerDomain = new Dictionary<string, List<FriendInfo>>(); |
@@ -293,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
293 | 294 | ||
294 | protected override bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last) | 295 | protected override bool GetAgentInfo(UUID scopeID, string fid, out UUID agentID, out string first, out string last) |
295 | { | 296 | { |
296 | first = "Unknown"; last = "User"; | 297 | first = "Unknown"; last = "UserHGGAI"; |
297 | if (base.GetAgentInfo(scopeID, fid, out agentID, out first, out last)) | 298 | if (base.GetAgentInfo(scopeID, fid, out agentID, out first, out last)) |
298 | return true; | 299 | return true; |
299 | 300 | ||
@@ -349,7 +350,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
349 | 350 | ||
350 | public override FriendInfo[] GetFriendsFromService(IClientAPI client) | 351 | public override FriendInfo[] GetFriendsFromService(IClientAPI client) |
351 | { | 352 | { |
352 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); | 353 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Entering GetFriendsFromService for {0}", client.Name); |
353 | Boolean agentIsLocal = true; | 354 | Boolean agentIsLocal = true; |
354 | if (UserManagementModule != null) | 355 | if (UserManagementModule != null) |
355 | agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId); | 356 | agentIsLocal = UserManagementModule.IsLocalGridUser(client.AgentId); |
@@ -362,13 +363,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Friends | |||
362 | AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode); | 363 | AgentCircuitData agentClientCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode); |
363 | if (agentClientCircuit != null) | 364 | if (agentClientCircuit != null) |
364 | { | 365 | { |
365 | //[XXX] string agentUUI = Util.ProduceUserUniversalIdentifier(agentClientCircuit); | 366 | // Note that this is calling a different interface than base; this one calls with a string param! |
366 | |||
367 | finfos = FriendsService.GetFriends(client.AgentId.ToString()); | 367 | finfos = FriendsService.GetFriends(client.AgentId.ToString()); |
368 | m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString()); | 368 | m_log.DebugFormat("[HGFRIENDS MODULE]: Fetched {0} local friends for visitor {1}", finfos.Length, client.AgentId.ToString()); |
369 | } | 369 | } |
370 | 370 | ||
371 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name); | 371 | // m_log.DebugFormat("[HGFRIENDS MODULE]: Exiting GetFriendsFromService for {0}", client.Name); |
372 | 372 | ||
373 | return finfos; | 373 | return finfos; |
374 | } | 374 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs index fa8c3f3..adb838c 100644 --- a/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs | |||
@@ -26,27 +26,25 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | 28 | using System; |
29 | using System.Collections.Generic; | ||
30 | using Nini.Config; | ||
31 | using OpenMetaverse; | ||
32 | using OpenSim.Framework; | ||
33 | using OpenSim.Region.Framework.Scenes; | ||
34 | using OpenSim.Region.Framework.Interfaces; | ||
35 | using System; | ||
36 | using System.Reflection; | ||
37 | using System.Collections; | 29 | using System.Collections; |
30 | using System.Collections.Generic; | ||
38 | using System.Collections.Specialized; | 31 | using System.Collections.Specialized; |
39 | using System.Reflection; | ||
40 | using System.IO; | 32 | using System.IO; |
33 | using System.Reflection; | ||
41 | using System.Web; | 34 | using System.Web; |
42 | using System.Xml; | 35 | using System.Xml; |
43 | using log4net; | 36 | using log4net; |
44 | using Mono.Addins; | 37 | using Mono.Addins; |
38 | using Nini.Config; | ||
39 | using OpenMetaverse; | ||
45 | using OpenMetaverse.Messages.Linden; | 40 | using OpenMetaverse.Messages.Linden; |
46 | using OpenMetaverse.StructuredData; | 41 | using OpenMetaverse.StructuredData; |
42 | using OpenSim.Framework; | ||
47 | using OpenSim.Framework.Capabilities; | 43 | using OpenSim.Framework.Capabilities; |
48 | using OpenSim.Framework.Servers; | 44 | using OpenSim.Framework.Servers; |
49 | using OpenSim.Framework.Servers.HttpServer; | 45 | using OpenSim.Framework.Servers.HttpServer; |
46 | using OpenSim.Region.Framework.Scenes; | ||
47 | using OpenSim.Region.Framework.Interfaces; | ||
50 | using Caps = OpenSim.Framework.Capabilities.Caps; | 48 | using Caps = OpenSim.Framework.Capabilities.Caps; |
51 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; | 49 | using OSDArray = OpenMetaverse.StructuredData.OSDArray; |
52 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; | 50 | using OSDMap = OpenMetaverse.StructuredData.OSDMap; |
@@ -127,9 +125,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
127 | { | 125 | { |
128 | string uri = "/CAPS/" + UUID.Random(); | 126 | string uri = "/CAPS/" + UUID.Random(); |
129 | 127 | ||
130 | caps.RegisterHandler("UntrustedSimulatorMessage", | 128 | caps.RegisterHandler( |
131 | new RestStreamHandler("POST", uri, | 129 | "UntrustedSimulatorMessage", |
132 | HandleUntrustedSimulatorMessage)); | 130 | new RestStreamHandler("POST", uri, HandleUntrustedSimulatorMessage, "UntrustedSimulatorMessage", null)); |
133 | } | 131 | } |
134 | 132 | ||
135 | private string HandleUntrustedSimulatorMessage(string request, | 133 | private string HandleUntrustedSimulatorMessage(string request, |
@@ -278,7 +276,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gods | |||
278 | if (sp.IsChildAgent) | 276 | if (sp.IsChildAgent) |
279 | return; | 277 | return; |
280 | sp.ControllingClient.Kick(reason); | 278 | sp.ControllingClient.Kick(reason); |
281 | sp.Scene.IncomingCloseAgent(sp.UUID, true); | 279 | sp.Scene.CloseAgent(sp.UUID, true); |
282 | } | 280 | } |
283 | 281 | ||
284 | private void OnIncomingInstantMessage(GridInstantMessage msg) | 282 | private void OnIncomingInstantMessage(GridInstantMessage msg) |
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs index 1627f6c..b321adb 100644 --- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs | |||
@@ -392,7 +392,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
392 | gim.fromAgentName = fromAgentName; | 392 | gim.fromAgentName = fromAgentName; |
393 | gim.fromGroup = fromGroup; | 393 | gim.fromGroup = fromGroup; |
394 | gim.imSessionID = imSessionID.Guid; | 394 | gim.imSessionID = imSessionID.Guid; |
395 | gim.RegionID = UUID.Zero.Guid; // RegionID.Guid; | 395 | gim.RegionID = RegionID.Guid; |
396 | gim.timestamp = timestamp; | 396 | gim.timestamp = timestamp; |
397 | gim.toAgentID = toAgentID.Guid; | 397 | gim.toAgentID = toAgentID.Guid; |
398 | gim.message = message; | 398 | gim.message = message; |
@@ -728,7 +728,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage | |||
728 | gim["position_x"] = msg.Position.X.ToString(); | 728 | gim["position_x"] = msg.Position.X.ToString(); |
729 | gim["position_y"] = msg.Position.Y.ToString(); | 729 | gim["position_y"] = msg.Position.Y.ToString(); |
730 | gim["position_z"] = msg.Position.Z.ToString(); | 730 | gim["position_z"] = msg.Position.Z.ToString(); |
731 | gim["region_id"] = msg.RegionID.ToString(); | 731 | gim["region_id"] = new UUID(msg.RegionID).ToString(); |
732 | gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None); | 732 | gim["binary_bucket"] = Convert.ToBase64String(msg.binaryBucket,Base64FormattingOptions.None); |
733 | if (m_MessageKey != String.Empty) | 733 | if (m_MessageKey != String.Empty) |
734 | gim["message_key"] = m_MessageKey; | 734 | gim["message_key"] = m_MessageKey; |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs index 659b178..5a8544e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs | |||
@@ -67,10 +67,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
67 | /// </summary> | 67 | /// </summary> |
68 | protected bool m_merge; | 68 | protected bool m_merge; |
69 | 69 | ||
70 | /// <value> | 70 | protected IInventoryService m_InventoryService; |
71 | /// We only use this to request modules | 71 | protected IAssetService m_AssetService; |
72 | /// </value> | 72 | protected IUserAccountService m_UserAccountService; |
73 | protected Scene m_scene; | ||
74 | 73 | ||
75 | /// <value> | 74 | /// <value> |
76 | /// The stream from which the inventory archive will be loaded. | 75 | /// The stream from which the inventory archive will be loaded. |
@@ -118,9 +117,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
118 | protected Dictionary<UUID, UUID> m_creatorIdForAssetId = new Dictionary<UUID, UUID>(); | 117 | protected Dictionary<UUID, UUID> m_creatorIdForAssetId = new Dictionary<UUID, UUID>(); |
119 | 118 | ||
120 | public InventoryArchiveReadRequest( | 119 | public InventoryArchiveReadRequest( |
121 | Scene scene, UserAccount userInfo, string invPath, string loadPath, bool merge) | 120 | IInventoryService inv, IAssetService assets, IUserAccountService uacc, UserAccount userInfo, string invPath, string loadPath, bool merge) |
122 | : this( | 121 | : this( |
123 | scene, | 122 | inv, |
123 | assets, | ||
124 | uacc, | ||
124 | userInfo, | 125 | userInfo, |
125 | invPath, | 126 | invPath, |
126 | new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress), | 127 | new GZipStream(ArchiveHelpers.GetStream(loadPath), CompressionMode.Decompress), |
@@ -129,9 +130,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
129 | } | 130 | } |
130 | 131 | ||
131 | public InventoryArchiveReadRequest( | 132 | public InventoryArchiveReadRequest( |
132 | Scene scene, UserAccount userInfo, string invPath, Stream loadStream, bool merge) | 133 | IInventoryService inv, IAssetService assets, IUserAccountService uacc, UserAccount userInfo, string invPath, Stream loadStream, bool merge) |
133 | { | 134 | { |
134 | m_scene = scene; | 135 | m_InventoryService = inv; |
136 | m_AssetService = assets; | ||
137 | m_UserAccountService = uacc; | ||
135 | m_merge = merge; | 138 | m_merge = merge; |
136 | m_userInfo = userInfo; | 139 | m_userInfo = userInfo; |
137 | m_invPath = invPath; | 140 | m_invPath = invPath; |
@@ -162,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
162 | 165 | ||
163 | List<InventoryFolderBase> folderCandidates | 166 | List<InventoryFolderBase> folderCandidates |
164 | = InventoryArchiveUtils.FindFoldersByPath( | 167 | = InventoryArchiveUtils.FindFoldersByPath( |
165 | m_scene.InventoryService, m_userInfo.PrincipalID, m_invPath); | 168 | m_InventoryService, m_userInfo.PrincipalID, m_invPath); |
166 | 169 | ||
167 | if (folderCandidates.Count == 0) | 170 | if (folderCandidates.Count == 0) |
168 | { | 171 | { |
@@ -297,7 +300,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
297 | string plainPath = ArchiveConstants.ExtractPlainPathFromIarPath(archivePath); | 300 | string plainPath = ArchiveConstants.ExtractPlainPathFromIarPath(archivePath); |
298 | List<InventoryFolderBase> folderCandidates | 301 | List<InventoryFolderBase> folderCandidates |
299 | = InventoryArchiveUtils.FindFoldersByPath( | 302 | = InventoryArchiveUtils.FindFoldersByPath( |
300 | m_scene.InventoryService, m_userInfo.PrincipalID, plainPath); | 303 | m_InventoryService, m_userInfo.PrincipalID, plainPath); |
301 | 304 | ||
302 | if (folderCandidates.Count != 0) | 305 | if (folderCandidates.Count != 0) |
303 | { | 306 | { |
@@ -380,7 +383,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
380 | = new InventoryFolderBase( | 383 | = new InventoryFolderBase( |
381 | newFolderId, newFolderName, m_userInfo.PrincipalID, | 384 | newFolderId, newFolderName, m_userInfo.PrincipalID, |
382 | (short)AssetType.Unknown, destFolder.ID, 1); | 385 | (short)AssetType.Unknown, destFolder.ID, 1); |
383 | m_scene.InventoryService.AddFolder(destFolder); | 386 | m_InventoryService.AddFolder(destFolder); |
384 | 387 | ||
385 | // Record that we have now created this folder | 388 | // Record that we have now created this folder |
386 | iarPathExisting += rawDirsToCreate[i] + "/"; | 389 | iarPathExisting += rawDirsToCreate[i] + "/"; |
@@ -406,7 +409,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
406 | // Don't use the item ID that's in the file | 409 | // Don't use the item ID that's in the file |
407 | item.ID = UUID.Random(); | 410 | item.ID = UUID.Random(); |
408 | 411 | ||
409 | UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.UserAccountService); | 412 | UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_UserAccountService); |
410 | if (UUID.Zero != ospResolvedId) // The user exists in this grid | 413 | if (UUID.Zero != ospResolvedId) // The user exists in this grid |
411 | { | 414 | { |
412 | // m_log.DebugFormat("[INVENTORY ARCHIVER]: Found creator {0} via OSPA resolution", ospResolvedId); | 415 | // m_log.DebugFormat("[INVENTORY ARCHIVER]: Found creator {0} via OSPA resolution", ospResolvedId); |
@@ -418,7 +421,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
418 | item.CreatorId = ospResolvedId.ToString(); | 421 | item.CreatorId = ospResolvedId.ToString(); |
419 | item.CreatorData = string.Empty; | 422 | item.CreatorData = string.Empty; |
420 | } | 423 | } |
421 | else if (item.CreatorData == null || item.CreatorData == String.Empty) | 424 | else if (string.IsNullOrEmpty(item.CreatorData)) |
422 | { | 425 | { |
423 | item.CreatorId = m_userInfo.PrincipalID.ToString(); | 426 | item.CreatorId = m_userInfo.PrincipalID.ToString(); |
424 | // item.CreatorIdAsUuid = new UUID(item.CreatorId); | 427 | // item.CreatorIdAsUuid = new UUID(item.CreatorId); |
@@ -436,7 +439,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
436 | // relying on native tar tools. | 439 | // relying on native tar tools. |
437 | m_creatorIdForAssetId[item.AssetID] = item.CreatorIdAsUuid; | 440 | m_creatorIdForAssetId[item.AssetID] = item.CreatorIdAsUuid; |
438 | 441 | ||
439 | m_scene.AddInventoryItem(item); | 442 | if (!m_InventoryService.AddItem(item)) |
443 | m_log.WarnFormat("[INVENTORY ARCHIVER]: Unable to save item {0} in folder {1}", item.Name, item.Folder); | ||
440 | 444 | ||
441 | return item; | 445 | return item; |
442 | } | 446 | } |
@@ -518,7 +522,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
518 | 522 | ||
519 | foreach (SceneObjectGroup sog in sceneObjects) | 523 | foreach (SceneObjectGroup sog in sceneObjects) |
520 | foreach (SceneObjectPart sop in sog.Parts) | 524 | foreach (SceneObjectPart sop in sog.Parts) |
521 | if (sop.CreatorData == null || sop.CreatorData == "") | 525 | if (string.IsNullOrEmpty(sop.CreatorData)) |
522 | sop.CreatorID = m_creatorIdForAssetId[assetId]; | 526 | sop.CreatorID = m_creatorIdForAssetId[assetId]; |
523 | 527 | ||
524 | if (coa != null) | 528 | if (coa != null) |
@@ -533,7 +537,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
533 | AssetBase asset = new AssetBase(assetId, "From IAR", assetType, UUID.Zero.ToString()); | 537 | AssetBase asset = new AssetBase(assetId, "From IAR", assetType, UUID.Zero.ToString()); |
534 | asset.Data = data; | 538 | asset.Data = data; |
535 | 539 | ||
536 | m_scene.AssetService.Store(asset); | 540 | m_AssetService.Store(asset); |
537 | 541 | ||
538 | return true; | 542 | return true; |
539 | } | 543 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs index 4ec8ae7..4292719 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs | |||
@@ -78,7 +78,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
78 | /// <value> | 78 | /// <value> |
79 | /// Used to collect the uuids of the assets that we need to save into the archive | 79 | /// Used to collect the uuids of the assets that we need to save into the archive |
80 | /// </value> | 80 | /// </value> |
81 | protected Dictionary<UUID, AssetType> m_assetUuids = new Dictionary<UUID, AssetType>(); | 81 | protected Dictionary<UUID, sbyte> m_assetUuids = new Dictionary<UUID, sbyte>(); |
82 | 82 | ||
83 | /// <value> | 83 | /// <value> |
84 | /// Used to collect the uuids of the users that we need to save into the archive | 84 | /// Used to collect the uuids of the users that we need to save into the archive |
@@ -187,7 +187,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
187 | 187 | ||
188 | // Don't chase down link asset items as they actually point to their target item IDs rather than an asset | 188 | // Don't chase down link asset items as they actually point to their target item IDs rather than an asset |
189 | if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) | 189 | if (SaveAssets && itemAssetType != AssetType.Link && itemAssetType != AssetType.LinkFolder) |
190 | m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (AssetType)inventoryItem.AssetType, m_assetUuids); | 190 | m_assetGatherer.GatherAssetUuids(inventoryItem.AssetID, (sbyte)inventoryItem.AssetType, m_assetUuids); |
191 | } | 191 | } |
192 | 192 | ||
193 | /// <summary> | 193 | /// <summary> |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs index f4f9e2d..ea660bd 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs | |||
@@ -294,7 +294,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
294 | 294 | ||
295 | try | 295 | try |
296 | { | 296 | { |
297 | request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream, merge); | 297 | request = new InventoryArchiveReadRequest(m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadStream, merge); |
298 | } | 298 | } |
299 | catch (EntryPointNotFoundException e) | 299 | catch (EntryPointNotFoundException e) |
300 | { | 300 | { |
@@ -342,7 +342,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
342 | 342 | ||
343 | try | 343 | try |
344 | { | 344 | { |
345 | request = new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath, merge); | 345 | request = new InventoryArchiveReadRequest(m_aScene.InventoryService, m_aScene.AssetService, m_aScene.UserAccountService, userInfo, invPath, loadPath, merge); |
346 | } | 346 | } |
347 | catch (EntryPointNotFoundException e) | 347 | catch (EntryPointNotFoundException e) |
348 | { | 348 | { |
@@ -538,7 +538,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver | |||
538 | } | 538 | } |
539 | catch (Exception e) | 539 | catch (Exception e) |
540 | { | 540 | { |
541 | m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e.Message); | 541 | m_log.ErrorFormat("[INVENTORY ARCHIVER]: Could not authenticate password, {0}", e); |
542 | return null; | 542 | return null; |
543 | } | 543 | } |
544 | */ | 544 | */ |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs index 95f562e..08f199a 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveLoadPathTests.cs | |||
@@ -229,7 +229,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
229 | 229 | ||
230 | { | 230 | { |
231 | // Test replication of path1 | 231 | // Test replication of path1 |
232 | new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false) | 232 | new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false) |
233 | .ReplicateArchivePathToUserInventory( | 233 | .ReplicateArchivePathToUserInventory( |
234 | iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID), | 234 | iarPath1, scene.InventoryService.GetRootFolder(ua1.PrincipalID), |
235 | foldersCreated, nodesLoaded); | 235 | foldersCreated, nodesLoaded); |
@@ -246,7 +246,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
246 | 246 | ||
247 | { | 247 | { |
248 | // Test replication of path2 | 248 | // Test replication of path2 |
249 | new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false) | 249 | new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false) |
250 | .ReplicateArchivePathToUserInventory( | 250 | .ReplicateArchivePathToUserInventory( |
251 | iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID), | 251 | iarPath2, scene.InventoryService.GetRootFolder(ua1.PrincipalID), |
252 | foldersCreated, nodesLoaded); | 252 | foldersCreated, nodesLoaded); |
@@ -291,8 +291,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
291 | string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random()); | 291 | string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random()); |
292 | 292 | ||
293 | string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName }); | 293 | string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName }); |
294 | 294 | ||
295 | new InventoryArchiveReadRequest(scene, ua1, null, (Stream)null, false) | 295 | new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, null, (Stream)null, false) |
296 | .ReplicateArchivePathToUserInventory( | 296 | .ReplicateArchivePathToUserInventory( |
297 | itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), | 297 | itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), |
298 | new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>()); | 298 | new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>()); |
@@ -342,8 +342,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
342 | string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random()); | 342 | string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random()); |
343 | 343 | ||
344 | string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName }); | 344 | string itemArchivePath = string.Join("", new string[] { folder1ArchiveName, folder2ArchiveName }); |
345 | 345 | ||
346 | new InventoryArchiveReadRequest(scene, ua1, folder1ExistingName, (Stream)null, true) | 346 | new InventoryArchiveReadRequest(scene.InventoryService, scene.AssetService, scene.UserAccountService, ua1, folder1ExistingName, (Stream)null, true) |
347 | .ReplicateArchivePathToUserInventory( | 347 | .ReplicateArchivePathToUserInventory( |
348 | itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), | 348 | itemArchivePath, scene.InventoryService.GetRootFolder(ua1.PrincipalID), |
349 | new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>()); | 349 | new Dictionary<string, InventoryFolderBase>(), new HashSet<InventoryNodeBase>()); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs index 5e7e24c..b85739e 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiveSaveTests.cs | |||
@@ -86,7 +86,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests | |||
86 | Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH)); | 86 | Assert.That(filePath, Is.EqualTo(ArchiveConstants.CONTROL_FILE_PATH)); |
87 | 87 | ||
88 | InventoryArchiveReadRequest iarr | 88 | InventoryArchiveReadRequest iarr |
89 | = new InventoryArchiveReadRequest(null, null, null, (Stream)null, false); | 89 | = new InventoryArchiveReadRequest(null, null, null, null, null, (Stream)null, false); |
90 | iarr.LoadControlFile(filePath, data); | 90 | iarr.LoadControlFile(filePath, data); |
91 | 91 | ||
92 | Assert.That(iarr.ControlFileLoaded, Is.True); | 92 | Assert.That(iarr.ControlFileLoaded, Is.True); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs index f122d00..03aaaac 100644 --- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs | |||
@@ -47,10 +47,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
47 | 47 | ||
48 | /// <summary> | 48 | /// <summary> |
49 | private List<Scene> m_Scenelist = new List<Scene>(); | 49 | private List<Scene> m_Scenelist = new List<Scene>(); |
50 | // private Dictionary<UUID, Scene> m_AgentRegions = | ||
51 | // new Dictionary<UUID, Scene>(); | ||
52 | 50 | ||
53 | private IMessageTransferModule m_TransferModule = null; | 51 | private IMessageTransferModule m_TransferModule; |
54 | private bool m_Enabled = true; | 52 | private bool m_Enabled = true; |
55 | 53 | ||
56 | #region Region Module interface | 54 | #region Region Module interface |
@@ -81,9 +79,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
81 | // scene.RegisterModuleInterface<IInventoryTransferModule>(this); | 79 | // scene.RegisterModuleInterface<IInventoryTransferModule>(this); |
82 | 80 | ||
83 | scene.EventManager.OnNewClient += OnNewClient; | 81 | scene.EventManager.OnNewClient += OnNewClient; |
84 | // scene.EventManager.OnClientClosed += ClientLoggedOut; | ||
85 | scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage; | 82 | scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage; |
86 | // scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene; | ||
87 | } | 83 | } |
88 | 84 | ||
89 | public void RegionLoaded(Scene scene) | 85 | public void RegionLoaded(Scene scene) |
@@ -96,11 +92,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
96 | m_log.Error("[INVENTORY TRANSFER]: No Message transfer module found, transfers will be local only"); | 92 | m_log.Error("[INVENTORY TRANSFER]: No Message transfer module found, transfers will be local only"); |
97 | m_Enabled = false; | 93 | m_Enabled = false; |
98 | 94 | ||
99 | m_Scenelist.Clear(); | 95 | // m_Scenelist.Clear(); |
100 | scene.EventManager.OnNewClient -= OnNewClient; | 96 | // scene.EventManager.OnNewClient -= OnNewClient; |
101 | // scene.EventManager.OnClientClosed -= ClientLoggedOut; | ||
102 | scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage; | 97 | scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage; |
103 | // scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene; | ||
104 | } | 98 | } |
105 | } | 99 | } |
106 | } | 100 | } |
@@ -108,9 +102,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
108 | public void RemoveRegion(Scene scene) | 102 | public void RemoveRegion(Scene scene) |
109 | { | 103 | { |
110 | scene.EventManager.OnNewClient -= OnNewClient; | 104 | scene.EventManager.OnNewClient -= OnNewClient; |
111 | // scene.EventManager.OnClientClosed -= ClientLoggedOut; | ||
112 | scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage; | 105 | scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage; |
113 | // scene.EventManager.OnSetRootAgentScene -= OnSetRootAgentScene; | ||
114 | m_Scenelist.Remove(scene); | 106 | m_Scenelist.Remove(scene); |
115 | } | 107 | } |
116 | 108 | ||
@@ -139,11 +131,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
139 | // Inventory giving is conducted via instant message | 131 | // Inventory giving is conducted via instant message |
140 | client.OnInstantMessage += OnInstantMessage; | 132 | client.OnInstantMessage += OnInstantMessage; |
141 | } | 133 | } |
142 | |||
143 | // protected void OnSetRootAgentScene(UUID id, Scene scene) | ||
144 | // { | ||
145 | // m_AgentRegions[id] = scene; | ||
146 | // } | ||
147 | 134 | ||
148 | private Scene FindClientScene(UUID agentId) | 135 | private Scene FindClientScene(UUID agentId) |
149 | { | 136 | { |
@@ -162,8 +149,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
162 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) | 149 | private void OnInstantMessage(IClientAPI client, GridInstantMessage im) |
163 | { | 150 | { |
164 | // m_log.DebugFormat( | 151 | // m_log.DebugFormat( |
165 | // "[INVENTORY TRANSFER]: {0} IM type received from {1}", | 152 | // "[INVENTORY TRANSFER]: {0} IM type received from client {1}. From={2} ({3}), To={4}", |
166 | // (InstantMessageDialog)im.dialog, client.Name); | 153 | // (InstantMessageDialog)im.dialog, client.Name, |
154 | // im.fromAgentID, im.fromAgentName, im.toAgentID); | ||
167 | 155 | ||
168 | Scene scene = FindClientScene(client.AgentId); | 156 | Scene scene = FindClientScene(client.AgentId); |
169 | 157 | ||
@@ -188,9 +176,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
188 | { | 176 | { |
189 | UUID folderID = new UUID(im.binaryBucket, 1); | 177 | UUID folderID = new UUID(im.binaryBucket, 1); |
190 | 178 | ||
191 | m_log.DebugFormat("[INVENTORY TRANSFER]: Inserting original folder {0} "+ | 179 | m_log.DebugFormat( |
192 | "into agent {1}'s inventory", | 180 | "[INVENTORY TRANSFER]: Inserting original folder {0} into agent {1}'s inventory", |
193 | folderID, new UUID(im.toAgentID)); | 181 | folderID, new UUID(im.toAgentID)); |
194 | 182 | ||
195 | InventoryFolderBase folderCopy | 183 | InventoryFolderBase folderCopy |
196 | = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero); | 184 | = scene.GiveInventoryFolder(recipientID, client.AgentId, folderID, UUID.Zero); |
@@ -213,7 +201,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
213 | user.ControllingClient.SendBulkUpdateInventory(folderCopy); | 201 | user.ControllingClient.SendBulkUpdateInventory(folderCopy); |
214 | 202 | ||
215 | // HACK!! | 203 | // HACK!! |
216 | // Insert the ID of the copied item into the IM so that we know which item to move to trash if it | 204 | // Insert the ID of the copied folder into the IM so that we know which item to move to trash if it |
217 | // is rejected. | 205 | // is rejected. |
218 | // XXX: This is probably a misuse of the session ID slot. | 206 | // XXX: This is probably a misuse of the session ID slot. |
219 | im.imSessionID = copyID.Guid; | 207 | im.imSessionID = copyID.Guid; |
@@ -425,7 +413,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
425 | { | 413 | { |
426 | folder = new InventoryFolderBase(inventoryID, client.AgentId); | 414 | folder = new InventoryFolderBase(inventoryID, client.AgentId); |
427 | folder = invService.GetFolder(folder); | 415 | folder = invService.GetFolder(folder); |
428 | 416 | ||
429 | if (folder != null & trashFolder != null) | 417 | if (folder != null & trashFolder != null) |
430 | { | 418 | { |
431 | previousParentFolderID = folder.ParentID; | 419 | previousParentFolderID = folder.ParentID; |
@@ -477,76 +465,23 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer | |||
477 | } | 465 | } |
478 | } | 466 | } |
479 | 467 | ||
480 | // public bool NeedSceneCacheClear(UUID agentID, Scene scene) | ||
481 | // { | ||
482 | // if (!m_AgentRegions.ContainsKey(agentID)) | ||
483 | // { | ||
484 | // // Since we can get here two ways, we need to scan | ||
485 | // // the scenes here. This is somewhat more expensive | ||
486 | // // but helps avoid a nasty bug | ||
487 | // // | ||
488 | // | ||
489 | // foreach (Scene s in m_Scenelist) | ||
490 | // { | ||
491 | // ScenePresence presence; | ||
492 | // | ||
493 | // if (s.TryGetScenePresence(agentID, out presence)) | ||
494 | // { | ||
495 | // // If the agent is in this scene, then we | ||
496 | // // are being called twice in a single | ||
497 | // // teleport. This is wasteful of cycles | ||
498 | // // but harmless due to this 2nd level check | ||
499 | // // | ||
500 | // // If the agent is found in another scene | ||
501 | // // then the list wasn't current | ||
502 | // // | ||
503 | // // If the agent is totally unknown, then what | ||
504 | // // are we even doing here?? | ||
505 | // // | ||
506 | // if (s == scene) | ||
507 | // { | ||
508 | // //m_log.Debug("[INVTRANSFERMOD]: s == scene. Returning true in " + scene.RegionInfo.RegionName); | ||
509 | // return true; | ||
510 | // } | ||
511 | // else | ||
512 | // { | ||
513 | // //m_log.Debug("[INVTRANSFERMOD]: s != scene. Returning false in " + scene.RegionInfo.RegionName); | ||
514 | // return false; | ||
515 | // } | ||
516 | // } | ||
517 | // } | ||
518 | // //m_log.Debug("[INVTRANSFERMOD]: agent not in scene. Returning true in " + scene.RegionInfo.RegionName); | ||
519 | // return true; | ||
520 | // } | ||
521 | // | ||
522 | // // The agent is left in current Scene, so we must be | ||
523 | // // going to another instance | ||
524 | // // | ||
525 | // if (m_AgentRegions[agentID] == scene) | ||
526 | // { | ||
527 | // //m_log.Debug("[INVTRANSFERMOD]: m_AgentRegions[agentID] == scene. Returning true in " + scene.RegionInfo.RegionName); | ||
528 | // m_AgentRegions.Remove(agentID); | ||
529 | // return true; | ||
530 | // } | ||
531 | // | ||
532 | // // Another region has claimed the agent | ||
533 | // // | ||
534 | // //m_log.Debug("[INVTRANSFERMOD]: last resort. Returning false in " + scene.RegionInfo.RegionName); | ||
535 | // return false; | ||
536 | // } | ||
537 | // | ||
538 | // public void ClientLoggedOut(UUID agentID, Scene scene) | ||
539 | // { | ||
540 | // if (m_AgentRegions.ContainsKey(agentID)) | ||
541 | // m_AgentRegions.Remove(agentID); | ||
542 | // } | ||
543 | |||
544 | /// <summary> | 468 | /// <summary> |
545 | /// | 469 | /// |
546 | /// </summary> | 470 | /// </summary> |
547 | /// <param name="msg"></param> | 471 | /// <param name="im"></param> |
548 | private void OnGridInstantMessage(GridInstantMessage im) | 472 | private void OnGridInstantMessage(GridInstantMessage im) |
549 | { | 473 | { |
474 | // Check if it's a type of message that we should handle | ||
475 | if (!((im.dialog == (byte) InstantMessageDialog.InventoryOffered) | ||
476 | || (im.dialog == (byte) InstantMessageDialog.InventoryAccepted) | ||
477 | || (im.dialog == (byte) InstantMessageDialog.InventoryDeclined) | ||
478 | || (im.dialog == (byte) InstantMessageDialog.TaskInventoryDeclined))) | ||
479 | return; | ||
480 | |||
481 | m_log.DebugFormat( | ||
482 | "[INVENTORY TRANSFER]: {0} IM type received from grid. From={1} ({2}), To={3}", | ||
483 | (InstantMessageDialog)im.dialog, im.fromAgentID, im.fromAgentName, im.toAgentID); | ||
484 | |||
550 | // Check if this is ours to handle | 485 | // Check if this is ours to handle |
551 | // | 486 | // |
552 | Scene scene = FindClientScene(new UUID(im.toAgentID)); | 487 | Scene scene = FindClientScene(new UUID(im.toAgentID)); |
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs new file mode 100644 index 0000000..162a0c3 --- /dev/null +++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/Tests/InventoryTransferModuleTests.cs | |||
@@ -0,0 +1,449 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.Collections.Generic; | ||
30 | using System.Reflection; | ||
31 | using log4net.Config; | ||
32 | using Nini.Config; | ||
33 | using NUnit.Framework; | ||
34 | using OpenMetaverse; | ||
35 | using OpenMetaverse.Assets; | ||
36 | using OpenSim.Framework; | ||
37 | using OpenSim.Region.CoreModules.Avatar.Inventory.Transfer; | ||
38 | using OpenSim.Region.Framework.Interfaces; | ||
39 | using OpenSim.Region.Framework.Scenes; | ||
40 | using OpenSim.Services.Interfaces; | ||
41 | using OpenSim.Tests.Common; | ||
42 | using OpenSim.Tests.Common.Mock; | ||
43 | |||
44 | namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.Tests | ||
45 | { | ||
46 | [TestFixture] | ||
47 | public class InventoryTransferModuleTests : OpenSimTestCase | ||
48 | { | ||
49 | protected TestScene m_scene; | ||
50 | |||
51 | [SetUp] | ||
52 | public override void SetUp() | ||
53 | { | ||
54 | base.SetUp(); | ||
55 | |||
56 | IConfigSource config = new IniConfigSource(); | ||
57 | config.AddConfig("Messaging"); | ||
58 | config.Configs["Messaging"].Set("InventoryTransferModule", "InventoryTransferModule"); | ||
59 | |||
60 | m_scene = new SceneHelpers().SetupScene(); | ||
61 | SceneHelpers.SetupSceneModules(m_scene, config, new InventoryTransferModule()); | ||
62 | } | ||
63 | |||
64 | [Test] | ||
65 | public void TestAcceptGivenItem() | ||
66 | { | ||
67 | // TestHelpers.EnableLogging(); | ||
68 | |||
69 | UUID initialSessionId = TestHelpers.ParseTail(0x10); | ||
70 | UUID itemId = TestHelpers.ParseTail(0x100); | ||
71 | UUID assetId = TestHelpers.ParseTail(0x200); | ||
72 | |||
73 | UserAccount ua1 | ||
74 | = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw"); | ||
75 | UserAccount ua2 | ||
76 | = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw"); | ||
77 | |||
78 | ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1); | ||
79 | TestClient giverClient = (TestClient)giverSp.ControllingClient; | ||
80 | |||
81 | ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2); | ||
82 | TestClient receiverClient = (TestClient)receiverSp.ControllingClient; | ||
83 | |||
84 | // Create the object to test give | ||
85 | InventoryItemBase originalItem | ||
86 | = UserInventoryHelpers.CreateInventoryItem( | ||
87 | m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object); | ||
88 | |||
89 | byte[] giveImBinaryBucket = new byte[17]; | ||
90 | byte[] itemIdBytes = itemId.GetBytes(); | ||
91 | Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length); | ||
92 | |||
93 | GridInstantMessage giveIm | ||
94 | = new GridInstantMessage( | ||
95 | m_scene, | ||
96 | giverSp.UUID, | ||
97 | giverSp.Name, | ||
98 | receiverSp.UUID, | ||
99 | (byte)InstantMessageDialog.InventoryOffered, | ||
100 | false, | ||
101 | "inventory offered msg", | ||
102 | initialSessionId, | ||
103 | false, | ||
104 | Vector3.Zero, | ||
105 | giveImBinaryBucket, | ||
106 | true); | ||
107 | |||
108 | giverClient.HandleImprovedInstantMessage(giveIm); | ||
109 | |||
110 | // These details might not all be correct. | ||
111 | GridInstantMessage acceptIm | ||
112 | = new GridInstantMessage( | ||
113 | m_scene, | ||
114 | receiverSp.UUID, | ||
115 | receiverSp.Name, | ||
116 | giverSp.UUID, | ||
117 | (byte)InstantMessageDialog.InventoryAccepted, | ||
118 | false, | ||
119 | "inventory accepted msg", | ||
120 | initialSessionId, | ||
121 | false, | ||
122 | Vector3.Zero, | ||
123 | null, | ||
124 | true); | ||
125 | |||
126 | receiverClient.HandleImprovedInstantMessage(acceptIm); | ||
127 | |||
128 | // Test for item remaining in the giver's inventory (here we assume a copy item) | ||
129 | // TODO: Test no-copy items. | ||
130 | InventoryItemBase originalItemAfterGive | ||
131 | = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj"); | ||
132 | |||
133 | Assert.That(originalItemAfterGive, Is.Not.Null); | ||
134 | Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID)); | ||
135 | |||
136 | // Test for item successfully making it into the receiver's inventory | ||
137 | InventoryItemBase receivedItem | ||
138 | = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Objects/givenObj"); | ||
139 | |||
140 | Assert.That(receivedItem, Is.Not.Null); | ||
141 | Assert.That(receivedItem.ID, Is.Not.EqualTo(originalItem.ID)); | ||
142 | |||
143 | // Test that on a delete, item still exists and is accessible for the giver. | ||
144 | m_scene.InventoryService.DeleteItems(receiverSp.UUID, new List<UUID>() { receivedItem.ID }); | ||
145 | |||
146 | InventoryItemBase originalItemAfterDelete | ||
147 | = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj"); | ||
148 | |||
149 | Assert.That(originalItemAfterDelete, Is.Not.Null); | ||
150 | |||
151 | // TODO: Test scenario where giver deletes their item first. | ||
152 | } | ||
153 | |||
154 | /// <summary> | ||
155 | /// Test user rejection of a given item. | ||
156 | /// </summary> | ||
157 | /// <remarks> | ||
158 | /// A rejected item still ends up in the user's trash folder. | ||
159 | /// </remarks> | ||
160 | [Test] | ||
161 | public void TestRejectGivenItem() | ||
162 | { | ||
163 | // TestHelpers.EnableLogging(); | ||
164 | |||
165 | UUID initialSessionId = TestHelpers.ParseTail(0x10); | ||
166 | UUID itemId = TestHelpers.ParseTail(0x100); | ||
167 | UUID assetId = TestHelpers.ParseTail(0x200); | ||
168 | |||
169 | UserAccount ua1 | ||
170 | = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw"); | ||
171 | UserAccount ua2 | ||
172 | = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw"); | ||
173 | |||
174 | ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1); | ||
175 | TestClient giverClient = (TestClient)giverSp.ControllingClient; | ||
176 | |||
177 | ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2); | ||
178 | TestClient receiverClient = (TestClient)receiverSp.ControllingClient; | ||
179 | |||
180 | // Create the object to test give | ||
181 | InventoryItemBase originalItem | ||
182 | = UserInventoryHelpers.CreateInventoryItem( | ||
183 | m_scene, "givenObj", itemId, assetId, giverSp.UUID, InventoryType.Object); | ||
184 | |||
185 | GridInstantMessage receivedIm = null; | ||
186 | receiverClient.OnReceivedInstantMessage += im => receivedIm = im; | ||
187 | |||
188 | byte[] giveImBinaryBucket = new byte[17]; | ||
189 | byte[] itemIdBytes = itemId.GetBytes(); | ||
190 | Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length); | ||
191 | |||
192 | GridInstantMessage giveIm | ||
193 | = new GridInstantMessage( | ||
194 | m_scene, | ||
195 | giverSp.UUID, | ||
196 | giverSp.Name, | ||
197 | receiverSp.UUID, | ||
198 | (byte)InstantMessageDialog.InventoryOffered, | ||
199 | false, | ||
200 | "inventory offered msg", | ||
201 | initialSessionId, | ||
202 | false, | ||
203 | Vector3.Zero, | ||
204 | giveImBinaryBucket, | ||
205 | true); | ||
206 | |||
207 | giverClient.HandleImprovedInstantMessage(giveIm); | ||
208 | |||
209 | // These details might not all be correct. | ||
210 | // Session ID is now the created item ID (!) | ||
211 | GridInstantMessage rejectIm | ||
212 | = new GridInstantMessage( | ||
213 | m_scene, | ||
214 | receiverSp.UUID, | ||
215 | receiverSp.Name, | ||
216 | giverSp.UUID, | ||
217 | (byte)InstantMessageDialog.InventoryDeclined, | ||
218 | false, | ||
219 | "inventory declined msg", | ||
220 | new UUID(receivedIm.imSessionID), | ||
221 | false, | ||
222 | Vector3.Zero, | ||
223 | null, | ||
224 | true); | ||
225 | |||
226 | receiverClient.HandleImprovedInstantMessage(rejectIm); | ||
227 | |||
228 | // Test for item remaining in the giver's inventory (here we assume a copy item) | ||
229 | // TODO: Test no-copy items. | ||
230 | InventoryItemBase originalItemAfterGive | ||
231 | = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj"); | ||
232 | |||
233 | Assert.That(originalItemAfterGive, Is.Not.Null); | ||
234 | Assert.That(originalItemAfterGive.ID, Is.EqualTo(originalItem.ID)); | ||
235 | |||
236 | // Test for item successfully making it into the receiver's inventory | ||
237 | InventoryItemBase receivedItem | ||
238 | = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, receiverSp.UUID, "Trash/givenObj"); | ||
239 | |||
240 | InventoryFolderBase trashFolder | ||
241 | = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, AssetType.TrashFolder); | ||
242 | |||
243 | Assert.That(receivedItem, Is.Not.Null); | ||
244 | Assert.That(receivedItem.ID, Is.Not.EqualTo(originalItem.ID)); | ||
245 | Assert.That(receivedItem.Folder, Is.EqualTo(trashFolder.ID)); | ||
246 | |||
247 | // Test that on a delete, item still exists and is accessible for the giver. | ||
248 | m_scene.InventoryService.PurgeFolder(trashFolder); | ||
249 | |||
250 | InventoryItemBase originalItemAfterDelete | ||
251 | = UserInventoryHelpers.GetInventoryItem(m_scene.InventoryService, giverSp.UUID, "Objects/givenObj"); | ||
252 | |||
253 | Assert.That(originalItemAfterDelete, Is.Not.Null); | ||
254 | } | ||
255 | |||
256 | [Test] | ||
257 | public void TestAcceptGivenFolder() | ||
258 | { | ||
259 | TestHelpers.InMethod(); | ||
260 | // TestHelpers.EnableLogging(); | ||
261 | |||
262 | UUID initialSessionId = TestHelpers.ParseTail(0x10); | ||
263 | UUID folderId = TestHelpers.ParseTail(0x100); | ||
264 | |||
265 | UserAccount ua1 | ||
266 | = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw"); | ||
267 | UserAccount ua2 | ||
268 | = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw"); | ||
269 | |||
270 | ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1); | ||
271 | TestClient giverClient = (TestClient)giverSp.ControllingClient; | ||
272 | |||
273 | ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2); | ||
274 | TestClient receiverClient = (TestClient)receiverSp.ControllingClient; | ||
275 | |||
276 | InventoryFolderBase originalFolder | ||
277 | = UserInventoryHelpers.CreateInventoryFolder( | ||
278 | m_scene.InventoryService, giverSp.UUID, folderId, "f1", true); | ||
279 | |||
280 | byte[] giveImBinaryBucket = new byte[17]; | ||
281 | giveImBinaryBucket[0] = (byte)AssetType.Folder; | ||
282 | byte[] itemIdBytes = folderId.GetBytes(); | ||
283 | Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length); | ||
284 | |||
285 | GridInstantMessage giveIm | ||
286 | = new GridInstantMessage( | ||
287 | m_scene, | ||
288 | giverSp.UUID, | ||
289 | giverSp.Name, | ||
290 | receiverSp.UUID, | ||
291 | (byte)InstantMessageDialog.InventoryOffered, | ||
292 | false, | ||
293 | "inventory offered msg", | ||
294 | initialSessionId, | ||
295 | false, | ||
296 | Vector3.Zero, | ||
297 | giveImBinaryBucket, | ||
298 | true); | ||
299 | |||
300 | giverClient.HandleImprovedInstantMessage(giveIm); | ||
301 | |||
302 | // These details might not all be correct. | ||
303 | GridInstantMessage acceptIm | ||
304 | = new GridInstantMessage( | ||
305 | m_scene, | ||
306 | receiverSp.UUID, | ||
307 | receiverSp.Name, | ||
308 | giverSp.UUID, | ||
309 | (byte)InstantMessageDialog.InventoryAccepted, | ||
310 | false, | ||
311 | "inventory accepted msg", | ||
312 | initialSessionId, | ||
313 | false, | ||
314 | Vector3.Zero, | ||
315 | null, | ||
316 | true); | ||
317 | |||
318 | receiverClient.HandleImprovedInstantMessage(acceptIm); | ||
319 | |||
320 | // Test for item remaining in the giver's inventory (here we assume a copy item) | ||
321 | // TODO: Test no-copy items. | ||
322 | InventoryFolderBase originalFolderAfterGive | ||
323 | = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1"); | ||
324 | |||
325 | Assert.That(originalFolderAfterGive, Is.Not.Null); | ||
326 | Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID)); | ||
327 | |||
328 | // Test for item successfully making it into the receiver's inventory | ||
329 | InventoryFolderBase receivedFolder | ||
330 | = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "f1"); | ||
331 | |||
332 | Assert.That(receivedFolder, Is.Not.Null); | ||
333 | Assert.That(receivedFolder.ID, Is.Not.EqualTo(originalFolder.ID)); | ||
334 | |||
335 | // Test that on a delete, item still exists and is accessible for the giver. | ||
336 | m_scene.InventoryService.DeleteFolders(receiverSp.UUID, new List<UUID>() { receivedFolder.ID }); | ||
337 | |||
338 | InventoryFolderBase originalFolderAfterDelete | ||
339 | = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1"); | ||
340 | |||
341 | Assert.That(originalFolderAfterDelete, Is.Not.Null); | ||
342 | |||
343 | // TODO: Test scenario where giver deletes their item first. | ||
344 | } | ||
345 | |||
346 | /// <summary> | ||
347 | /// Test user rejection of a given item. | ||
348 | /// </summary> | ||
349 | /// <remarks> | ||
350 | /// A rejected item still ends up in the user's trash folder. | ||
351 | /// </remarks> | ||
352 | [Test] | ||
353 | public void TestRejectGivenFolder() | ||
354 | { | ||
355 | TestHelpers.InMethod(); | ||
356 | // TestHelpers.EnableLogging(); | ||
357 | |||
358 | UUID initialSessionId = TestHelpers.ParseTail(0x10); | ||
359 | UUID folderId = TestHelpers.ParseTail(0x100); | ||
360 | |||
361 | UserAccount ua1 | ||
362 | = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "One", TestHelpers.ParseTail(0x1), "pw"); | ||
363 | UserAccount ua2 | ||
364 | = UserAccountHelpers.CreateUserWithInventory(m_scene, "User", "Two", TestHelpers.ParseTail(0x2), "pw"); | ||
365 | |||
366 | ScenePresence giverSp = SceneHelpers.AddScenePresence(m_scene, ua1); | ||
367 | TestClient giverClient = (TestClient)giverSp.ControllingClient; | ||
368 | |||
369 | ScenePresence receiverSp = SceneHelpers.AddScenePresence(m_scene, ua2); | ||
370 | TestClient receiverClient = (TestClient)receiverSp.ControllingClient; | ||
371 | |||
372 | // Create the folder to test give | ||
373 | InventoryFolderBase originalFolder | ||
374 | = UserInventoryHelpers.CreateInventoryFolder( | ||
375 | m_scene.InventoryService, giverSp.UUID, folderId, "f1", true); | ||
376 | |||
377 | GridInstantMessage receivedIm = null; | ||
378 | receiverClient.OnReceivedInstantMessage += im => receivedIm = im; | ||
379 | |||
380 | byte[] giveImBinaryBucket = new byte[17]; | ||
381 | giveImBinaryBucket[0] = (byte)AssetType.Folder; | ||
382 | byte[] itemIdBytes = folderId.GetBytes(); | ||
383 | Array.Copy(itemIdBytes, 0, giveImBinaryBucket, 1, itemIdBytes.Length); | ||
384 | |||
385 | GridInstantMessage giveIm | ||
386 | = new GridInstantMessage( | ||
387 | m_scene, | ||
388 | giverSp.UUID, | ||
389 | giverSp.Name, | ||
390 | receiverSp.UUID, | ||
391 | (byte)InstantMessageDialog.InventoryOffered, | ||
392 | false, | ||
393 | "inventory offered msg", | ||
394 | initialSessionId, | ||
395 | false, | ||
396 | Vector3.Zero, | ||
397 | giveImBinaryBucket, | ||
398 | true); | ||
399 | |||
400 | giverClient.HandleImprovedInstantMessage(giveIm); | ||
401 | |||
402 | // These details might not all be correct. | ||
403 | // Session ID is now the created item ID (!) | ||
404 | GridInstantMessage rejectIm | ||
405 | = new GridInstantMessage( | ||
406 | m_scene, | ||
407 | receiverSp.UUID, | ||
408 | receiverSp.Name, | ||
409 | giverSp.UUID, | ||
410 | (byte)InstantMessageDialog.InventoryDeclined, | ||
411 | false, | ||
412 | "inventory declined msg", | ||
413 | new UUID(receivedIm.imSessionID), | ||
414 | false, | ||
415 | Vector3.Zero, | ||
416 | null, | ||
417 | true); | ||
418 | |||
419 | receiverClient.HandleImprovedInstantMessage(rejectIm); | ||
420 | |||
421 | // Test for item remaining in the giver's inventory (here we assume a copy item) | ||
422 | // TODO: Test no-copy items. | ||
423 | InventoryFolderBase originalFolderAfterGive | ||
424 | = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1"); | ||
425 | |||
426 | Assert.That(originalFolderAfterGive, Is.Not.Null); | ||
427 | Assert.That(originalFolderAfterGive.ID, Is.EqualTo(originalFolder.ID)); | ||
428 | |||
429 | // Test for folder successfully making it into the receiver's inventory | ||
430 | InventoryFolderBase receivedFolder | ||
431 | = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, receiverSp.UUID, "Trash/f1"); | ||
432 | |||
433 | InventoryFolderBase trashFolder | ||
434 | = m_scene.InventoryService.GetFolderForType(receiverSp.UUID, AssetType.TrashFolder); | ||
435 | |||
436 | Assert.That(receivedFolder, Is.Not.Null); | ||
437 | Assert.That(receivedFolder.ID, Is.Not.EqualTo(originalFolder.ID)); | ||
438 | Assert.That(receivedFolder.ParentID, Is.EqualTo(trashFolder.ID)); | ||
439 | |||
440 | // Test that on a delete, item still exists and is accessible for the giver. | ||
441 | m_scene.InventoryService.PurgeFolder(trashFolder); | ||
442 | |||
443 | InventoryFolderBase originalFolderAfterDelete | ||
444 | = UserInventoryHelpers.GetInventoryFolder(m_scene.InventoryService, giverSp.UUID, "f1"); | ||
445 | |||
446 | Assert.That(originalFolderAfterDelete, Is.Not.Null); | ||
447 | } | ||
448 | } | ||
449 | } \ No newline at end of file | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs index 0c64f19..c517a30 100644 --- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs | |||
@@ -165,7 +165,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure | |||
165 | (uint)presence.AbsolutePosition.Y, | 165 | (uint)presence.AbsolutePosition.Y, |
166 | (uint)presence.AbsolutePosition.Z + 2); | 166 | (uint)presence.AbsolutePosition.Z + 2); |
167 | 167 | ||
168 | m_log.DebugFormat("TP invite with message {0}, type {1}", message, lureType); | 168 | m_log.DebugFormat("[LURE MODULE]: TP invite with message {0}, type {1}", message, lureType); |
169 | 169 | ||
170 | GridInstantMessage m; | 170 | GridInstantMessage m; |
171 | 171 | ||
diff --git a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs index bf24030..2bb24ae 100644 --- a/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Profile/BasicProfileModule.cs | |||
@@ -57,6 +57,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Profile | |||
57 | 57 | ||
58 | public void Initialise(IConfigSource config) | 58 | public void Initialise(IConfigSource config) |
59 | { | 59 | { |
60 | if(config.Configs["UserProfiles"] != null) | ||
61 | return; | ||
62 | |||
60 | m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled"); | 63 | m_log.DebugFormat("[PROFILE MODULE]: Basic Profile Module enabled"); |
61 | m_Enabled = true; | 64 | m_Enabled = true; |
62 | } | 65 | } |
diff --git a/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs new file mode 100644 index 0000000..d359ebc --- /dev/null +++ b/OpenSim/Region/CoreModules/Avatar/UserProfiles/UserProfileModule.cs | |||
@@ -0,0 +1,1343 @@ | |||
1 | /* | ||
2 | * Copyright (c) Contributors, http://opensimulator.org/ | ||
3 | * See CONTRIBUTORS.TXT for a full list of copyright holders. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions are met: | ||
7 | * * Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * * Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * * Neither the name of the OpenSimulator Project nor the | ||
13 | * names of its contributors may be used to endorse or promote products | ||
14 | * derived from this software without specific prior written permission. | ||
15 | * | ||
16 | * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY | ||
17 | * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
18 | * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
19 | * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY | ||
20 | * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
21 | * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
22 | * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND | ||
23 | * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
24 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
26 | */ | ||
27 | |||
28 | using System; | ||
29 | using System.IO; | ||
30 | using System.Text; | ||
31 | using System.Collections; | ||
32 | using System.Collections.Generic; | ||
33 | using System.Globalization; | ||
34 | using System.Net; | ||
35 | using System.Net.Sockets; | ||
36 | using System.Reflection; | ||
37 | using System.Xml; | ||
38 | using OpenMetaverse; | ||
39 | using OpenMetaverse.StructuredData; | ||
40 | using log4net; | ||
41 | using Nini.Config; | ||
42 | using Nwc.XmlRpc; | ||
43 | using OpenSim.Framework; | ||
44 | using OpenSim.Region.Framework.Interfaces; | ||
45 | using OpenSim.Region.Framework.Scenes; | ||
46 | using OpenSim.Services.Interfaces; | ||
47 | using Mono.Addins; | ||
48 | using OpenSim.Services.Connectors.Hypergrid; | ||
49 | |||
50 | namespace OpenSim.Region.OptionalModules.Avatar.UserProfiles | ||
51 | { | ||
52 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "UserProfilesModule")] | ||
53 | public class UserProfileModule : IProfileModule, INonSharedRegionModule | ||
54 | { | ||
55 | /// <summary> | ||
56 | /// Logging | ||
57 | /// </summary> | ||
58 | static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | ||
59 | |||
60 | // The pair of Dictionaries are used to handle the switching of classified ads | ||
61 | // by maintaining a cache of classified id to creator id mappings and an interest | ||
62 | // count. The entries are removed when the interest count reaches 0. | ||
63 | Dictionary<UUID, UUID> m_classifiedCache = new Dictionary<UUID, UUID>(); | ||
64 | Dictionary<UUID, int> m_classifiedInterest = new Dictionary<UUID, int>(); | ||
65 | |||
66 | public Scene Scene | ||
67 | { | ||
68 | get; private set; | ||
69 | } | ||
70 | |||
71 | /// <summary> | ||
72 | /// Gets or sets the ConfigSource. | ||
73 | /// </summary> | ||
74 | /// <value> | ||
75 | /// The configuration | ||
76 | /// </value> | ||
77 | public IConfigSource Config { | ||
78 | get; | ||
79 | set; | ||
80 | } | ||
81 | |||
82 | /// <summary> | ||
83 | /// Gets or sets the URI to the profile server. | ||
84 | /// </summary> | ||
85 | /// <value> | ||
86 | /// The profile server URI. | ||
87 | /// </value> | ||
88 | public string ProfileServerUri { | ||
89 | get; | ||
90 | set; | ||
91 | } | ||
92 | |||
93 | IProfileModule ProfileModule | ||
94 | { | ||
95 | get; set; | ||
96 | } | ||
97 | |||
98 | IUserManagement UserManagementModule | ||
99 | { | ||
100 | get; set; | ||
101 | } | ||
102 | |||
103 | /// <summary> | ||
104 | /// Gets or sets a value indicating whether this | ||
105 | /// <see cref="OpenSim.Region.Coremodules.UserProfiles.UserProfileModule"/> is enabled. | ||
106 | /// </summary> | ||
107 | /// <value> | ||
108 | /// <c>true</c> if enabled; otherwise, <c>false</c>. | ||
109 | /// </value> | ||
110 | public bool Enabled { | ||
111 | get; | ||
112 | set; | ||
113 | } | ||
114 | |||
115 | #region IRegionModuleBase implementation | ||
116 | /// <summary> | ||
117 | /// This is called to initialize the region module. For shared modules, this is called exactly once, after | ||
118 | /// creating the single (shared) instance. For non-shared modules, this is called once on each instance, after | ||
119 | /// the instace for the region has been created. | ||
120 | /// </summary> | ||
121 | /// <param name='source'> | ||
122 | /// Source. | ||
123 | /// </param> | ||
124 | public void Initialise(IConfigSource source) | ||
125 | { | ||
126 | Config = source; | ||
127 | ReplaceableInterface = typeof(IProfileModule); | ||
128 | |||
129 | IConfig profileConfig = Config.Configs["UserProfiles"]; | ||
130 | |||
131 | if (profileConfig == null) | ||
132 | { | ||
133 | m_log.Debug("[PROFILES]: UserProfiles disabled, no configuration"); | ||
134 | Enabled = false; | ||
135 | return; | ||
136 | } | ||
137 | |||
138 | // If we find ProfileURL then we configure for FULL support | ||
139 | // else we setup for BASIC support | ||
140 | ProfileServerUri = profileConfig.GetString("ProfileServiceURL", ""); | ||
141 | if (ProfileServerUri == "") | ||
142 | { | ||
143 | Enabled = false; | ||
144 | return; | ||
145 | } | ||
146 | |||
147 | m_log.Debug("[PROFILES]: Full Profiles Enabled"); | ||
148 | ReplaceableInterface = null; | ||
149 | Enabled = true; | ||
150 | } | ||
151 | |||
152 | /// <summary> | ||
153 | /// Adds the region. | ||
154 | /// </summary> | ||
155 | /// <param name='scene'> | ||
156 | /// Scene. | ||
157 | /// </param> | ||
158 | public void AddRegion(Scene scene) | ||
159 | { | ||
160 | if(!Enabled) | ||
161 | return; | ||
162 | |||
163 | Scene = scene; | ||
164 | Scene.RegisterModuleInterface<IProfileModule>(this); | ||
165 | Scene.EventManager.OnNewClient += OnNewClient; | ||
166 | Scene.EventManager.OnMakeRootAgent += HandleOnMakeRootAgent; | ||
167 | |||
168 | UserManagementModule = Scene.RequestModuleInterface<IUserManagement>(); | ||
169 | } | ||
170 | |||
171 | void HandleOnMakeRootAgent (ScenePresence obj) | ||
172 | { | ||
173 | if(obj.PresenceType == PresenceType.Npc) | ||
174 | return; | ||
175 | |||
176 | Util.FireAndForget(delegate | ||
177 | { | ||
178 | GetImageAssets(((IScenePresence)obj).UUID); | ||
179 | }); | ||
180 | } | ||
181 | |||
182 | /// <summary> | ||
183 | /// Removes the region. | ||
184 | /// </summary> | ||
185 | /// <param name='scene'> | ||
186 | /// Scene. | ||
187 | /// </param> | ||
188 | public void RemoveRegion(Scene scene) | ||
189 | { | ||
190 | if(!Enabled) | ||
191 | return; | ||
192 | } | ||
193 | |||
194 | /// <summary> | ||
195 | /// This will be called once for every scene loaded. In a shared module this will be multiple times in one | ||
196 | /// instance, while a nonshared module instance will only be called once. This method is called after AddRegion | ||
197 | /// has been called in all modules for that scene, providing an opportunity to request another module's | ||
198 | /// interface, or hook an event from another module. | ||
199 | /// </summary> | ||
200 | /// <param name='scene'> | ||
201 | /// Scene. | ||
202 | /// </param> | ||
203 | public void RegionLoaded(Scene scene) | ||
204 | { | ||
205 | if(!Enabled) | ||
206 | return; | ||
207 | } | ||
208 | |||
209 | /// <summary> | ||
210 | /// If this returns non-null, it is the type of an interface that this module intends to register. This will | ||
211 | /// cause the loader to defer loading of this module until all other modules have been loaded. If no other | ||
212 | /// module has registered the interface by then, this module will be activated, else it will remain inactive, | ||
213 | /// letting the other module take over. This should return non-null ONLY in modules that are intended to be | ||
214 | /// easily replaceable, e.g. stub implementations that the developer expects to be replaced by third party | ||
215 | /// provided modules. | ||
216 | /// </summary> | ||
217 | /// <value> | ||
218 | /// The replaceable interface. | ||
219 | /// </value> | ||
220 | public Type ReplaceableInterface | ||
221 | { | ||
222 | get; private set; | ||
223 | } | ||
224 | |||
225 | /// <summary> | ||
226 | /// Called as the instance is closed. | ||
227 | /// </summary> | ||
228 | public void Close() | ||
229 | { | ||
230 | } | ||
231 | |||
232 | /// <value> | ||
233 | /// The name of the module | ||
234 | /// </value> | ||
235 | /// <summary> | ||
236 | /// Gets the module name. | ||
237 | /// </summary> | ||
238 | public string Name | ||
239 | { | ||
240 | get { return "UserProfileModule"; } | ||
241 | } | ||
242 | #endregion IRegionModuleBase implementation | ||
243 | |||
244 | #region Region Event Handlers | ||
245 | /// <summary> | ||
246 | /// Raises the new client event. | ||
247 | /// </summary> | ||
248 | /// <param name='client'> | ||
249 | /// Client. | ||
250 | /// </param> | ||
251 | void OnNewClient(IClientAPI client) | ||
252 | { | ||
253 | //Profile | ||
254 | client.OnRequestAvatarProperties += RequestAvatarProperties; | ||
255 | client.OnUpdateAvatarProperties += AvatarPropertiesUpdate; | ||
256 | client.OnAvatarInterestUpdate += AvatarInterestsUpdate; | ||
257 | |||
258 | // Classifieds | ||
259 | client.AddGenericPacketHandler("avatarclassifiedsrequest", ClassifiedsRequest); | ||
260 | client.OnClassifiedInfoUpdate += ClassifiedInfoUpdate; | ||
261 | client.OnClassifiedInfoRequest += ClassifiedInfoRequest; | ||
262 | client.OnClassifiedDelete += ClassifiedDelete; | ||
263 | |||
264 | // Picks | ||
265 | client.AddGenericPacketHandler("avatarpicksrequest", PicksRequest); | ||
266 | client.AddGenericPacketHandler("pickinforequest", PickInfoRequest); | ||
267 | client.OnPickInfoUpdate += PickInfoUpdate; | ||
268 | client.OnPickDelete += PickDelete; | ||
269 | |||
270 | // Notes | ||
271 | client.AddGenericPacketHandler("avatarnotesrequest", NotesRequest); | ||
272 | client.OnAvatarNotesUpdate += NotesUpdate; | ||
273 | } | ||
274 | #endregion Region Event Handlers | ||
275 | |||
276 | #region Classified | ||
277 | /// | ||
278 | /// <summary> | ||
279 | /// Handles the avatar classifieds request. | ||
280 | /// </summary> | ||
281 | /// <param name='sender'> | ||
282 | /// Sender. | ||
283 | /// </param> | ||
284 | /// <param name='method'> | ||
285 | /// Method. | ||
286 | /// </param> | ||
287 | /// <param name='args'> | ||
288 | /// Arguments. | ||
289 | /// </param> | ||
290 | public void ClassifiedsRequest(Object sender, string method, List<String> args) | ||
291 | { | ||
292 | if (!(sender is IClientAPI)) | ||
293 | return; | ||
294 | |||
295 | IClientAPI remoteClient = (IClientAPI)sender; | ||
296 | |||
297 | UUID targetID; | ||
298 | UUID.TryParse(args[0], out targetID); | ||
299 | |||
300 | // Can't handle NPC yet... | ||
301 | ScenePresence p = FindPresence(targetID); | ||
302 | |||
303 | if (null != p) | ||
304 | { | ||
305 | if (p.PresenceType == PresenceType.Npc) | ||
306 | return; | ||
307 | } | ||
308 | |||
309 | string serverURI = string.Empty; | ||
310 | GetUserProfileServerURI(targetID, out serverURI); | ||
311 | UUID creatorId = UUID.Zero; | ||
312 | Dictionary<UUID, string> classifieds = new Dictionary<UUID, string>(); | ||
313 | |||
314 | OSDMap parameters= new OSDMap(); | ||
315 | UUID.TryParse(args[0], out creatorId); | ||
316 | parameters.Add("creatorId", OSD.FromUUID(creatorId)); | ||
317 | OSD Params = (OSD)parameters; | ||
318 | if(!JsonRpcRequest(ref Params, "avatarclassifiedsrequest", serverURI, UUID.Random().ToString())) | ||
319 | { | ||
320 | remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds); | ||
321 | return; | ||
322 | } | ||
323 | |||
324 | parameters = (OSDMap)Params; | ||
325 | |||
326 | OSDArray list = (OSDArray)parameters["result"]; | ||
327 | |||
328 | |||
329 | foreach(OSD map in list) | ||
330 | { | ||
331 | OSDMap m = (OSDMap)map; | ||
332 | UUID cid = m["classifieduuid"].AsUUID(); | ||
333 | string name = m["name"].AsString(); | ||
334 | |||
335 | classifieds[cid] = name; | ||
336 | |||
337 | lock (m_classifiedCache) | ||
338 | { | ||
339 | if (!m_classifiedCache.ContainsKey(cid)) | ||
340 | { | ||
341 | m_classifiedCache.Add(cid,creatorId); | ||
342 | m_classifiedInterest.Add(cid, 0); | ||
343 | } | ||
344 | |||
345 | m_classifiedInterest[cid]++; | ||
346 | } | ||
347 | } | ||
348 | |||
349 | remoteClient.SendAvatarClassifiedReply(new UUID(args[0]), classifieds); | ||
350 | } | ||
351 | |||
352 | public void ClassifiedInfoRequest(UUID queryClassifiedID, IClientAPI remoteClient) | ||
353 | { | ||
354 | UUID target = remoteClient.AgentId; | ||
355 | UserClassifiedAdd ad = new UserClassifiedAdd(); | ||
356 | ad.ClassifiedId = queryClassifiedID; | ||
357 | |||
358 | lock (m_classifiedCache) | ||
359 | { | ||
360 | if (m_classifiedCache.ContainsKey(queryClassifiedID)) | ||
361 | { | ||
362 | target = m_classifiedCache[queryClassifiedID]; | ||
363 | |||
364 | m_classifiedInterest[queryClassifiedID] --; | ||
365 | |||
366 | if (m_classifiedInterest[queryClassifiedID] == 0) | ||
367 | { | ||
368 | m_classifiedInterest.Remove(queryClassifiedID); | ||
369 | m_classifiedCache.Remove(queryClassifiedID); | ||
370 | } | ||
371 | } | ||
372 | } | ||
373 | |||
374 | string serverURI = string.Empty; | ||
375 | GetUserProfileServerURI(target, out serverURI); | ||
376 | |||
377 | object Ad = (object)ad; | ||
378 | if(!JsonRpcRequest(ref Ad, "classifieds_info_query", serverURI, UUID.Random().ToString())) | ||
379 | { | ||
380 | remoteClient.SendAgentAlertMessage( | ||
381 | "Error getting classified info", false); | ||
382 | return; | ||
383 | } | ||
384 | ad = (UserClassifiedAdd) Ad; | ||
385 | |||
386 | if(ad.CreatorId == UUID.Zero) | ||
387 | return; | ||
388 | |||
389 | Vector3 globalPos = new Vector3(); | ||
390 | Vector3.TryParse(ad.GlobalPos, out globalPos); | ||
391 | |||
392 | remoteClient.SendClassifiedInfoReply(ad.ClassifiedId, ad.CreatorId, (uint)ad.CreationDate, (uint)ad.ExpirationDate, | ||
393 | (uint)ad.Category, ad.Name, ad.Description, ad.ParcelId, (uint)ad.ParentEstate, | ||
394 | ad.SnapshotId, ad.SimName, globalPos, ad.ParcelName, ad.Flags, ad.Price); | ||
395 | |||
396 | } | ||
397 | |||
398 | /// <summary> | ||
399 | /// Classifieds info update. | ||
400 | /// </summary> | ||
401 | /// <param name='queryclassifiedID'> | ||
402 | /// Queryclassified I. | ||
403 | /// </param> | ||
404 | /// <param name='queryCategory'> | ||
405 | /// Query category. | ||
406 | /// </param> | ||
407 | /// <param name='queryName'> | ||
408 | /// Query name. | ||
409 | /// </param> | ||
410 | /// <param name='queryDescription'> | ||
411 | /// Query description. | ||
412 | /// </param> | ||
413 | /// <param name='queryParcelID'> | ||
414 | /// Query parcel I. | ||
415 | /// </param> | ||
416 | /// <param name='queryParentEstate'> | ||
417 | /// Query parent estate. | ||
418 | /// </param> | ||
419 | /// <param name='querySnapshotID'> | ||
420 | /// Query snapshot I. | ||
421 | /// </param> | ||
422 | /// <param name='queryGlobalPos'> | ||
423 | /// Query global position. | ||
424 | /// </param> | ||
425 | /// <param name='queryclassifiedFlags'> | ||
426 | /// Queryclassified flags. | ||
427 | /// </param> | ||
428 | /// <param name='queryclassifiedPrice'> | ||
429 | /// Queryclassified price. | ||
430 | /// </param> | ||
431 | /// <param name='remoteClient'> | ||
432 | /// Remote client. | ||
433 | /// </param> | ||
434 | public void ClassifiedInfoUpdate(UUID queryclassifiedID, uint queryCategory, string queryName, string queryDescription, UUID queryParcelID, | ||
435 | uint queryParentEstate, UUID querySnapshotID, Vector3 queryGlobalPos, byte queryclassifiedFlags, | ||
436 | int queryclassifiedPrice, IClientAPI remoteClient) | ||
437 | { | ||
438 | UserClassifiedAdd ad = new UserClassifiedAdd(); | ||
439 | |||
440 | Scene s = (Scene) remoteClient.Scene; | ||
441 | Vector3 pos = remoteClient.SceneAgent.AbsolutePosition; | ||
442 | ILandObject land = s.LandChannel.GetLandObject(pos.X, pos.Y); | ||
443 | ScenePresence p = FindPresence(remoteClient.AgentId); | ||
444 | |||
445 | string serverURI = string.Empty; | ||
446 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | ||
447 | |||
448 | if (land == null) | ||
449 | { | ||
450 | ad.ParcelName = string.Empty; | ||
451 | } | ||
452 | else | ||
453 | { | ||
454 | ad.ParcelName = land.LandData.Name; | ||
455 | } | ||
456 | |||
457 | ad.CreatorId = remoteClient.AgentId; | ||
458 | ad.ClassifiedId = queryclassifiedID; | ||
459 | ad.Category = Convert.ToInt32(queryCategory); | ||
460 | ad.Name = queryName; | ||
461 | ad.Description = queryDescription; | ||
462 | ad.ParentEstate = Convert.ToInt32(queryParentEstate); | ||
463 | ad.SnapshotId = querySnapshotID; | ||
464 | ad.SimName = remoteClient.Scene.RegionInfo.RegionName; | ||
465 | ad.GlobalPos = queryGlobalPos.ToString (); | ||
466 | ad.Flags = queryclassifiedFlags; | ||
467 | ad.Price = queryclassifiedPrice; | ||
468 | ad.ParcelId = p.currentParcelUUID; | ||
469 | |||
470 | object Ad = ad; | ||
471 | |||
472 | OSD.SerializeMembers(Ad); | ||
473 | |||
474 | if(!JsonRpcRequest(ref Ad, "classified_update", serverURI, UUID.Random().ToString())) | ||
475 | { | ||
476 | remoteClient.SendAgentAlertMessage( | ||
477 | "Error updating classified", false); | ||
478 | } | ||
479 | } | ||
480 | |||
481 | /// <summary> | ||
482 | /// Classifieds delete. | ||
483 | /// </summary> | ||
484 | /// <param name='queryClassifiedID'> | ||
485 | /// Query classified I. | ||
486 | /// </param> | ||
487 | /// <param name='remoteClient'> | ||
488 | /// Remote client. | ||
489 | /// </param> | ||
490 | public void ClassifiedDelete(UUID queryClassifiedID, IClientAPI remoteClient) | ||
491 | { | ||
492 | string serverURI = string.Empty; | ||
493 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | ||
494 | |||
495 | UUID classifiedId; | ||
496 | OSDMap parameters= new OSDMap(); | ||
497 | UUID.TryParse(queryClassifiedID.ToString(), out classifiedId); | ||
498 | parameters.Add("classifiedId", OSD.FromUUID(classifiedId)); | ||
499 | OSD Params = (OSD)parameters; | ||
500 | if(!JsonRpcRequest(ref Params, "classified_delete", serverURI, UUID.Random().ToString())) | ||
501 | { | ||
502 | remoteClient.SendAgentAlertMessage( | ||
503 | "Error classified delete", false); | ||
504 | } | ||
505 | |||
506 | parameters = (OSDMap)Params; | ||
507 | } | ||
508 | #endregion Classified | ||
509 | |||
510 | #region Picks | ||
511 | /// <summary> | ||
512 | /// Handles the avatar picks request. | ||
513 | /// </summary> | ||
514 | /// <param name='sender'> | ||
515 | /// Sender. | ||
516 | /// </param> | ||
517 | /// <param name='method'> | ||
518 | /// Method. | ||
519 | /// </param> | ||
520 | /// <param name='args'> | ||
521 | /// Arguments. | ||
522 | /// </param> | ||
523 | public void PicksRequest(Object sender, string method, List<String> args) | ||
524 | { | ||
525 | if (!(sender is IClientAPI)) | ||
526 | return; | ||
527 | |||
528 | IClientAPI remoteClient = (IClientAPI)sender; | ||
529 | |||
530 | UUID targetId; | ||
531 | UUID.TryParse(args[0], out targetId); | ||
532 | |||
533 | // Can't handle NPC yet... | ||
534 | ScenePresence p = FindPresence(targetId); | ||
535 | |||
536 | if (null != p) | ||
537 | { | ||
538 | if (p.PresenceType == PresenceType.Npc) | ||
539 | return; | ||
540 | } | ||
541 | |||
542 | string serverURI = string.Empty; | ||
543 | GetUserProfileServerURI(targetId, out serverURI); | ||
544 | |||
545 | Dictionary<UUID, string> picks = new Dictionary<UUID, string>(); | ||
546 | |||
547 | OSDMap parameters= new OSDMap(); | ||
548 | parameters.Add("creatorId", OSD.FromUUID(targetId)); | ||
549 | OSD Params = (OSD)parameters; | ||
550 | if(!JsonRpcRequest(ref Params, "avatarpicksrequest", serverURI, UUID.Random().ToString())) | ||
551 | { | ||
552 | remoteClient.SendAvatarPicksReply(new UUID(args[0]), picks); | ||
553 | return; | ||
554 | } | ||
555 | |||
556 | parameters = (OSDMap)Params; | ||
557 | |||
558 | OSDArray list = (OSDArray)parameters["result"]; | ||
559 | |||
560 | foreach(OSD map in list) | ||
561 | { | ||
562 | OSDMap m = (OSDMap)map; | ||
563 | UUID cid = m["pickuuid"].AsUUID(); | ||
564 | string name = m["name"].AsString(); | ||
565 | |||
566 | m_log.DebugFormat("[PROFILES]: PicksRequest {0}", name); | ||
567 | |||
568 | picks[cid] = name; | ||
569 | } | ||
570 | remoteClient.SendAvatarPicksReply(new UUID(args[0]), picks); | ||
571 | } | ||
572 | |||
573 | /// <summary> | ||
574 | /// Handles the pick info request. | ||
575 | /// </summary> | ||
576 | /// <param name='sender'> | ||
577 | /// Sender. | ||
578 | /// </param> | ||
579 | /// <param name='method'> | ||
580 | /// Method. | ||
581 | /// </param> | ||
582 | /// <param name='args'> | ||
583 | /// Arguments. | ||
584 | /// </param> | ||
585 | public void PickInfoRequest(Object sender, string method, List<String> args) | ||
586 | { | ||
587 | if (!(sender is IClientAPI)) | ||
588 | return; | ||
589 | |||
590 | UUID targetID; | ||
591 | UUID.TryParse(args[0], out targetID); | ||
592 | string serverURI = string.Empty; | ||
593 | GetUserProfileServerURI(targetID, out serverURI); | ||
594 | IClientAPI remoteClient = (IClientAPI)sender; | ||
595 | |||
596 | UserProfilePick pick = new UserProfilePick(); | ||
597 | UUID.TryParse(args[0], out pick.CreatorId); | ||
598 | UUID.TryParse(args[1], out pick.PickId); | ||
599 | |||
600 | |||
601 | object Pick = (object)pick; | ||
602 | if(!JsonRpcRequest(ref Pick, "pickinforequest", serverURI, UUID.Random().ToString())) | ||
603 | { | ||
604 | remoteClient.SendAgentAlertMessage( | ||
605 | "Error selecting pick", false); | ||
606 | } | ||
607 | pick = (UserProfilePick) Pick; | ||
608 | if(pick.SnapshotId == UUID.Zero) | ||
609 | { | ||
610 | // In case of a new UserPick, the data may not be ready and we would send wrong data, skip it... | ||
611 | m_log.DebugFormat("[PROFILES]: PickInfoRequest: SnapshotID is {0}", UUID.Zero.ToString()); | ||
612 | return; | ||
613 | } | ||
614 | |||
615 | Vector3 globalPos; | ||
616 | Vector3.TryParse(pick.GlobalPos,out globalPos); | ||
617 | |||
618 | m_log.DebugFormat("[PROFILES]: PickInfoRequest: {0} : {1}", pick.Name.ToString(), pick.SnapshotId.ToString()); | ||
619 | |||
620 | remoteClient.SendPickInfoReply(pick.PickId,pick.CreatorId,pick.TopPick,pick.ParcelId,pick.Name, | ||
621 | pick.Desc,pick.SnapshotId,pick.User,pick.OriginalName,pick.SimName, | ||
622 | globalPos,pick.SortOrder,pick.Enabled); | ||
623 | } | ||
624 | |||
625 | /// <summary> | ||
626 | /// Updates the userpicks | ||
627 | /// </summary> | ||
628 | /// <param name='remoteClient'> | ||
629 | /// Remote client. | ||
630 | /// </param> | ||
631 | /// <param name='pickID'> | ||
632 | /// Pick I. | ||
633 | /// </param> | ||
634 | /// <param name='creatorID'> | ||
635 | /// the creator of the pick | ||
636 | /// </param> | ||
637 | /// <param name='topPick'> | ||
638 | /// Top pick. | ||
639 | /// </param> | ||
640 | /// <param name='name'> | ||
641 | /// Name. | ||
642 | /// </param> | ||
643 | /// <param name='desc'> | ||
644 | /// Desc. | ||
645 | /// </param> | ||
646 | /// <param name='snapshotID'> | ||
647 | /// Snapshot I. | ||
648 | /// </param> | ||
649 | /// <param name='sortOrder'> | ||
650 | /// Sort order. | ||
651 | /// </param> | ||
652 | /// <param name='enabled'> | ||
653 | /// Enabled. | ||
654 | /// </param> | ||
655 | public void PickInfoUpdate(IClientAPI remoteClient, UUID pickID, UUID creatorID, bool topPick, string name, string desc, UUID snapshotID, int sortOrder, bool enabled) | ||
656 | { | ||
657 | |||
658 | m_log.DebugFormat("[PROFILES]: Start PickInfoUpdate Name: {0} PickId: {1} SnapshotId: {2}", name, pickID.ToString(), snapshotID.ToString()); | ||
659 | UserProfilePick pick = new UserProfilePick(); | ||
660 | string serverURI = string.Empty; | ||
661 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | ||
662 | ScenePresence p = FindPresence(remoteClient.AgentId); | ||
663 | |||
664 | Vector3 avaPos = p.AbsolutePosition; | ||
665 | // Getting the global position for the Avatar | ||
666 | Vector3 posGlobal = new Vector3(remoteClient.Scene.RegionInfo.RegionLocX*Constants.RegionSize + avaPos.X, | ||
667 | remoteClient.Scene.RegionInfo.RegionLocY*Constants.RegionSize + avaPos.Y, | ||
668 | avaPos.Z); | ||
669 | |||
670 | string landOwnerName = string.Empty; | ||
671 | ILandObject land = p.Scene.LandChannel.GetLandObject(avaPos.X, avaPos.Y); | ||
672 | if(land.LandData.IsGroupOwned) | ||
673 | { | ||
674 | IGroupsModule groupMod = p.Scene.RequestModuleInterface<IGroupsModule>(); | ||
675 | UUID groupId = land.LandData.GroupID; | ||
676 | GroupRecord groupRecord = groupMod.GetGroupRecord(groupId); | ||
677 | landOwnerName = groupRecord.GroupName; | ||
678 | } | ||
679 | else | ||
680 | { | ||
681 | IUserAccountService accounts = p.Scene.RequestModuleInterface<IUserAccountService>(); | ||
682 | UserAccount user = accounts.GetUserAccount(p.Scene.RegionInfo.ScopeID, land.LandData.OwnerID); | ||
683 | landOwnerName = user.Name; | ||
684 | } | ||
685 | |||
686 | pick.PickId = pickID; | ||
687 | pick.CreatorId = creatorID; | ||
688 | pick.TopPick = topPick; | ||
689 | pick.Name = name; | ||
690 | pick.Desc = desc; | ||
691 | pick.ParcelId = p.currentParcelUUID; | ||
692 | pick.SnapshotId = snapshotID; | ||
693 | pick.User = landOwnerName; | ||
694 | pick.SimName = remoteClient.Scene.RegionInfo.RegionName; | ||
695 | pick.GlobalPos = posGlobal.ToString(); | ||
696 | pick.SortOrder = sortOrder; | ||
697 | pick.Enabled = enabled; | ||
698 | |||
699 | object Pick = (object)pick; | ||
700 | if(!JsonRpcRequest(ref Pick, "picks_update", serverURI, UUID.Random().ToString())) | ||
701 | { | ||
702 | remoteClient.SendAgentAlertMessage( | ||
703 | "Error updating pick", false); | ||
704 | } | ||
705 | |||
706 | m_log.DebugFormat("[PROFILES]: Finish PickInfoUpdate {0} {1}", pick.Name, pick.PickId.ToString()); | ||
707 | } | ||
708 | |||
709 | /// <summary> | ||
710 | /// Delete a Pick | ||
711 | /// </summary> | ||
712 | /// <param name='remoteClient'> | ||
713 | /// Remote client. | ||
714 | /// </param> | ||
715 | /// <param name='queryPickID'> | ||
716 | /// Query pick I. | ||
717 | /// </param> | ||
718 | public void PickDelete(IClientAPI remoteClient, UUID queryPickID) | ||
719 | { | ||
720 | string serverURI = string.Empty; | ||
721 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | ||
722 | |||
723 | OSDMap parameters= new OSDMap(); | ||
724 | parameters.Add("pickId", OSD.FromUUID(queryPickID)); | ||
725 | OSD Params = (OSD)parameters; | ||
726 | if(!JsonRpcRequest(ref Params, "picks_delete", serverURI, UUID.Random().ToString())) | ||
727 | { | ||
728 | remoteClient.SendAgentAlertMessage( | ||
729 | "Error picks delete", false); | ||
730 | } | ||
731 | } | ||
732 | #endregion Picks | ||
733 | |||
734 | #region Notes | ||
735 | /// <summary> | ||
736 | /// Handles the avatar notes request. | ||
737 | /// </summary> | ||
738 | /// <param name='sender'> | ||
739 | /// Sender. | ||
740 | /// </param> | ||
741 | /// <param name='method'> | ||
742 | /// Method. | ||
743 | /// </param> | ||
744 | /// <param name='args'> | ||
745 | /// Arguments. | ||
746 | /// </param> | ||
747 | public void NotesRequest(Object sender, string method, List<String> args) | ||
748 | { | ||
749 | UserProfileNotes note = new UserProfileNotes(); | ||
750 | |||
751 | if (!(sender is IClientAPI)) | ||
752 | return; | ||
753 | |||
754 | IClientAPI remoteClient = (IClientAPI)sender; | ||
755 | string serverURI = string.Empty; | ||
756 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | ||
757 | note.UserId = remoteClient.AgentId; | ||
758 | UUID.TryParse(args[0], out note.TargetId); | ||
759 | |||
760 | object Note = (object)note; | ||
761 | if(!JsonRpcRequest(ref Note, "avatarnotesrequest", serverURI, UUID.Random().ToString())) | ||
762 | { | ||
763 | remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes); | ||
764 | return; | ||
765 | } | ||
766 | note = (UserProfileNotes) Note; | ||
767 | |||
768 | remoteClient.SendAvatarNotesReply(note.TargetId, note.Notes); | ||
769 | } | ||
770 | |||
771 | /// <summary> | ||
772 | /// Avatars the notes update. | ||
773 | /// </summary> | ||
774 | /// <param name='remoteClient'> | ||
775 | /// Remote client. | ||
776 | /// </param> | ||
777 | /// <param name='queryTargetID'> | ||
778 | /// Query target I. | ||
779 | /// </param> | ||
780 | /// <param name='queryNotes'> | ||
781 | /// Query notes. | ||
782 | /// </param> | ||
783 | public void NotesUpdate(IClientAPI remoteClient, UUID queryTargetID, string queryNotes) | ||
784 | { | ||
785 | UserProfileNotes note = new UserProfileNotes(); | ||
786 | |||
787 | note.UserId = remoteClient.AgentId; | ||
788 | note.TargetId = queryTargetID; | ||
789 | note.Notes = queryNotes; | ||
790 | |||
791 | string serverURI = string.Empty; | ||
792 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | ||
793 | |||
794 | object Note = note; | ||
795 | if(!JsonRpcRequest(ref Note, "avatar_notes_update", serverURI, UUID.Random().ToString())) | ||
796 | { | ||
797 | return; | ||
798 | } | ||
799 | } | ||
800 | #endregion Notes | ||
801 | |||
802 | #region Avatar Properties | ||
803 | /// <summary> | ||
804 | /// Update the avatars interests . | ||
805 | /// </summary> | ||
806 | /// <param name='remoteClient'> | ||
807 | /// Remote client. | ||
808 | /// </param> | ||
809 | /// <param name='wantmask'> | ||
810 | /// Wantmask. | ||
811 | /// </param> | ||
812 | /// <param name='wanttext'> | ||
813 | /// Wanttext. | ||
814 | /// </param> | ||
815 | /// <param name='skillsmask'> | ||
816 | /// Skillsmask. | ||
817 | /// </param> | ||
818 | /// <param name='skillstext'> | ||
819 | /// Skillstext. | ||
820 | /// </param> | ||
821 | /// <param name='languages'> | ||
822 | /// Languages. | ||
823 | /// </param> | ||
824 | public void AvatarInterestsUpdate(IClientAPI remoteClient, uint wantmask, string wanttext, uint skillsmask, string skillstext, string languages) | ||
825 | { | ||
826 | UserProfileProperties prop = new UserProfileProperties(); | ||
827 | |||
828 | prop.UserId = remoteClient.AgentId; | ||
829 | prop.WantToMask = (int)wantmask; | ||
830 | prop.WantToText = wanttext; | ||
831 | prop.SkillsMask = (int)skillsmask; | ||
832 | prop.SkillsText = skillstext; | ||
833 | prop.Language = languages; | ||
834 | |||
835 | string serverURI = string.Empty; | ||
836 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | ||
837 | |||
838 | object Param = prop; | ||
839 | if(!JsonRpcRequest(ref Param, "avatar_interests_update", serverURI, UUID.Random().ToString())) | ||
840 | { | ||
841 | remoteClient.SendAgentAlertMessage( | ||
842 | "Error updating interests", false); | ||
843 | } | ||
844 | } | ||
845 | |||
846 | public void RequestAvatarProperties(IClientAPI remoteClient, UUID avatarID) | ||
847 | { | ||
848 | if ( String.IsNullOrEmpty(avatarID.ToString()) || String.IsNullOrEmpty(remoteClient.AgentId.ToString())) | ||
849 | { | ||
850 | // Looking for a reason that some viewers are sending null Id's | ||
851 | m_log.DebugFormat("[PROFILES]: This should not happen remoteClient.AgentId {0} - avatarID {1}", remoteClient.AgentId, avatarID); | ||
852 | return; | ||
853 | } | ||
854 | |||
855 | // Can't handle NPC yet... | ||
856 | ScenePresence p = FindPresence(avatarID); | ||
857 | |||
858 | if (null != p) | ||
859 | { | ||
860 | if (p.PresenceType == PresenceType.Npc) | ||
861 | return; | ||
862 | } | ||
863 | |||
864 | string serverURI = string.Empty; | ||
865 | bool foreign = GetUserProfileServerURI(avatarID, out serverURI); | ||
866 | |||
867 | UserAccount account = null; | ||
868 | Dictionary<string,object> userInfo; | ||
869 | |||
870 | if (!foreign) | ||
871 | { | ||
872 | account = Scene.UserAccountService.GetUserAccount(Scene.RegionInfo.ScopeID, avatarID); | ||
873 | } | ||
874 | else | ||
875 | { | ||
876 | userInfo = new Dictionary<string, object>(); | ||
877 | } | ||
878 | |||
879 | Byte[] charterMember = new Byte[1]; | ||
880 | string born = String.Empty; | ||
881 | uint flags = 0x00; | ||
882 | |||
883 | if (null != account) | ||
884 | { | ||
885 | if (account.UserTitle == "") | ||
886 | { | ||
887 | charterMember[0] = (Byte)((account.UserFlags & 0xf00) >> 8); | ||
888 | } | ||
889 | else | ||
890 | { | ||
891 | charterMember = Utils.StringToBytes(account.UserTitle); | ||
892 | } | ||
893 | |||
894 | born = Util.ToDateTime(account.Created).ToString( | ||
895 | "M/d/yyyy", CultureInfo.InvariantCulture); | ||
896 | flags = (uint)(account.UserFlags & 0xff); | ||
897 | } | ||
898 | else | ||
899 | { | ||
900 | if (GetUserAccountData(avatarID, out userInfo) == true) | ||
901 | { | ||
902 | if ((string)userInfo["user_title"] == "") | ||
903 | { | ||
904 | charterMember[0] = (Byte)(((Byte)userInfo["user_flags"] & 0xf00) >> 8); | ||
905 | } | ||
906 | else | ||
907 | { | ||
908 | charterMember = Utils.StringToBytes((string)userInfo["user_title"]); | ||
909 | } | ||
910 | |||
911 | int val_born = (int)userInfo["user_created"]; | ||
912 | born = Util.ToDateTime(val_born).ToString( | ||
913 | "M/d/yyyy", CultureInfo.InvariantCulture); | ||
914 | |||
915 | // picky, picky | ||
916 | int val_flags = (int)userInfo["user_flags"]; | ||
917 | flags = (uint)(val_flags & 0xff); | ||
918 | } | ||
919 | } | ||
920 | |||
921 | UserProfileProperties props = new UserProfileProperties(); | ||
922 | string result = string.Empty; | ||
923 | |||
924 | props.UserId = avatarID; | ||
925 | GetProfileData(ref props, out result); | ||
926 | |||
927 | remoteClient.SendAvatarProperties(props.UserId, props.AboutText, born, charterMember , props.FirstLifeText, flags, | ||
928 | props.FirstLifeImageId, props.ImageId, props.WebUrl, props.PartnerId); | ||
929 | |||
930 | |||
931 | remoteClient.SendAvatarInterestsReply(props.UserId, (uint)props.WantToMask, props.WantToText, (uint)props.SkillsMask, | ||
932 | props.SkillsText, props.Language); | ||
933 | } | ||
934 | |||
935 | /// <summary> | ||
936 | /// Updates the avatar properties. | ||
937 | /// </summary> | ||
938 | /// <param name='remoteClient'> | ||
939 | /// Remote client. | ||
940 | /// </param> | ||
941 | /// <param name='newProfile'> | ||
942 | /// New profile. | ||
943 | /// </param> | ||
944 | public void AvatarPropertiesUpdate(IClientAPI remoteClient, UserProfileData newProfile) | ||
945 | { | ||
946 | if (remoteClient.AgentId == newProfile.ID) | ||
947 | { | ||
948 | UserProfileProperties prop = new UserProfileProperties(); | ||
949 | |||
950 | prop.UserId = remoteClient.AgentId; | ||
951 | prop.WebUrl = newProfile.ProfileUrl; | ||
952 | prop.ImageId = newProfile.Image; | ||
953 | prop.AboutText = newProfile.AboutText; | ||
954 | prop.FirstLifeImageId = newProfile.FirstLifeImage; | ||
955 | prop.FirstLifeText = newProfile.FirstLifeAboutText; | ||
956 | |||
957 | string serverURI = string.Empty; | ||
958 | GetUserProfileServerURI(remoteClient.AgentId, out serverURI); | ||
959 | |||
960 | object Prop = prop; | ||
961 | |||
962 | if(!JsonRpcRequest(ref Prop, "avatar_properties_update", serverURI, UUID.Random().ToString())) | ||
963 | { | ||
964 | remoteClient.SendAgentAlertMessage( | ||
965 | "Error updating properties", false); | ||
966 | } | ||
967 | |||
968 | RequestAvatarProperties(remoteClient, newProfile.ID); | ||
969 | } | ||
970 | } | ||
971 | |||
972 | /// <summary> | ||
973 | /// Gets the profile data. | ||
974 | /// </summary> | ||
975 | /// <returns> | ||
976 | /// The profile data. | ||
977 | /// </returns> | ||
978 | /// <param name='userID'> | ||
979 | /// User I. | ||
980 | /// </param> | ||
981 | bool GetProfileData(ref UserProfileProperties properties, out string message) | ||
982 | { | ||
983 | // Can't handle NPC yet... | ||
984 | ScenePresence p = FindPresence(properties.UserId); | ||
985 | |||
986 | if (null != p) | ||
987 | { | ||
988 | if (p.PresenceType == PresenceType.Npc) | ||
989 | { | ||
990 | message = "Id points to NPC"; | ||
991 | return false; | ||
992 | } | ||
993 | } | ||
994 | |||
995 | string serverURI = string.Empty; | ||
996 | GetUserProfileServerURI(properties.UserId, out serverURI); | ||
997 | |||
998 | // This is checking a friend on the home grid | ||
999 | // Not HG friend | ||
1000 | if ( String.IsNullOrEmpty(serverURI)) | ||
1001 | { | ||
1002 | message = "No Presence - foreign friend"; | ||
1003 | return false; | ||
1004 | } | ||
1005 | |||
1006 | object Prop = (object)properties; | ||
1007 | JsonRpcRequest(ref Prop, "avatar_properties_request", serverURI, UUID.Random().ToString()); | ||
1008 | properties = (UserProfileProperties)Prop; | ||
1009 | |||
1010 | message = "Success"; | ||
1011 | return true; | ||
1012 | } | ||
1013 | #endregion Avatar Properties | ||
1014 | |||
1015 | #region Utils | ||
1016 | bool GetImageAssets(UUID avatarId) | ||
1017 | { | ||
1018 | string profileServerURI = string.Empty; | ||
1019 | string assetServerURI = string.Empty; | ||
1020 | |||
1021 | bool foreign = GetUserProfileServerURI(avatarId, out profileServerURI); | ||
1022 | |||
1023 | if(!foreign) | ||
1024 | return true; | ||
1025 | |||
1026 | assetServerURI = UserManagementModule.GetUserServerURL(avatarId, "AssetServerURI"); | ||
1027 | |||
1028 | OSDMap parameters= new OSDMap(); | ||
1029 | parameters.Add("avatarId", OSD.FromUUID(avatarId)); | ||
1030 | OSD Params = (OSD)parameters; | ||
1031 | if(!JsonRpcRequest(ref Params, "image_assets_request", profileServerURI, UUID.Random().ToString())) | ||
1032 | { | ||
1033 | return false; | ||
1034 | } | ||
1035 | |||
1036 | parameters = (OSDMap)Params; | ||
1037 | |||
1038 | OSDArray list = (OSDArray)parameters["result"]; | ||
1039 | |||
1040 | foreach(OSD asset in list) | ||
1041 | { | ||
1042 | OSDString assetId = (OSDString)asset; | ||
1043 | |||
1044 | Scene.AssetService.Get(string.Format("{0}/{1}",assetServerURI, assetId.AsString())); | ||
1045 | } | ||
1046 | return true; | ||
1047 | } | ||
1048 | |||
1049 | /// <summary> | ||
1050 | /// Gets the user account data. | ||
1051 | /// </summary> | ||
1052 | /// <returns> | ||
1053 | /// The user profile data. | ||
1054 | /// </returns> | ||
1055 | /// <param name='userID'> | ||
1056 | /// If set to <c>true</c> user I. | ||
1057 | /// </param> | ||
1058 | /// <param name='userInfo'> | ||
1059 | /// If set to <c>true</c> user info. | ||
1060 | /// </param> | ||
1061 | bool GetUserAccountData(UUID userID, out Dictionary<string, object> userInfo) | ||
1062 | { | ||
1063 | Dictionary<string,object> info = new Dictionary<string, object>(); | ||
1064 | |||
1065 | if (UserManagementModule.IsLocalGridUser(userID)) | ||
1066 | { | ||
1067 | // Is local | ||
1068 | IUserAccountService uas = Scene.UserAccountService; | ||
1069 | UserAccount account = uas.GetUserAccount(Scene.RegionInfo.ScopeID, userID); | ||
1070 | |||
1071 | info["user_flags"] = account.UserFlags; | ||
1072 | info["user_created"] = account.Created; | ||
1073 | |||
1074 | if (!String.IsNullOrEmpty(account.UserTitle)) | ||
1075 | info["user_title"] = account.UserTitle; | ||
1076 | else | ||
1077 | info["user_title"] = ""; | ||
1078 | |||
1079 | userInfo = info; | ||
1080 | |||
1081 | return false; | ||
1082 | } | ||
1083 | else | ||
1084 | { | ||
1085 | // Is Foreign | ||
1086 | string home_url = UserManagementModule.GetUserServerURL(userID, "HomeURI"); | ||
1087 | |||
1088 | if (String.IsNullOrEmpty(home_url)) | ||
1089 | { | ||
1090 | info["user_flags"] = 0; | ||
1091 | info["user_created"] = 0; | ||
1092 | info["user_title"] = "Unavailable"; | ||
1093 | |||
1094 | userInfo = info; | ||
1095 | return true; | ||
1096 | } | ||
1097 | |||
1098 | UserAgentServiceConnector uConn = new UserAgentServiceConnector(home_url); | ||
1099 | |||
1100 | Dictionary<string, object> account = uConn.GetUserInfo(userID); | ||
1101 | |||
1102 | if (account.Count > 0) | ||
1103 | { | ||
1104 | if (account.ContainsKey("user_flags")) | ||
1105 | info["user_flags"] = account["user_flags"]; | ||
1106 | else | ||
1107 | info["user_flags"] = ""; | ||
1108 | |||
1109 | if (account.ContainsKey("user_created")) | ||
1110 | info["user_created"] = account["user_created"]; | ||
1111 | else | ||
1112 | info["user_created"] = ""; | ||
1113 | |||
1114 | info["user_title"] = "HG Visitor"; | ||
1115 | } | ||
1116 | else | ||
1117 | { | ||
1118 | info["user_flags"] = 0; | ||
1119 | info["user_created"] = 0; | ||
1120 | info["user_title"] = "HG Visitor"; | ||
1121 | } | ||
1122 | userInfo = info; | ||
1123 | return true; | ||
1124 | } | ||
1125 | } | ||
1126 | |||
1127 | /// <summary> | ||
1128 | /// Gets the user profile server UR. | ||
1129 | /// </summary> | ||
1130 | /// <returns> | ||
1131 | /// The user profile server UR. | ||
1132 | /// </returns> | ||
1133 | /// <param name='userID'> | ||
1134 | /// If set to <c>true</c> user I. | ||
1135 | /// </param> | ||
1136 | /// <param name='serverURI'> | ||
1137 | /// If set to <c>true</c> server UR. | ||
1138 | /// </param> | ||
1139 | bool GetUserProfileServerURI(UUID userID, out string serverURI) | ||
1140 | { | ||
1141 | bool local; | ||
1142 | local = UserManagementModule.IsLocalGridUser(userID); | ||
1143 | |||
1144 | if (!local) | ||
1145 | { | ||
1146 | serverURI = UserManagementModule.GetUserServerURL(userID, "ProfileServerURI"); | ||
1147 | // Is Foreign | ||
1148 | return true; | ||
1149 | } | ||
1150 | else | ||
1151 | { | ||
1152 | serverURI = ProfileServerUri; | ||
1153 | // Is local | ||
1154 | return false; | ||
1155 | } | ||
1156 | } | ||
1157 | |||
1158 | /// <summary> | ||
1159 | /// Finds the presence. | ||
1160 | /// </summary> | ||
1161 | /// <returns> | ||
1162 | /// The presence. | ||
1163 | /// </returns> | ||
1164 | /// <param name='clientID'> | ||
1165 | /// Client I. | ||
1166 | /// </param> | ||
1167 | ScenePresence FindPresence(UUID clientID) | ||
1168 | { | ||
1169 | ScenePresence p; | ||
1170 | |||
1171 | p = Scene.GetScenePresence(clientID); | ||
1172 | if (p != null && !p.IsChildAgent) | ||
1173 | return p; | ||
1174 | |||
1175 | return null; | ||
1176 | } | ||
1177 | #endregion Util | ||
1178 | |||
1179 | #region Web Util | ||
1180 | /// <summary> | ||
1181 | /// Sends json-rpc request with a serializable type. | ||
1182 | /// </summary> | ||
1183 | /// <returns> | ||
1184 | /// OSD Map. | ||
1185 | /// </returns> | ||
1186 | /// <param name='parameters'> | ||
1187 | /// Serializable type . | ||
1188 | /// </param> | ||
1189 | /// <param name='method'> | ||
1190 | /// Json-rpc method to call. | ||
1191 | /// </param> | ||
1192 | /// <param name='uri'> | ||
1193 | /// URI of json-rpc service. | ||
1194 | /// </param> | ||
1195 | /// <param name='jsonId'> | ||
1196 | /// Id for our call. | ||
1197 | /// </param> | ||
1198 | bool JsonRpcRequest(ref object parameters, string method, string uri, string jsonId) | ||
1199 | { | ||
1200 | if (jsonId == null) | ||
1201 | throw new ArgumentNullException ("jsonId"); | ||
1202 | if (uri == null) | ||
1203 | throw new ArgumentNullException ("uri"); | ||
1204 | if (method == null) | ||
1205 | throw new ArgumentNullException ("method"); | ||
1206 | if (parameters == null) | ||
1207 | throw new ArgumentNullException ("parameters"); | ||
1208 | |||
1209 | // Prep our payload | ||
1210 | OSDMap json = new OSDMap(); | ||
1211 | |||
1212 | json.Add("jsonrpc", OSD.FromString("2.0")); | ||
1213 | json.Add("id", OSD.FromString(jsonId)); | ||
1214 | json.Add("method", OSD.FromString(method)); | ||
1215 | |||
1216 | json.Add("params", OSD.SerializeMembers(parameters)); | ||
1217 | |||
1218 | string jsonRequestData = OSDParser.SerializeJsonString(json); | ||
1219 | byte[] content = Encoding.UTF8.GetBytes(jsonRequestData); | ||
1220 | |||
1221 | HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uri); | ||
1222 | |||
1223 | webRequest.ContentType = "application/json-rpc"; | ||
1224 | webRequest.Method = "POST"; | ||
1225 | |||
1226 | Stream dataStream = webRequest.GetRequestStream(); | ||
1227 | dataStream.Write(content, 0, content.Length); | ||
1228 | dataStream.Close(); | ||
1229 | |||
1230 | WebResponse webResponse = null; | ||
1231 | try | ||
1232 | { | ||
1233 | webResponse = webRequest.GetResponse(); | ||
1234 | } | ||
1235 | catch (WebException e) | ||
1236 | { | ||
1237 | Console.WriteLine("Web Error" + e.Message); | ||
1238 | Console.WriteLine ("Please check input"); | ||
1239 | return false; | ||
1240 | } | ||
1241 | |||
1242 | Stream rstream = webResponse.GetResponseStream(); | ||
1243 | |||
1244 | OSDMap mret = new OSDMap(); | ||
1245 | try | ||
1246 | { | ||
1247 | mret = (OSDMap)OSDParser.DeserializeJson(rstream); | ||
1248 | } | ||
1249 | catch (Exception e) | ||
1250 | { | ||
1251 | m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message); | ||
1252 | return false; | ||
1253 | } | ||
1254 | |||
1255 | |||
1256 | if (mret.ContainsKey("error")) | ||
1257 | return false; | ||
1258 | |||
1259 | // get params... | ||
1260 | OSD.DeserializeMembers(ref parameters, (OSDMap) mret["result"]); | ||
1261 | return true; | ||
1262 | } | ||
1263 | |||
1264 | /// <summary> | ||
1265 | /// Sends json-rpc request with OSD parameter. | ||
1266 | /// </summary> | ||
1267 | /// <returns> | ||
1268 | /// The rpc request. | ||
1269 | /// </returns> | ||
1270 | /// <param name='data'> | ||
1271 | /// data - incoming as parameters, outgong as result/error | ||
1272 | /// </param> | ||
1273 | /// <param name='method'> | ||
1274 | /// Json-rpc method to call. | ||
1275 | /// </param> | ||
1276 | /// <param name='uri'> | ||
1277 | /// URI of json-rpc service. | ||
1278 | /// </param> | ||
1279 | /// <param name='jsonId'> | ||
1280 | /// If set to <c>true</c> json identifier. | ||
1281 | /// </param> | ||
1282 | bool JsonRpcRequest(ref OSD data, string method, string uri, string jsonId) | ||
1283 | { | ||
1284 | OSDMap map = new OSDMap(); | ||
1285 | |||
1286 | map["jsonrpc"] = "2.0"; | ||
1287 | if(string.IsNullOrEmpty(jsonId)) | ||
1288 | map["id"] = UUID.Random().ToString(); | ||
1289 | else | ||
1290 | map["id"] = jsonId; | ||
1291 | |||
1292 | map["method"] = method; | ||
1293 | map["params"] = data; | ||
1294 | |||
1295 | string jsonRequestData = OSDParser.SerializeJsonString(map); | ||
1296 | byte[] content = Encoding.UTF8.GetBytes(jsonRequestData); | ||
1297 | |||
1298 | HttpWebRequest webRequest = (HttpWebRequest)WebRequest.Create(uri); | ||
1299 | webRequest.ContentType = "application/json-rpc"; | ||
1300 | webRequest.Method = "POST"; | ||
1301 | |||
1302 | Stream dataStream = webRequest.GetRequestStream(); | ||
1303 | dataStream.Write(content, 0, content.Length); | ||
1304 | dataStream.Close(); | ||
1305 | |||
1306 | WebResponse webResponse = null; | ||
1307 | try | ||
1308 | { | ||
1309 | webResponse = webRequest.GetResponse(); | ||
1310 | } | ||
1311 | catch (WebException e) | ||
1312 | { | ||
1313 | Console.WriteLine("Web Error" + e.Message); | ||
1314 | Console.WriteLine ("Please check input"); | ||
1315 | return false; | ||
1316 | } | ||
1317 | |||
1318 | Stream rstream = webResponse.GetResponseStream(); | ||
1319 | |||
1320 | OSDMap response = new OSDMap(); | ||
1321 | try | ||
1322 | { | ||
1323 | response = (OSDMap)OSDParser.DeserializeJson(rstream); | ||
1324 | } | ||
1325 | catch (Exception e) | ||
1326 | { | ||
1327 | m_log.DebugFormat("[PROFILES]: JsonRpcRequest Error {0} - remote user with legacy profiles?", e.Message); | ||
1328 | return false; | ||
1329 | } | ||
1330 | |||
1331 | if(response.ContainsKey("error")) | ||
1332 | { | ||
1333 | data = response["error"]; | ||
1334 | return false; | ||
1335 | } | ||
1336 | |||
1337 | data = response; | ||
1338 | |||
1339 | return true; | ||
1340 | } | ||
1341 | #endregion Web Util | ||
1342 | } | ||
1343 | } \ No newline at end of file | ||