aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs2
-rw-r--r--OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs6
-rw-r--r--OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs46
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs11
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs1087
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs60
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs117
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs70
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs81
-rw-r--r--OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs381
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs18
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs20
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs59
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs958
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs58
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs64
-rw-r--r--OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs43
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs1600
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs273
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs200
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs207
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs57
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs654
-rw-r--r--OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs52
-rw-r--r--OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs6
-rw-r--r--OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs311
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs19
-rw-r--r--OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs42
-rw-r--r--OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml33
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs5
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs119
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs119
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs)23
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs8
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs128
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs28
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs20
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs164
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs)47
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs6
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs168
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs)18
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs303
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs811
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs16
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs19
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs843
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs11
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs307
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs3
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs26
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs200
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs100
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs164
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs104
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs (renamed from OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs)180
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs300
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs189
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs148
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs87
-rw-r--r--OpenSim/Region/CoreModules/World/Access/AccessModule.cs1
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs23
-rw-r--r--OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs33
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs15
-rw-r--r--OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs52
-rw-r--r--OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs25
70 files changed, 6383 insertions, 4973 deletions
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
index c9ee54f..012d581 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
@@ -30,7 +30,7 @@ using System.Reflection;
30using log4net; 30using log4net;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications.Cache; 33
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
36 36
diff --git a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
index f698ea1..fbd0ed1 100644
--- a/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
+++ b/OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
@@ -31,7 +31,7 @@ using System.Reflection;
31using log4net; 31using log4net;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34
35using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
36 36
37namespace OpenSim.Region.CoreModules.Agent.AssetTransaction 37namespace OpenSim.Region.CoreModules.Agent.AssetTransaction
diff --git a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
index 71ff28c..c7bf6c8 100644
--- a/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
+++ b/OpenSim/Region/CoreModules/Agent/TextureDownload/TextureDownloadModule.cs
@@ -33,7 +33,7 @@ using log4net;
33using Nini.Config; 33using Nini.Config;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications.Cache; 36
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>; 39using BlockingQueue = OpenSim.Framework.BlockingQueue<OpenSim.Region.Framework.Interfaces.ITextureSender>;
@@ -214,8 +214,8 @@ namespace OpenSim.Region.CoreModules.Agent.TextureDownload
214 { 214 {
215 Scene scene = (Scene)client.Scene; 215 Scene scene = (Scene)client.Scene;
216 216
217 CachedUserInfo profile = scene.CommsManager.UserProfileCacheService.GetUserDetails(client.AgentId); 217 ScenePresence sp = scene.GetScenePresence(client.AgentId);
218 if (profile == null) // Deny unknown user 218 if (sp == null) // Deny unknown user
219 return; 219 return;
220 220
221 IInventoryService invService = scene.InventoryService; 221 IInventoryService invService = scene.InventoryService;
diff --git a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
index 35c59aa..a0ff151 100644
--- a/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
@@ -31,7 +31,7 @@ using log4net;
31using Nini.Config; 31using Nini.Config;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Services.Interfaces; 37using OpenSim.Services.Interfaces;
@@ -46,21 +46,16 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
46 46
47 public bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance) 47 public bool TryGetAvatarAppearance(UUID avatarId, out AvatarAppearance appearance)
48 { 48 {
49 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(avatarId); 49 AvatarData avatar = m_scene.AvatarService.GetAvatar(avatarId);
50 //if ((profile != null) && (profile.RootFolder != null)) 50 //if ((profile != null) && (profile.RootFolder != null))
51 if (profile != null) 51 if (avatar != null)
52 { 52 {
53 appearance = m_scene.CommsManager.AvatarService.GetUserAppearance(avatarId); 53 appearance = avatar.ToAvatarAppearance(avatarId);
54 if (appearance != null) 54 return true;
55 {
56 //SetAppearanceAssets(profile, ref appearance);
57 //m_log.DebugFormat("[APPEARANCE]: Found : {0}", appearance.ToString());
58 return true;
59 }
60 } 55 }
61 56
62 appearance = CreateDefault(avatarId);
63 m_log.ErrorFormat("[APPEARANCE]: Appearance not found for {0}, creating default", avatarId); 57 m_log.ErrorFormat("[APPEARANCE]: Appearance not found for {0}, creating default", avatarId);
58 appearance = CreateDefault(avatarId);
64 return false; 59 return false;
65 } 60 }
66 61
@@ -158,21 +153,23 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
158 /// <param name="e"></param> 153 /// <param name="e"></param>
159 public void AvatarIsWearing(Object sender, AvatarWearingArgs e) 154 public void AvatarIsWearing(Object sender, AvatarWearingArgs e)
160 { 155 {
156 m_log.DebugFormat("[APPEARANCE]: AvatarIsWearing");
157
161 IClientAPI clientView = (IClientAPI)sender; 158 IClientAPI clientView = (IClientAPI)sender;
162 ScenePresence avatar = m_scene.GetScenePresence(clientView.AgentId); 159 ScenePresence sp = m_scene.GetScenePresence(clientView.AgentId);
163 160
164 if (avatar == null) 161 if (sp == null)
165 { 162 {
166 m_log.Error("[APPEARANCE]: Avatar is child agent, ignoring AvatarIsWearing event"); 163 m_log.Error("[APPEARANCE]: Avatar is child agent, ignoring AvatarIsWearing event");
167 return; 164 return;
168 } 165 }
169 166
170 AvatarAppearance avatAppearance = null; 167 AvatarAppearance avatAppearance = sp.Appearance;
171 if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance)) 168 //if (!TryGetAvatarAppearance(clientView.AgentId, out avatAppearance))
172 { 169 //{
173 m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence"); 170 // m_log.Warn("[APPEARANCE]: We didn't seem to find the appearance, falling back to ScenePresence");
174 avatAppearance = avatar.Appearance; 171 // avatAppearance = sp.Appearance;
175 } 172 //}
176 173
177 //m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name); 174 //m_log.DebugFormat("[APPEARANCE]: Received wearables for {0}", clientView.Name);
178 175
@@ -184,10 +181,11 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
184 } 181 }
185 } 182 }
186 183
187 SetAppearanceAssets(avatar.UUID, ref avatAppearance); 184 SetAppearanceAssets(sp.UUID, ref avatAppearance);
185 AvatarData adata = new AvatarData(avatAppearance);
186 m_scene.AvatarService.SetAvatar(clientView.AgentId, adata);
188 187
189 m_scene.CommsManager.AvatarService.UpdateUserAppearance(clientView.AgentId, avatAppearance); 188 sp.Appearance = avatAppearance;
190 avatar.Appearance = avatAppearance;
191 } 189 }
192 190
193 public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams) 191 public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
@@ -198,7 +196,9 @@ namespace OpenSim.Region.CoreModules.Avatar.AvatarFactory
198 196
199 public void UpdateDatabase(UUID user, AvatarAppearance appearance) 197 public void UpdateDatabase(UUID user, AvatarAppearance appearance)
200 { 198 {
201 m_scene.CommsManager.AvatarService.UpdateUserAppearance(user, appearance); 199 //m_log.DebugFormat("[APPEARANCE]: UpdateDatabase");
200 AvatarData adata = new AvatarData(appearance);
201 m_scene.AvatarService.SetAvatar(user, adata);
202 } 202 }
203 203
204 private static byte[] GetDefaultVisualParams() 204 private static byte[] GetDefaultVisualParams()
diff --git a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
index 61b6d65..db94d2a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Combat/CombatModule.cs
@@ -130,7 +130,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Combat.CombatModule
130 } 130 }
131 else 131 else
132 { 132 {
133 string killer = DeadAvatar.Scene.CommsManager.UUIDNameRequestString(part.OwnerID); 133 string killer = DeadAvatar.Scene.GetUserName(part.OwnerID);
134 DeadAvatar.ControllingClient.SendAgentAlertMessage("You impaled yourself on " + part.Name + " owned by " + killer +"!", true); 134 DeadAvatar.ControllingClient.SendAgentAlertMessage("You impaled yourself on " + part.Name + " owned by " + killer +"!", true);
135 } 135 }
136 //DeadAvatar.Scene. part.ObjectOwner 136 //DeadAvatar.Scene. part.ObjectOwner
diff --git a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
index 72ec869..fac052a 100644
--- a/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Dialog/DialogModule.cs
@@ -31,9 +31,10 @@ using log4net;
31using Nini.Config; 31using Nini.Config;
32using OpenMetaverse; 32using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34
35using OpenSim.Region.Framework.Interfaces; 35using OpenSim.Region.Framework.Interfaces;
36using OpenSim.Region.Framework.Scenes; 36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Services.Interfaces;
37 38
38namespace OpenSim.Region.CoreModules.Avatar.Dialog 39namespace OpenSim.Region.CoreModules.Avatar.Dialog
39{ 40{
@@ -116,12 +117,12 @@ namespace OpenSim.Region.CoreModules.Avatar.Dialog
116 UUID avatarID, string objectName, UUID objectID, UUID ownerID, 117 UUID avatarID, string objectName, UUID objectID, UUID ownerID,
117 string message, UUID textureID, int ch, string[] buttonlabels) 118 string message, UUID textureID, int ch, string[] buttonlabels)
118 { 119 {
119 CachedUserInfo info = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(ownerID); 120 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerID);
120 string ownerFirstName, ownerLastName; 121 string ownerFirstName, ownerLastName;
121 if (info != null) 122 if (account != null)
122 { 123 {
123 ownerFirstName = info.UserProfile.FirstName; 124 ownerFirstName = account.FirstName;
124 ownerLastName = info.UserProfile.SurName; 125 ownerLastName = account.LastName;
125 } 126 }
126 else 127 else
127 { 128 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
index 086d4fe..f383bad 100644
--- a/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
@@ -36,1119 +36,56 @@ using Nwc.XmlRpc;
36using OpenMetaverse; 36using OpenMetaverse;
37using OpenSim.Framework; 37using OpenSim.Framework;
38using OpenSim.Framework.Communications; 38using OpenSim.Framework.Communications;
39using OpenSim.Framework.Communications.Cache; 39
40using OpenSim.Region.Framework.Interfaces; 40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes; 41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Services.Interfaces; 42using OpenSim.Services.Interfaces;
43using GridRegion = OpenSim.Services.Interfaces.GridRegion;
44 43
45namespace OpenSim.Region.CoreModules.Avatar.Friends 44namespace OpenSim.Region.CoreModules.Avatar.Friends
46{ 45{
47 /* 46 public class FriendsModule : ISharedRegionModule, IFriendsModule
48 This module handles adding/removing friends, and the the presence
49 notification process for login/logoff of friends.
50
51 The presence notification works as follows:
52 - After the user initially connects to a region (so we now have a UDP
53 connection to work with), this module fetches the friends of user
54 (those are cached), their on-/offline status, and info about the
55 region they are in from the MessageServer.
56 - (*) It then informs the user about the on-/offline status of her friends.
57 - It then informs all online friends currently on this region-server about
58 user's new online status (this will save some network traffic, as local
59 messages don't have to be transferred inter-region, and it will be all
60 that has to be done in Standalone Mode).
61 - For the rest of the online friends (those not on this region-server),
62 this module uses the provided region-information to map users to
63 regions, and sends one notification to every region containing the
64 friends to inform on that server.
65 - The region-server will handle that in the following way:
66 - If it finds the friend, it informs her about the user being online.
67 - If it doesn't find the friend (maybe she TPed away in the meantime),
68 it stores that information.
69 - After it processed all friends, it returns the list of friends it
70 couldn't find.
71 - If this list isn't empty, the FriendsModule re-requests information
72 about those online friends that have been missed and starts at (*)
73 again until all friends have been found, or until it tried 3 times
74 (to prevent endless loops due to some uncaught error).
75
76 NOTE: Online/Offline notifications don't need to be sent on region change.
77
78 We implement two XMLRpc handlers here, handling all the inter-region things
79 we have to handle:
80 - On-/Offline-Notifications (bulk)
81 - Terminate Friendship messages (single)
82 */
83
84 public class FriendsModule : IRegionModule, IFriendsModule
85 { 47 {
86 private class Transaction 48 public void Initialise(IConfigSource config)
87 { 49 {
88 public UUID agentID;
89 public string agentName;
90 public uint count;
91
92 public Transaction(UUID agentID, string agentName)
93 {
94 this.agentID = agentID;
95 this.agentName = agentName;
96 this.count = 1;
97 }
98 }
99
100 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
101
102 private Cache m_friendLists = new Cache(CacheFlags.AllowUpdate);
103
104 private Dictionary<UUID, ulong> m_rootAgents = new Dictionary<UUID, ulong>();
105
106 private Dictionary<UUID, UUID> m_pendingCallingcardRequests = new Dictionary<UUID,UUID>();
107
108 private Scene m_initialScene; // saves a lookup if we don't have a specific scene
109 private Dictionary<ulong, Scene> m_scenes = new Dictionary<ulong,Scene>();
110 private IMessageTransferModule m_TransferModule = null;
111
112 private IGridService m_gridServices = null;
113
114 #region IRegionModule Members
115
116 public void Initialise(Scene scene, IConfigSource config)
117 {
118 lock (m_scenes)
119 {
120 if (m_scenes.Count == 0)
121 {
122 MainServer.Instance.AddXmlRPCHandler("presence_update_bulk", processPresenceUpdateBulk);
123 MainServer.Instance.AddXmlRPCHandler("terminate_friend", processTerminateFriend);
124 m_friendLists.DefaultTTL = new TimeSpan(1, 0, 0); // store entries for one hour max
125 m_initialScene = scene;
126 }
127
128 if (!m_scenes.ContainsKey(scene.RegionInfo.RegionHandle))
129 m_scenes[scene.RegionInfo.RegionHandle] = scene;
130 }
131
132 scene.RegisterModuleInterface<IFriendsModule>(this);
133
134 scene.EventManager.OnNewClient += OnNewClient;
135 scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
136 scene.EventManager.OnAvatarEnteringNewParcel += AvatarEnteringParcel;
137 scene.EventManager.OnMakeChildAgent += MakeChildAgent;
138 scene.EventManager.OnClientClosed += ClientClosed;
139 } 50 }
140 51
141 public void PostInitialise() 52 public void PostInitialise()
142 { 53 {
143 if (m_scenes.Count > 0)
144 {
145 m_TransferModule = m_initialScene.RequestModuleInterface<IMessageTransferModule>();
146 m_gridServices = m_initialScene.GridService;
147 }
148 if (m_TransferModule == null)
149 m_log.Error("[FRIENDS]: Unable to find a message transfer module, friendship offers will not work");
150 } 54 }
151 55
152 public void Close() 56 public void Close()
153 { 57 {
154 } 58 }
155 59
156 public string Name 60 public void AddRegion(Scene scene)
157 {
158 get { return "FriendsModule"; }
159 }
160
161 public bool IsSharedModule
162 {
163 get { return true; }
164 }
165
166 #endregion
167
168 #region IInterregionFriendsComms
169
170 public List<UUID> InformFriendsInOtherRegion(UUID agentId, ulong destRegionHandle, List<UUID> friends, bool online)
171 {
172 List<UUID> tpdAway = new List<UUID>();
173
174 // destRegionHandle is a region on another server
175 uint x = 0, y = 0;
176 Utils.LongToUInts(destRegionHandle, out x, out y);
177 GridRegion info = m_gridServices.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID, (int)x, (int)y);
178 if (info != null)
179 {
180 string httpServer = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/presence_update_bulk";
181
182 Hashtable reqParams = new Hashtable();
183 reqParams["agentID"] = agentId.ToString();
184 reqParams["agentOnline"] = online;
185 int count = 0;
186 foreach (UUID uuid in friends)
187 {
188 reqParams["friendID_" + count++] = uuid.ToString();
189 }
190 reqParams["friendCount"] = count;
191
192 IList parameters = new ArrayList();
193 parameters.Add(reqParams);
194 try
195 {
196 XmlRpcRequest request = new XmlRpcRequest("presence_update_bulk", parameters);
197 XmlRpcResponse response = request.Send(httpServer, 5000);
198 Hashtable respData = (Hashtable)response.Value;
199
200 count = (int)respData["friendCount"];
201 for (int i = 0; i < count; ++i)
202 {
203 UUID uuid;
204 if (UUID.TryParse((string)respData["friendID_" + i], out uuid)) tpdAway.Add(uuid);
205 }
206 }
207 catch (WebException e)
208 {
209 // Ignore connect failures, simulators come and go
210 //
211 if (!e.Message.Contains("ConnectFailure"))
212 {
213 m_log.Error("[OGS1 GRID SERVICES]: InformFriendsInOtherRegion XMLRPC failure: ", e);
214 }
215 }
216 catch (Exception e)
217 {
218 m_log.Error("[OGS1 GRID SERVICES]: InformFriendsInOtherRegion XMLRPC failure: ", e);
219 }
220 }
221 else m_log.WarnFormat("[OGS1 GRID SERVICES]: Couldn't find region {0}???", destRegionHandle);
222
223 return tpdAway;
224 }
225
226 public bool TriggerTerminateFriend(ulong destRegionHandle, UUID agentID, UUID exFriendID)
227 {
228 // destRegionHandle is a region on another server
229 uint x = 0, y = 0;
230 Utils.LongToUInts(destRegionHandle, out x, out y);
231 GridRegion info = m_gridServices.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID, (int)x, (int)y);
232 if (info == null)
233 {
234 m_log.WarnFormat("[OGS1 GRID SERVICES]: Couldn't find region {0}", destRegionHandle);
235 return false; // region not found???
236 }
237
238 string httpServer = "http://" + info.ExternalEndPoint.Address + ":" + info.HttpPort + "/presence_update_bulk";
239
240 Hashtable reqParams = new Hashtable();
241 reqParams["agentID"] = agentID.ToString();
242 reqParams["friendID"] = exFriendID.ToString();
243
244 IList parameters = new ArrayList();
245 parameters.Add(reqParams);
246 try
247 {
248 XmlRpcRequest request = new XmlRpcRequest("terminate_friend", parameters);
249 XmlRpcResponse response = request.Send(httpServer, 5000);
250 Hashtable respData = (Hashtable)response.Value;
251
252 return (bool)respData["success"];
253 }
254 catch (Exception e)
255 {
256 m_log.Error("[OGS1 GRID SERVICES]: InformFriendsInOtherRegion XMLRPC failure: ", e);
257 return false;
258 }
259 }
260
261 #endregion
262
263 #region Incoming XMLRPC messages
264 /// <summary>
265 /// Receive presence information changes about clients in other regions.
266 /// </summary>
267 /// <param name="req"></param>
268 /// <returns></returns>
269 public XmlRpcResponse processPresenceUpdateBulk(XmlRpcRequest req, IPEndPoint remoteClient)
270 {
271 Hashtable requestData = (Hashtable)req.Params[0];
272
273 List<UUID> friendsNotHere = new List<UUID>();
274
275 // this is called with the expectation that all the friends in the request are on this region-server.
276 // But as some time passed since we checked (on the other region-server, via the MessagingServer),
277 // some of the friends might have teleported away.
278 // Actually, even now, between this line and the sending below, some people could TP away. So,
279 // we'll have to lock the m_rootAgents list for the duration to prevent/delay that.
280 lock (m_rootAgents)
281 {
282 List<ScenePresence> friendsHere = new List<ScenePresence>();
283
284 try
285 {
286 UUID agentID = new UUID((string)requestData["agentID"]);
287 bool agentOnline = (bool)requestData["agentOnline"];
288 int count = (int)requestData["friendCount"];
289 for (int i = 0; i < count; ++i)
290 {
291 UUID uuid;
292 if (UUID.TryParse((string)requestData["friendID_" + i], out uuid))
293 {
294 if (m_rootAgents.ContainsKey(uuid)) friendsHere.Add(GetRootPresenceFromAgentID(uuid));
295 else friendsNotHere.Add(uuid);
296 }
297 }
298
299 // now send, as long as they are still here...
300 UUID[] agentUUID = new UUID[] { agentID };
301 if (agentOnline)
302 {
303 foreach (ScenePresence agent in friendsHere)
304 {
305 agent.ControllingClient.SendAgentOnline(agentUUID);
306 }
307 }
308 else
309 {
310 foreach (ScenePresence agent in friendsHere)
311 {
312 agent.ControllingClient.SendAgentOffline(agentUUID);
313 }
314 }
315 }
316 catch(Exception e)
317 {
318 m_log.Warn("[FRIENDS]: Got exception while parsing presence_update_bulk request:", e);
319 }
320 }
321
322 // no need to lock anymore; if TPs happen now, worst case is that we have an additional agent in this region,
323 // which should be caught on the next iteration...
324 Hashtable result = new Hashtable();
325 int idx = 0;
326 foreach (UUID uuid in friendsNotHere)
327 {
328 result["friendID_" + idx++] = uuid.ToString();
329 }
330 result["friendCount"] = idx;
331
332 XmlRpcResponse response = new XmlRpcResponse();
333 response.Value = result;
334
335 return response;
336 }
337
338 public XmlRpcResponse processTerminateFriend(XmlRpcRequest req, IPEndPoint remoteClient)
339 { 61 {
340 Hashtable requestData = (Hashtable)req.Params[0];
341
342 bool success = false;
343
344 UUID agentID;
345 UUID friendID;
346 if (requestData.ContainsKey("agentID") && UUID.TryParse((string)requestData["agentID"], out agentID) &&
347 requestData.ContainsKey("friendID") && UUID.TryParse((string)requestData["friendID"], out friendID))
348 {
349 // try to find it and if it is there, prevent it to vanish before we sent the message
350 lock (m_rootAgents)
351 {
352 if (m_rootAgents.ContainsKey(agentID))
353 {
354 m_log.DebugFormat("[FRIEND]: Sending terminate friend {0} to agent {1}", friendID, agentID);
355 GetRootPresenceFromAgentID(agentID).ControllingClient.SendTerminateFriend(friendID);
356 success = true;
357 }
358 }
359 }
360
361 // return whether we were successful
362 Hashtable result = new Hashtable();
363 result["success"] = success;
364
365 XmlRpcResponse response = new XmlRpcResponse();
366 response.Value = result;
367 return response;
368 } 62 }
369 63
370 #endregion 64 public void RegionLoaded(Scene scene)
371
372 #region Scene events
373
374 private void OnNewClient(IClientAPI client)
375 { 65 {
376 // All friends establishment protocol goes over instant message
377 // There's no way to send a message from the sim
378 // to a user to 'add a friend' without causing dialog box spam
379
380 // Subscribe to instant messages
381 client.OnInstantMessage += OnInstantMessage;
382
383 // Friend list management
384 client.OnApproveFriendRequest += OnApproveFriendRequest;
385 client.OnDenyFriendRequest += OnDenyFriendRequest;
386 client.OnTerminateFriendship += OnTerminateFriendship;
387
388 // ... calling card handling...
389 client.OnOfferCallingCard += OnOfferCallingCard;
390 client.OnAcceptCallingCard += OnAcceptCallingCard;
391 client.OnDeclineCallingCard += OnDeclineCallingCard;
392
393 // we need this one exactly once per agent session (see comments in the handler below)
394 client.OnEconomyDataRequest += OnEconomyDataRequest;
395
396 // if it leaves, we want to know, too
397 client.OnLogout += OnLogout;
398
399 client.OnGrantUserRights += GrantUserFriendRights;
400 client.OnTrackAgent += FindAgent;
401 client.OnFindAgent += FindAgent;
402
403 } 66 }
404 67
405 private void ClientClosed(UUID AgentId, Scene scene) 68 public void RemoveRegion(Scene scene)
406 { 69 {
407 // agent's client was closed. As we handle logout in OnLogout, this here has only to handle
408 // TPing away (root agent is closed) or TPing/crossing in a region far enough away (client
409 // agent is closed).
410 // NOTE: In general, this doesn't mean that the agent logged out, just that it isn't around
411 // in one of the regions here anymore.
412 lock (m_rootAgents)
413 {
414 if (m_rootAgents.ContainsKey(AgentId))
415 {
416 m_rootAgents.Remove(AgentId);
417 }
418 }
419 } 70 }
420 71
421 private void AvatarEnteringParcel(ScenePresence avatar, int localLandID, UUID regionID) 72 public string Name
422 {
423 lock (m_rootAgents)
424 {
425 m_rootAgents[avatar.UUID] = avatar.RegionHandle;
426 // Claim User! my user! Mine mine mine!
427 }
428 }
429
430 private void MakeChildAgent(ScenePresence avatar)
431 { 73 {
432 lock (m_rootAgents) 74 get { return "FriendsModule"; }
433 {
434 if (m_rootAgents.ContainsKey(avatar.UUID))
435 {
436 // only delete if the region matches. As this is a shared module, the avatar could be
437 // root agent in another region on this server.
438 if (m_rootAgents[avatar.UUID] == avatar.RegionHandle)
439 {
440 m_rootAgents.Remove(avatar.UUID);
441// m_log.Debug("[FRIEND]: Removing " + avatar.Firstname + " " + avatar.Lastname + " as a root agent");
442 }
443 }
444 }
445 } 75 }
446 #endregion
447 76
448 private ScenePresence GetRootPresenceFromAgentID(UUID AgentID) 77 public Type ReplaceableInterface
449 { 78 {
450 ScenePresence returnAgent = null; 79 get { return null; }
451 lock (m_scenes)
452 {
453 ScenePresence queryagent = null;
454 foreach (Scene scene in m_scenes.Values)
455 {
456 queryagent = scene.GetScenePresence(AgentID);
457 if (queryagent != null)
458 {
459 if (!queryagent.IsChildAgent)
460 {
461 returnAgent = queryagent;
462 break;
463 }
464 }
465 }
466 }
467 return returnAgent;
468 } 80 }
469 81
470 private ScenePresence GetAnyPresenceFromAgentID(UUID AgentID)
471 {
472 ScenePresence returnAgent = null;
473 lock (m_scenes)
474 {
475 ScenePresence queryagent = null;
476 foreach (Scene scene in m_scenes.Values)
477 {
478 queryagent = scene.GetScenePresence(AgentID);
479 if (queryagent != null)
480 {
481 returnAgent = queryagent;
482 break;
483 }
484 }
485 }
486 return returnAgent;
487 }
488
489 public void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage) 82 public void OfferFriendship(UUID fromUserId, IClientAPI toUserClient, string offerMessage)
490 { 83 {
491 CachedUserInfo userInfo = m_initialScene.CommsManager.UserProfileCacheService.GetUserDetails(fromUserId);
492
493 if (userInfo != null)
494 {
495 GridInstantMessage msg = new GridInstantMessage(
496 toUserClient.Scene, fromUserId, userInfo.UserProfile.Name, toUserClient.AgentId,
497 (byte)InstantMessageDialog.FriendshipOffered, offerMessage, false, Vector3.Zero);
498
499 FriendshipOffered(msg);
500 }
501 else
502 {
503 m_log.ErrorFormat("[FRIENDS]: No user found for id {0} in OfferFriendship()", fromUserId);
504 }
505 }
506
507 #region FriendRequestHandling
508
509 private void OnInstantMessage(IClientAPI client, GridInstantMessage im)
510 {
511 // Friend Requests go by Instant Message.. using the dialog param
512 // https://wiki.secondlife.com/wiki/ImprovedInstantMessage
513
514 if (im.dialog == (byte)InstantMessageDialog.FriendshipOffered) // 38
515 {
516 // fromAgentName is the *destination* name (the friend we offer friendship to)
517 ScenePresence initiator = GetAnyPresenceFromAgentID(new UUID(im.fromAgentID));
518 im.fromAgentName = initiator != null ? initiator.Name : "(hippo)";
519
520 FriendshipOffered(im);
521 }
522 else if (im.dialog == (byte)InstantMessageDialog.FriendshipAccepted) // 39
523 {
524 FriendshipAccepted(client, im);
525 }
526 else if (im.dialog == (byte)InstantMessageDialog.FriendshipDeclined) // 40
527 {
528 FriendshipDeclined(client, im);
529 }
530 } 84 }
531
532 /// <summary>
533 /// Invoked when a user offers a friendship.
534 /// </summary>
535 ///
536 /// <param name="im"></param>
537 /// <param name="client"></param>
538 private void FriendshipOffered(GridInstantMessage im)
539 {
540 // this is triggered by the initiating agent:
541 // A local agent offers friendship to some possibly remote friend.
542 // A IM is triggered, processed here and sent to the friend (possibly in a remote region).
543
544 m_log.DebugFormat("[FRIEND]: Offer(38) - From: {0}, FromName: {1} To: {2}, Session: {3}, Message: {4}, Offline {5}",
545 im.fromAgentID, im.fromAgentName, im.toAgentID, im.imSessionID, im.message, im.offline);
546 85
547 // 1.20 protocol sends an UUID in the message field, instead of the friendship offer text. 86 public uint GetFriendPerms(UUID principalID, UUID friendID)
548 // For interoperability, we have to clear that
549 if (Util.isUUID(im.message)) im.message = "";
550
551 // be sneeky and use the initiator-UUID as transactionID. This means we can be stateless.
552 // we have to look up the agent name on friendship-approval, though.
553 im.imSessionID = im.fromAgentID;
554
555 if (m_TransferModule != null)
556 {
557 // Send it to whoever is the destination.
558 // If new friend is local, it will send an IM to the viewer.
559 // If new friend is remote, it will cause a OnGridInstantMessage on the remote server
560 m_TransferModule.SendInstantMessage(
561 im,
562 delegate(bool success)
563 {
564 m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
565 }
566 );
567 }
568 }
569
570 /// <summary>
571 /// Invoked when a user accepts a friendship offer.
572 /// </summary>
573 /// <param name="im"></param>
574 /// <param name="client"></param>
575 private void FriendshipAccepted(IClientAPI client, GridInstantMessage im)
576 { 87 {
577 m_log.DebugFormat("[FRIEND]: 39 - from client {0}, agent {2} {3}, imsession {4} to {5}: {6} (dialog {7})", 88 return 1;
578 client.AgentId, im.fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog);
579 }
580
581 /// <summary>
582 /// Invoked when a user declines a friendship offer.
583 /// </summary>
584 /// May not currently be used - see OnDenyFriendRequest() instead
585 /// <param name="im"></param>
586 /// <param name="client"></param>
587 private void FriendshipDeclined(IClientAPI client, GridInstantMessage im)
588 {
589 UUID fromAgentID = new UUID(im.fromAgentID);
590 UUID toAgentID = new UUID(im.toAgentID);
591
592 // declining the friendship offer causes a type 40 IM being sent to the (possibly remote) initiator
593 // toAgentID is initiator, fromAgentID declined friendship
594 m_log.DebugFormat("[FRIEND]: 40 - from client {0}, agent {1} {2}, imsession {3} to {4}: {5} (dialog {6})",
595 client != null ? client.AgentId.ToString() : "<null>",
596 fromAgentID, im.fromAgentName, im.imSessionID, im.toAgentID, im.message, im.dialog);
597
598 // Send the decline to whoever is the destination.
599 GridInstantMessage msg
600 = new GridInstantMessage(
601 client.Scene, fromAgentID, client.Name, toAgentID,
602 im.dialog, im.message, im.offline != 0, im.Position);
603
604 // If new friend is local, it will send an IM to the viewer.
605 // If new friend is remote, it will cause a OnGridInstantMessage on the remote server
606 m_TransferModule.SendInstantMessage(msg,
607 delegate(bool success) {
608 m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
609 }
610 );
611 }
612
613 private void OnGridInstantMessage(GridInstantMessage msg)
614 {
615 // This event won't be raised unless we have that agent,
616 // so we can depend on the above not trying to send
617 // via grid again
618 //m_log.DebugFormat("[FRIEND]: Got GridIM from {0}, to {1}, imSession {2}, message {3}, dialog {4}",
619 // msg.fromAgentID, msg.toAgentID, msg.imSessionID, msg.message, msg.dialog);
620
621 if (msg.dialog == (byte)InstantMessageDialog.FriendshipOffered ||
622 msg.dialog == (byte)InstantMessageDialog.FriendshipAccepted ||
623 msg.dialog == (byte)InstantMessageDialog.FriendshipDeclined)
624 {
625 // this should succeed as we *know* the root agent is here.
626 m_TransferModule.SendInstantMessage(msg,
627 delegate(bool success) {
628 //m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
629 }
630 );
631 }
632
633 if (msg.dialog == (byte)InstantMessageDialog.FriendshipAccepted)
634 {
635 // for accept friendship, we have to do a bit more
636 ApproveFriendship(new UUID(msg.fromAgentID), new UUID(msg.toAgentID), msg.fromAgentName);
637 }
638 }
639
640 private void ApproveFriendship(UUID fromAgentID, UUID toAgentID, string fromName)
641 {
642 m_log.DebugFormat("[FRIEND]: Approve friendship from {0} (ID: {1}) to {2}",
643 fromAgentID, fromName, toAgentID);
644
645 // a new friend was added in the initiator's and friend's data, so the cache entries are wrong now.
646 lock (m_friendLists)
647 {
648 m_friendLists.Invalidate(fromAgentID.ToString());
649 m_friendLists.Invalidate(toAgentID.ToString());
650 }
651
652 // now send presence update and add a calling card for the new friend
653
654 ScenePresence initiator = GetAnyPresenceFromAgentID(toAgentID);
655 if (initiator == null)
656 {
657 // quite wrong. Shouldn't happen.
658 m_log.WarnFormat("[FRIEND]: Coudn't find initiator of friend request {0}", toAgentID);
659 return;
660 }
661
662 m_log.DebugFormat("[FRIEND]: Tell {0} that {1} is online",
663 initiator.Name, fromName);
664 // tell initiator that friend is online
665 initiator.ControllingClient.SendAgentOnline(new UUID[] { fromAgentID });
666
667 // find the folder for the friend...
668 //InventoryFolderImpl folder =
669 // initiator.Scene.CommsManager.UserProfileCacheService.GetUserDetails(toAgentID).FindFolderForType((int)InventoryType.CallingCard);
670 IInventoryService invService = initiator.Scene.InventoryService;
671 InventoryFolderBase folder = invService.GetFolderForType(toAgentID, AssetType.CallingCard);
672 if (folder != null)
673 {
674 // ... and add the calling card
675 CreateCallingCard(initiator.ControllingClient, fromAgentID, folder.ID, fromName);
676 }
677 }
678
679 private void OnApproveFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
680 {
681 m_log.DebugFormat("[FRIEND]: Got approve friendship from {0} {1}, agentID {2}, tid {3}",
682 client.Name, client.AgentId, agentID, friendID);
683
684 // store the new friend persistently for both avatars
685 m_initialScene.StoreAddFriendship(friendID, agentID, (uint) FriendRights.CanSeeOnline);
686
687 // The cache entries aren't valid anymore either, as we just added a friend to both sides.
688 lock (m_friendLists)
689 {
690 m_friendLists.Invalidate(agentID.ToString());
691 m_friendLists.Invalidate(friendID.ToString());
692 }
693
694 // if it's a local friend, we don't have to do the lookup
695 ScenePresence friendPresence = GetAnyPresenceFromAgentID(friendID);
696
697 if (friendPresence != null)
698 {
699 m_log.Debug("[FRIEND]: Local agent detected.");
700
701 // create calling card
702 CreateCallingCard(client, friendID, callingCardFolders[0], friendPresence.Name);
703
704 // local message means OnGridInstantMessage won't be triggered, so do the work here.
705 friendPresence.ControllingClient.SendInstantMessage(
706 new GridInstantMessage(client.Scene, agentID,
707 client.Name, friendID,
708 (byte)InstantMessageDialog.FriendshipAccepted,
709 agentID.ToString(), false, Vector3.Zero));
710 ApproveFriendship(agentID, friendID, client.Name);
711 }
712 else
713 {
714 m_log.Debug("[FRIEND]: Remote agent detected.");
715
716 // fetch the friend's name for the calling card.
717 CachedUserInfo info = m_initialScene.CommsManager.UserProfileCacheService.GetUserDetails(friendID);
718
719 // create calling card
720 CreateCallingCard(client, friendID, callingCardFolders[0],
721 info.UserProfile.FirstName + " " + info.UserProfile.SurName);
722
723 // Compose (remote) response to friend.
724 GridInstantMessage msg = new GridInstantMessage(client.Scene, agentID, client.Name, friendID,
725 (byte)InstantMessageDialog.FriendshipAccepted,
726 agentID.ToString(), false, Vector3.Zero);
727 if (m_TransferModule != null)
728 {
729 m_TransferModule.SendInstantMessage(msg,
730 delegate(bool success) {
731 m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
732 }
733 );
734 }
735 }
736
737 // tell client that new friend is online
738 client.SendAgentOnline(new UUID[] { friendID });
739 }
740
741 private void OnDenyFriendRequest(IClientAPI client, UUID agentID, UUID friendID, List<UUID> callingCardFolders)
742 {
743 m_log.DebugFormat("[FRIEND]: Got deny friendship from {0} {1}, agentID {2}, tid {3}",
744 client.Name, client.AgentId, agentID, friendID);
745
746 // Compose response to other agent.
747 GridInstantMessage msg = new GridInstantMessage(client.Scene, agentID, client.Name, friendID,
748 (byte)InstantMessageDialog.FriendshipDeclined,
749 agentID.ToString(), false, Vector3.Zero);
750 // send decline to initiator
751 if (m_TransferModule != null)
752 {
753 m_TransferModule.SendInstantMessage(msg,
754 delegate(bool success) {
755 m_log.DebugFormat("[FRIEND]: sending IM success = {0}", success);
756 }
757 );
758 }
759 }
760
761 private void OnTerminateFriendship(IClientAPI client, UUID agentID, UUID exfriendID)
762 {
763 // client.AgentId == agentID!
764
765 // this removes the friends from the stored friendlists. After the next login, they will be gone...
766 m_initialScene.StoreRemoveFriendship(agentID, exfriendID);
767
768 // ... now tell the two involved clients that they aren't friends anymore.
769
770 // I don't know why we have to tell <agent>, as this was caused by her, but that's how it works in SL...
771 client.SendTerminateFriend(exfriendID);
772
773 // now send the friend, if online
774 ScenePresence presence = GetAnyPresenceFromAgentID(exfriendID);
775 if (presence != null)
776 {
777 m_log.DebugFormat("[FRIEND]: Sending terminate friend {0} to agent {1}", agentID, exfriendID);
778 presence.ControllingClient.SendTerminateFriend(agentID);
779 }
780 else
781 {
782 // retry 3 times, in case the agent TPed from the last known region...
783 for (int retry = 0; retry < 3; ++retry)
784 {
785 // wasn't sent, so ex-friend wasn't around on this region-server. Fetch info and try to send
786 UserAgentData data = m_initialScene.CommsManager.UserService.GetAgentByUUID(exfriendID);
787
788 if (null == data)
789 break;
790
791 if (!data.AgentOnline)
792 {
793 m_log.DebugFormat("[FRIEND]: {0} is offline, so not sending TerminateFriend", exfriendID);
794 break; // if ex-friend isn't online, we don't need to send
795 }
796
797 m_log.DebugFormat("[FRIEND]: Sending remote terminate friend {0} to agent {1}@{2}",
798 agentID, exfriendID, data.Handle);
799
800 // try to send to foreign region, retry if it fails (friend TPed away, for example)
801 if (TriggerTerminateFriend(data.Handle, exfriendID, agentID)) break;
802 }
803 }
804
805 // clean up cache: FriendList is wrong now...
806 lock (m_friendLists)
807 {
808 m_friendLists.Invalidate(agentID.ToString());
809 m_friendLists.Invalidate(exfriendID.ToString());
810 }
811 }
812
813 #endregion
814
815 #region CallingCards
816
817 private void OnOfferCallingCard(IClientAPI client, UUID destID, UUID transactionID)
818 {
819 m_log.DebugFormat("[CALLING CARD]: got offer from {0} for {1}, transaction {2}",
820 client.AgentId, destID, transactionID);
821 // This might be slightly wrong. On a multi-region server, we might get the child-agent instead of the root-agent
822 // (or the root instead of the child)
823 ScenePresence destAgent = GetAnyPresenceFromAgentID(destID);
824 if (destAgent == null)
825 {
826 client.SendAlertMessage("The person you have offered a card to can't be found anymore.");
827 return;
828 }
829
830 lock (m_pendingCallingcardRequests)
831 {
832 m_pendingCallingcardRequests[transactionID] = client.AgentId;
833 }
834 // inform the destination agent about the offer
835 destAgent.ControllingClient.SendOfferCallingCard(client.AgentId, transactionID);
836 }
837
838 private void CreateCallingCard(IClientAPI client, UUID creator, UUID folder, string name)
839 {
840 InventoryItemBase item = new InventoryItemBase();
841 item.AssetID = UUID.Zero;
842 item.AssetType = (int)AssetType.CallingCard;
843 item.BasePermissions = (uint)PermissionMask.Copy;
844 item.CreationDate = Util.UnixTimeSinceEpoch();
845 item.CreatorId = creator.ToString();
846 item.CurrentPermissions = item.BasePermissions;
847 item.Description = "";
848 item.EveryOnePermissions = (uint)PermissionMask.None;
849 item.Flags = 0;
850 item.Folder = folder;
851 item.GroupID = UUID.Zero;
852 item.GroupOwned = false;
853 item.ID = UUID.Random();
854 item.InvType = (int)InventoryType.CallingCard;
855 item.Name = name;
856 item.NextPermissions = item.EveryOnePermissions;
857 item.Owner = client.AgentId;
858 item.SalePrice = 10;
859 item.SaleType = (byte)SaleType.Not;
860 ((Scene)client.Scene).AddInventoryItem(client, item);
861 }
862
863 private void OnAcceptCallingCard(IClientAPI client, UUID transactionID, UUID folderID)
864 {
865 m_log.DebugFormat("[CALLING CARD]: User {0} ({1} {2}) accepted tid {3}, folder {4}",
866 client.AgentId,
867 client.FirstName, client.LastName,
868 transactionID, folderID);
869 UUID destID;
870 lock (m_pendingCallingcardRequests)
871 {
872 if (!m_pendingCallingcardRequests.TryGetValue(transactionID, out destID))
873 {
874 m_log.WarnFormat("[CALLING CARD]: Got a AcceptCallingCard from {0} without an offer before.",
875 client.Name);
876 return;
877 }
878 // else found pending calling card request with that transaction.
879 m_pendingCallingcardRequests.Remove(transactionID);
880 }
881
882
883 ScenePresence destAgent = GetAnyPresenceFromAgentID(destID);
884 // inform sender of the card that destination declined the offer
885 if (destAgent != null) destAgent.ControllingClient.SendAcceptCallingCard(transactionID);
886
887 // put a calling card into the inventory of receiver
888 CreateCallingCard(client, destID, folderID, destAgent.Name);
889 }
890
891 private void OnDeclineCallingCard(IClientAPI client, UUID transactionID)
892 {
893 m_log.DebugFormat("[CALLING CARD]: User {0} (ID:{1}) declined card, tid {2}",
894 client.Name, client.AgentId, transactionID);
895 UUID destID;
896 lock (m_pendingCallingcardRequests)
897 {
898 if (!m_pendingCallingcardRequests.TryGetValue(transactionID, out destID))
899 {
900 m_log.WarnFormat("[CALLING CARD]: Got a AcceptCallingCard from {0} without an offer before.",
901 client.Name);
902 return;
903 }
904 // else found pending calling card request with that transaction.
905 m_pendingCallingcardRequests.Remove(transactionID);
906 }
907
908 ScenePresence destAgent = GetAnyPresenceFromAgentID(destID);
909 // inform sender of the card that destination declined the offer
910 if (destAgent != null) destAgent.ControllingClient.SendDeclineCallingCard(transactionID);
911 }
912
913 /// <summary>
914 /// Send presence information about a client to other clients in both this region and others.
915 /// </summary>
916 /// <param name="client"></param>
917 /// <param name="friendList"></param>
918 /// <param name="iAmOnline"></param>
919 private void SendPresenceState(IClientAPI client, List<FriendListItem> friendList, bool iAmOnline)
920 {
921 //m_log.DebugFormat("[FRIEND]: {0} logged {1}; sending presence updates", client.Name, iAmOnline ? "in" : "out");
922
923 if (friendList == null || friendList.Count == 0)
924 {
925 //m_log.DebugFormat("[FRIEND]: {0} doesn't have friends.", client.Name);
926 return; // nothing we can do if she doesn't have friends...
927 }
928
929 // collect sets of friendIDs; to send to (online and offline), and to receive from
930 // TODO: If we ever switch to .NET >= 3, replace those Lists with HashSets.
931 // I can't believe that we have Dictionaries, but no Sets, considering Java introduced them years ago...
932 List<UUID> friendIDsToSendTo = new List<UUID>();
933 List<UUID> candidateFriendIDsToReceive = new List<UUID>();
934
935 foreach (FriendListItem item in friendList)
936 {
937 if (((item.FriendListOwnerPerms | item.FriendPerms) & (uint)FriendRights.CanSeeOnline) != 0)
938 {
939 // friend is allowed to see my presence => add
940 if ((item.FriendListOwnerPerms & (uint)FriendRights.CanSeeOnline) != 0)
941 friendIDsToSendTo.Add(item.Friend);
942
943 if ((item.FriendPerms & (uint)FriendRights.CanSeeOnline) != 0)
944 candidateFriendIDsToReceive.Add(item.Friend);
945 }
946 }
947
948 // we now have a list of "interesting" friends (which we have to find out on-/offline state for),
949 // friends we want to send our online state to (if *they* are online, too), and
950 // friends we want to receive online state for (currently unknown whether online or not)
951
952 // as this processing might take some time and friends might TP away, we try up to three times to
953 // reach them. Most of the time, we *will* reach them, and this loop won't loop
954 int retry = 0;
955 do
956 {
957 // build a list of friends to look up region-information and on-/offline-state for
958 List<UUID> friendIDsToLookup = new List<UUID>(friendIDsToSendTo);
959 foreach (UUID uuid in candidateFriendIDsToReceive)
960 {
961 if (!friendIDsToLookup.Contains(uuid)) friendIDsToLookup.Add(uuid);
962 }
963
964 m_log.DebugFormat(
965 "[FRIEND]: {0} to lookup, {1} to send to, {2} candidates to receive from for agent {3}",
966 friendIDsToLookup.Count, friendIDsToSendTo.Count, candidateFriendIDsToReceive.Count, client.Name);
967
968 // we have to fetch FriendRegionInfos, as the (cached) FriendListItems don't
969 // necessarily contain the correct online state...
970 Dictionary<UUID, FriendRegionInfo> friendRegions = m_initialScene.GetFriendRegionInfos(friendIDsToLookup);
971 m_log.DebugFormat(
972 "[FRIEND]: Found {0} regionInfos for {1} friends of {2}",
973 friendRegions.Count, friendIDsToLookup.Count, client.Name);
974
975 // argument for SendAgentOn/Offline; we shouldn't generate that repeatedly within loops.
976 UUID[] agentArr = new UUID[] { client.AgentId };
977
978 // first, send to friend presence state to me, if I'm online...
979 if (iAmOnline)
980 {
981 List<UUID> friendIDsToReceive = new List<UUID>();
982
983 for (int i = candidateFriendIDsToReceive.Count - 1; i >= 0; --i)
984 {
985 UUID uuid = candidateFriendIDsToReceive[i];
986 FriendRegionInfo info;
987 if (friendRegions.TryGetValue(uuid, out info) && info != null && info.isOnline)
988 {
989 friendIDsToReceive.Add(uuid);
990 }
991 }
992
993 m_log.DebugFormat(
994 "[FRIEND]: Sending {0} online friends to {1}", friendIDsToReceive.Count, client.Name);
995
996 if (friendIDsToReceive.Count > 0)
997 client.SendAgentOnline(friendIDsToReceive.ToArray());
998
999 // clear them for a possible second iteration; we don't have to repeat this
1000 candidateFriendIDsToReceive.Clear();
1001 }
1002
1003 // now, send my presence state to my friends
1004 for (int i = friendIDsToSendTo.Count - 1; i >= 0; --i)
1005 {
1006 UUID uuid = friendIDsToSendTo[i];
1007 FriendRegionInfo info;
1008 if (friendRegions.TryGetValue(uuid, out info) && info != null && info.isOnline)
1009 {
1010 // any client is good enough, root or child...
1011 ScenePresence agent = GetAnyPresenceFromAgentID(uuid);
1012 if (agent != null)
1013 {
1014 //m_log.DebugFormat("[FRIEND]: Found local agent {0}", agent.Name);
1015
1016 // friend is online and on this server...
1017 if (iAmOnline) agent.ControllingClient.SendAgentOnline(agentArr);
1018 else agent.ControllingClient.SendAgentOffline(agentArr);
1019
1020 // done, remove it
1021 friendIDsToSendTo.RemoveAt(i);
1022 }
1023 }
1024 else
1025 {
1026 //m_log.DebugFormat("[FRIEND]: Friend {0} ({1}) is offline; not sending.", uuid, i);
1027
1028 // friend is offline => no need to try sending
1029 friendIDsToSendTo.RemoveAt(i);
1030 }
1031 }
1032
1033 m_log.DebugFormat("[FRIEND]: Have {0} friends to contact via inter-region comms.", friendIDsToSendTo.Count);
1034
1035 // we now have all the friends left that are online (we think), but not on this region-server
1036 if (friendIDsToSendTo.Count > 0)
1037 {
1038 // sort them into regions
1039 Dictionary<ulong, List<UUID>> friendsInRegion = new Dictionary<ulong,List<UUID>>();
1040 foreach (UUID uuid in friendIDsToSendTo)
1041 {
1042 ulong handle = friendRegions[uuid].regionHandle; // this can't fail as we filtered above already
1043 List<UUID> friends;
1044 if (!friendsInRegion.TryGetValue(handle, out friends))
1045 {
1046 friends = new List<UUID>();
1047 friendsInRegion[handle] = friends;
1048 }
1049 friends.Add(uuid);
1050 }
1051 m_log.DebugFormat("[FRIEND]: Found {0} regions to send to.", friendRegions.Count);
1052
1053 // clear uuids list and collect missed friends in it for the next retry
1054 friendIDsToSendTo.Clear();
1055
1056 // send bulk updates to the region
1057 foreach (KeyValuePair<ulong, List<UUID>> pair in friendsInRegion)
1058 {
1059 //m_log.DebugFormat("[FRIEND]: Inform {0} friends in region {1} that user {2} is {3}line",
1060 // pair.Value.Count, pair.Key, client.Name, iAmOnline ? "on" : "off");
1061
1062 friendIDsToSendTo.AddRange(InformFriendsInOtherRegion(client.AgentId, pair.Key, pair.Value, iAmOnline));
1063 }
1064 }
1065 // now we have in friendIDsToSendTo only the agents left that TPed away while we tried to contact them.
1066 // In most cases, it will be empty, and it won't loop here. But sometimes, we have to work harder and try again...
1067 }
1068 while (++retry < 3 && friendIDsToSendTo.Count > 0);
1069 }
1070
1071 private void OnEconomyDataRequest(UUID agentID)
1072 {
1073 // KLUDGE: This is the only way I found to get a message (only) after login was completed and the
1074 // client is connected enough to receive UDP packets).
1075 // This packet seems to be sent only once, just after connection was established to the first
1076 // region after login.
1077 // We use it here to trigger a presence update; the old update-on-login was never be heard by
1078 // the freshly logged in viewer, as it wasn't connected to the region at that time.
1079 // TODO: Feel free to replace this by a better solution if you find one.
1080
1081 // get the agent. This should work every time, as we just got a packet from it
1082 //ScenePresence agent = GetRootPresenceFromAgentID(agentID);
1083 // KLUDGE 2: As this is sent quite early, the avatar isn't here as root agent yet. So, we have to cheat a bit
1084 ScenePresence agent = GetAnyPresenceFromAgentID(agentID);
1085
1086 // just to be paranoid...
1087 if (agent == null)
1088 {
1089 m_log.ErrorFormat("[FRIEND]: Got a packet from agent {0} who can't be found anymore!?", agentID);
1090 return;
1091 }
1092
1093 List<FriendListItem> fl;
1094 lock (m_friendLists)
1095 {
1096 fl = (List<FriendListItem>)m_friendLists.Get(agent.ControllingClient.AgentId.ToString(),
1097 m_initialScene.GetFriendList);
1098 }
1099
1100 // tell everyone that we are online
1101 SendPresenceState(agent.ControllingClient, fl, true);
1102 }
1103
1104 private void OnLogout(IClientAPI remoteClient)
1105 {
1106 List<FriendListItem> fl;
1107 lock (m_friendLists)
1108 {
1109 fl = (List<FriendListItem>)m_friendLists.Get(remoteClient.AgentId.ToString(),
1110 m_initialScene.GetFriendList);
1111 }
1112
1113 // tell everyone that we are offline
1114 SendPresenceState(remoteClient, fl, false);
1115 }
1116 private void GrantUserFriendRights(IClientAPI remoteClient, UUID requester, UUID target, int rights)
1117 {
1118 ((Scene)remoteClient.Scene).CommsManager.UpdateUserFriendPerms(requester, target, (uint)rights);
1119 }
1120 public void FindAgent(IClientAPI remoteClient, UUID hunter, UUID target)
1121 {
1122 List<FriendListItem> friendList = GetUserFriends(hunter);
1123 foreach (FriendListItem item in friendList)
1124 {
1125 if (item.onlinestatus == true)
1126 {
1127 if (item.Friend == target && (item.FriendPerms & (uint)FriendRights.CanSeeOnMap) != 0)
1128 {
1129 ScenePresence SPTarget = ((Scene)remoteClient.Scene).GetScenePresence(target);
1130 string regionname = SPTarget.Scene.RegionInfo.RegionName;
1131 remoteClient.SendScriptTeleportRequest("FindAgent", regionname,new Vector3(SPTarget.AbsolutePosition),new Vector3(SPTarget.Lookat));
1132 }
1133 }
1134 else
1135 {
1136 remoteClient.SendAgentAlertMessage("The agent you are looking for is not online.", false);
1137 }
1138 }
1139 }
1140
1141 public List<FriendListItem> GetUserFriends(UUID agentID)
1142 {
1143 List<FriendListItem> fl;
1144 lock (m_friendLists)
1145 {
1146 fl = (List<FriendListItem>)m_friendLists.Get(agentID.ToString(),
1147 m_initialScene.GetFriendList);
1148 }
1149
1150 return fl;
1151 } 89 }
1152 } 90 }
1153 #endregion
1154} 91}
diff --git a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
index 8ce5092..7303fe7 100644
--- a/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Gestures/GesturesModule.cs
@@ -30,7 +30,7 @@ using log4net;
30using Nini.Config; 30using Nini.Config;
31using OpenMetaverse; 31using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications.Cache; 33
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Services.Interfaces; 36using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
index 9a68749..ab141eb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/InstantMessageModule.cs
@@ -24,6 +24,7 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System;
27using System.Collections.Generic; 28using System.Collections.Generic;
28using System.Reflection; 29using System.Reflection;
29using log4net; 30using log4net;
@@ -36,9 +37,10 @@ using OpenSim.Region.Framework.Scenes;
36 37
37namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 38namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
38{ 39{
39 public class InstantMessageModule : IRegionModule 40 public class InstantMessageModule : ISharedRegionModule
40 { 41 {
41 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(
43 MethodBase.GetCurrentMethod().DeclaringType);
42 44
43 /// <value> 45 /// <value>
44 /// Is this module enabled? 46 /// Is this module enabled?
@@ -51,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
51 53
52 private IMessageTransferModule m_TransferModule = null; 54 private IMessageTransferModule m_TransferModule = null;
53 55
54 public void Initialise(Scene scene, IConfigSource config) 56 public void Initialise(IConfigSource config)
55 { 57 {
56 if (config.Configs["Messaging"] != null) 58 if (config.Configs["Messaging"] != null)
57 { 59 {
@@ -62,6 +64,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
62 } 64 }
63 65
64 m_enabled = true; 66 m_enabled = true;
67 }
68
69 public void AddRegion(Scene scene)
70 {
71 if (!m_enabled)
72 return;
65 73
66 lock (m_scenes) 74 lock (m_scenes)
67 { 75 {
@@ -74,6 +82,39 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
74 } 82 }
75 } 83 }
76 84
85 public void RegionLoaded(Scene scene)
86 {
87 if (!m_enabled)
88 return;
89
90 if (m_TransferModule == null)
91 {
92 m_TransferModule =
93 scene.RequestModuleInterface<IMessageTransferModule>();
94
95 if (m_TransferModule == null)
96 {
97 m_log.Error("[INSTANT MESSAGE]: No message transfer module, IM will not work!");
98 scene.EventManager.OnClientConnect -= OnClientConnect;
99 scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
100
101 m_scenes.Clear();
102 m_enabled = false;
103 }
104 }
105 }
106
107 public void RemoveRegion(Scene scene)
108 {
109 if (!m_enabled)
110 return;
111
112 lock (m_scenes)
113 {
114 m_scenes.Remove(scene);
115 }
116 }
117
77 void OnClientConnect(IClientCore client) 118 void OnClientConnect(IClientCore client)
78 { 119 {
79 IClientIM clientIM; 120 IClientIM clientIM;
@@ -85,15 +126,6 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
85 126
86 public void PostInitialise() 127 public void PostInitialise()
87 { 128 {
88 if (!m_enabled)
89 return;
90
91 m_TransferModule =
92 m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
93
94 if (m_TransferModule == null)
95 m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
96 "IM will not work!");
97 } 129 }
98 130
99 public void Close() 131 public void Close()
@@ -105,9 +137,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
105 get { return "InstantMessageModule"; } 137 get { return "InstantMessageModule"; }
106 } 138 }
107 139
108 public bool IsSharedModule 140 public Type ReplaceableInterface
109 { 141 {
110 get { return true; } 142 get { return null; }
111 } 143 }
112 144
113 #endregion 145 #endregion
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
index e5159b3..c0d3f31 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
@@ -37,21 +37,33 @@ using OpenSim.Framework;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using GridRegion = OpenSim.Services.Interfaces.GridRegion; 39using GridRegion = OpenSim.Services.Interfaces.GridRegion;
40using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
41using OpenSim.Services.Interfaces;
40 42
41namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 43namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
42{ 44{
43 public class MessageTransferModule : IRegionModule, IMessageTransferModule 45 public class MessageTransferModule : ISharedRegionModule, IMessageTransferModule
44 { 46 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 48
47 // private bool m_Enabled = false; 49 private bool m_Enabled = false;
48 protected bool m_Gridmode = false;
49 protected List<Scene> m_Scenes = new List<Scene>(); 50 protected List<Scene> m_Scenes = new List<Scene>();
50 protected Dictionary<UUID, ulong> m_UserRegionMap = new Dictionary<UUID, ulong>(); 51 protected Dictionary<UUID, UUID> m_UserRegionMap = new Dictionary<UUID, UUID>();
51 52
52 public event UndeliveredMessage OnUndeliveredMessage; 53 public event UndeliveredMessage OnUndeliveredMessage;
53 54
54 public virtual void Initialise(Scene scene, IConfigSource config) 55 private IPresenceService m_PresenceService;
56 protected IPresenceService PresenceService
57 {
58 get
59 {
60 if (m_PresenceService == null)
61 m_PresenceService = m_Scenes[0].RequestModuleInterface<IPresenceService>();
62 return m_PresenceService;
63 }
64 }
65
66 public virtual void Initialise(IConfigSource config)
55 { 67 {
56 IConfig cnf = config.Configs["Messaging"]; 68 IConfig cnf = config.Configs["Messaging"];
57 if (cnf != null && cnf.GetString( 69 if (cnf != null && cnf.GetString(
@@ -62,20 +74,16 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
62 return; 74 return;
63 } 75 }
64 76
65 cnf = config.Configs["Startup"]; 77 m_Enabled = true;
66 if (cnf != null) 78 }
67 m_Gridmode = cnf.GetBoolean("gridmode", false);
68 79
69 // m_Enabled = true; 80 public virtual void AddRegion(Scene scene)
81 {
82 if (!m_Enabled)
83 return;
70 84
71 lock (m_Scenes) 85 lock (m_Scenes)
72 { 86 {
73 if (m_Scenes.Count == 0)
74 {
75 MainServer.Instance.AddXmlRPCHandler(
76 "grid_instant_message", processXMLRPCGridInstantMessage);
77 }
78
79 m_log.Debug("[MESSAGE TRANSFER]: Message transfer module active"); 87 m_log.Debug("[MESSAGE TRANSFER]: Message transfer module active");
80 scene.RegisterModuleInterface<IMessageTransferModule>(this); 88 scene.RegisterModuleInterface<IMessageTransferModule>(this);
81 m_Scenes.Add(scene); 89 m_Scenes.Add(scene);
@@ -84,6 +92,26 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
84 92
85 public virtual void PostInitialise() 93 public virtual void PostInitialise()
86 { 94 {
95 if (!m_Enabled)
96 return;
97
98 MainServer.Instance.AddXmlRPCHandler(
99 "grid_instant_message", processXMLRPCGridInstantMessage);
100 }
101
102 public virtual void RegionLoaded(Scene scene)
103 {
104 }
105
106 public virtual void RemoveRegion(Scene scene)
107 {
108 if (!m_Enabled)
109 return;
110
111 lock(m_Scenes)
112 {
113 m_Scenes.Remove(scene);
114 }
87 } 115 }
88 116
89 public virtual void Close() 117 public virtual void Close()
@@ -95,9 +123,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
95 get { return "MessageTransferModule"; } 123 get { return "MessageTransferModule"; }
96 } 124 }
97 125
98 public virtual bool IsSharedModule 126 public virtual Type ReplaceableInterface
99 { 127 {
100 get { return true; } 128 get { return null; }
101 } 129 }
102 130
103 public virtual void SendInstantMessage(GridInstantMessage im, MessageResultNotification result) 131 public virtual void SendInstantMessage(GridInstantMessage im, MessageResultNotification result)
@@ -148,15 +176,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
148 } 176 }
149 } 177 }
150 178
151 if (m_Gridmode) 179 SendGridInstantMessageViaXMLRPC(im, result);
152 {
153 //m_log.DebugFormat("[INSTANT MESSAGE]: Delivering via grid");
154 // Still here, try send via Grid
155 SendGridInstantMessageViaXMLRPC(im, result);
156 return;
157 }
158
159 HandleUndeliveredMessage(im, result);
160 180
161 return; 181 return;
162 } 182 }
@@ -409,7 +429,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
409 /// <summary> 429 /// <summary>
410 /// delegate for sending a grid instant message asynchronously 430 /// delegate for sending a grid instant message asynchronously
411 /// </summary> 431 /// </summary>
412 public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result, ulong prevRegionHandle); 432 public delegate void GridInstantMessageDelegate(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID);
413 433
414 protected virtual void GridInstantMessageCompleted(IAsyncResult iar) 434 protected virtual void GridInstantMessageCompleted(IAsyncResult iar)
415 { 435 {
@@ -423,7 +443,7 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
423 { 443 {
424 GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsync; 444 GridInstantMessageDelegate d = SendGridInstantMessageViaXMLRPCAsync;
425 445
426 d.BeginInvoke(im, result, 0, GridInstantMessageCompleted, d); 446 d.BeginInvoke(im, result, UUID.Zero, GridInstantMessageCompleted, d);
427 } 447 }
428 448
429 /// <summary> 449 /// <summary>
@@ -438,11 +458,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
438 /// Pass in 0 the first time this method is called. It will be called recursively with the last 458 /// Pass in 0 the first time this method is called. It will be called recursively with the last
439 /// regionhandle tried 459 /// regionhandle tried
440 /// </param> 460 /// </param>
441 protected virtual void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, ulong prevRegionHandle) 461 protected virtual void SendGridInstantMessageViaXMLRPCAsync(GridInstantMessage im, MessageResultNotification result, UUID prevRegionID)
442 { 462 {
443 UUID toAgentID = new UUID(im.toAgentID); 463 UUID toAgentID = new UUID(im.toAgentID);
444 464
445 UserAgentData upd = null; 465 PresenceInfo upd = null;
446 466
447 bool lookupAgent = false; 467 bool lookupAgent = false;
448 468
@@ -450,13 +470,13 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
450 { 470 {
451 if (m_UserRegionMap.ContainsKey(toAgentID)) 471 if (m_UserRegionMap.ContainsKey(toAgentID))
452 { 472 {
453 upd = new UserAgentData(); 473 upd = new PresenceInfo();
454 upd.AgentOnline = true; 474 upd.Online = true;
455 upd.Handle = m_UserRegionMap[toAgentID]; 475 upd.RegionID = m_UserRegionMap[toAgentID];
456 476
457 // We need to compare the current regionhandle with the previous region handle 477 // We need to compare the current regionhandle with the previous region handle
458 // or the recursive loop will never end because it will never try to lookup the agent again 478 // or the recursive loop will never end because it will never try to lookup the agent again
459 if (prevRegionHandle == upd.Handle) 479 if (prevRegionID == upd.RegionID)
460 { 480 {
461 lookupAgent = true; 481 lookupAgent = true;
462 } 482 }
@@ -472,14 +492,23 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
472 if (lookupAgent) 492 if (lookupAgent)
473 { 493 {
474 // Non-cached user agent lookup. 494 // Non-cached user agent lookup.
475 upd = m_Scenes[0].CommsManager.UserService.GetAgentByUUID(toAgentID); 495 PresenceInfo[] presences = PresenceService.GetAgents(new string[] { toAgentID.ToString() });
496 if (presences != null)
497 {
498 foreach (PresenceInfo p in presences)
499 if (p.Online)
500 {
501 upd = presences[0];
502 break;
503 }
504 }
476 505
477 if (upd != null) 506 if (upd != null)
478 { 507 {
479 // check if we've tried this before.. 508 // check if we've tried this before..
480 // This is one way to end the recursive loop 509 // This is one way to end the recursive loop
481 // 510 //
482 if (upd.Handle == prevRegionHandle) 511 if (upd.RegionID == prevRegionID)
483 { 512 {
484 m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message"); 513 m_log.Error("[GRID INSTANT MESSAGE]: Unable to deliver an instant message");
485 HandleUndeliveredMessage(im, result); 514 HandleUndeliveredMessage(im, result);
@@ -496,12 +525,10 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
496 525
497 if (upd != null) 526 if (upd != null)
498 { 527 {
499 if (upd.AgentOnline) 528 if (upd.Online)
500 { 529 {
501 uint x = 0, y = 0; 530 GridRegion reginfo = m_Scenes[0].GridService.GetRegionByUUID(m_Scenes[0].RegionInfo.ScopeID,
502 Utils.LongToUInts(upd.Handle, out x, out y); 531 upd.RegionID);
503 GridRegion reginfo = m_Scenes[0].GridService.GetRegionByPosition(m_Scenes[0].RegionInfo.ScopeID,
504 (int)x, (int)y);
505 if (reginfo != null) 532 if (reginfo != null)
506 { 533 {
507 Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im); 534 Hashtable msgdata = ConvertGridInstantMessageToXMLRPC(im);
@@ -517,11 +544,11 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
517 { 544 {
518 if (m_UserRegionMap.ContainsKey(toAgentID)) 545 if (m_UserRegionMap.ContainsKey(toAgentID))
519 { 546 {
520 m_UserRegionMap[toAgentID] = upd.Handle; 547 m_UserRegionMap[toAgentID] = upd.RegionID;
521 } 548 }
522 else 549 else
523 { 550 {
524 m_UserRegionMap.Add(toAgentID, upd.Handle); 551 m_UserRegionMap.Add(toAgentID, upd.RegionID);
525 } 552 }
526 } 553 }
527 result(true); 554 result(true);
@@ -536,12 +563,12 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
536 563
537 // This is recursive!!!!! 564 // This is recursive!!!!!
538 SendGridInstantMessageViaXMLRPCAsync(im, result, 565 SendGridInstantMessageViaXMLRPCAsync(im, result,
539 upd.Handle); 566 upd.RegionID);
540 } 567 }
541 } 568 }
542 else 569 else
543 { 570 {
544 m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", upd.Handle); 571 m_log.WarnFormat("[GRID INSTANT MESSAGE]: Unable to find region {0}", upd.RegionID);
545 HandleUndeliveredMessage(im, result); 572 HandleUndeliveredMessage(im, result);
546 } 573 }
547 } 574 }
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
index 2d4a635..24cbaeb 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/MuteListModule.cs
@@ -37,9 +37,9 @@ using OpenSim.Framework.Client;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39 39
40namespace OpenSim.Region.CoreModules.Avatar.MuteList 40namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
41{ 41{
42 public class MuteListModule : IRegionModule 42 public class MuteListModule : ISharedRegionModule
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45
@@ -47,11 +47,8 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
47 private List<Scene> m_SceneList = new List<Scene>(); 47 private List<Scene> m_SceneList = new List<Scene>();
48 private string m_RestURL = String.Empty; 48 private string m_RestURL = String.Empty;
49 49
50 public void Initialise(Scene scene, IConfigSource config) 50 public void Initialise(IConfigSource config)
51 { 51 {
52 if (!enabled)
53 return;
54
55 IConfig cnf = config.Configs["Messaging"]; 52 IConfig cnf = config.Configs["Messaging"];
56 if (cnf == null) 53 if (cnf == null)
57 { 54 {
@@ -59,39 +56,53 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
59 return; 56 return;
60 } 57 }
61 58
62 if (cnf != null && cnf.GetString( 59 if (cnf != null && cnf.GetString("MuteListModule", "None") !=
63 "MuteListModule", "None") !=
64 "MuteListModule") 60 "MuteListModule")
65 { 61 {
66 enabled = false; 62 enabled = false;
67 return; 63 return;
68 } 64 }
69 65
66 m_RestURL = cnf.GetString("MuteListURL", "");
67 if (m_RestURL == "")
68 {
69 m_log.Error("[MUTE LIST] Module was enabled, but no URL is given, disabling");
70 enabled = false;
71 return;
72 }
73 }
74
75 public void AddRegion(Scene scene)
76 {
77 if (!enabled)
78 return;
79
70 lock (m_SceneList) 80 lock (m_SceneList)
71 { 81 {
72 if (m_SceneList.Count == 0) 82 m_SceneList.Add(scene);
73 {
74 m_RestURL = cnf.GetString("MuteListURL", "");
75 if (m_RestURL == "")
76 {
77 m_log.Error("[MUTE LIST] Module was enabled, but no URL is given, disabling");
78 enabled = false;
79 return;
80 }
81 }
82 if (!m_SceneList.Contains(scene))
83 m_SceneList.Add(scene);
84 83
85 scene.EventManager.OnNewClient += OnNewClient; 84 scene.EventManager.OnNewClient += OnNewClient;
86 } 85 }
87 } 86 }
88 87
89 public void PostInitialise() 88 public void RegionLoaded(Scene scene)
89 {
90 }
91
92 public void RemoveRegion(Scene scene)
90 { 93 {
91 if (!enabled) 94 if (!enabled)
92 return; 95 return;
93 96
94 if (m_SceneList.Count == 0) 97 lock (m_SceneList)
98 {
99 m_SceneList.Remove(scene);
100 }
101 }
102
103 public void PostInitialise()
104 {
105 if (!enabled)
95 return; 106 return;
96 107
97 m_log.Debug("[MUTE LIST] Mute list enabled"); 108 m_log.Debug("[MUTE LIST] Mute list enabled");
@@ -102,26 +113,15 @@ namespace OpenSim.Region.CoreModules.Avatar.MuteList
102 get { return "MuteListModule"; } 113 get { return "MuteListModule"; }
103 } 114 }
104 115
105 public bool IsSharedModule 116 public Type ReplaceableInterface
106 { 117 {
107 get { return true; } 118 get { return null; }
108 } 119 }
109 120
110 public void Close() 121 public void Close()
111 { 122 {
112 } 123 }
113 124
114// private IClientAPI FindClient(UUID agentID)
115// {
116// foreach (Scene s in m_SceneList)
117// {
118// ScenePresence presence = s.GetScenePresence(agentID);
119// if (presence != null && !presence.IsChildAgent)
120// return presence.ControllingClient;
121// }
122// return null;
123// }
124
125 private void OnNewClient(IClientAPI client) 125 private void OnNewClient(IClientAPI client)
126 { 126 {
127 client.OnMuteListRequest += OnMuteListRequest; 127 client.OnMuteListRequest += OnMuteListRequest;
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
index ff38b6f..fdfcd10 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
@@ -40,82 +40,91 @@ using OpenSim.Region.Framework.Scenes;
40 40
41namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 41namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
42{ 42{
43 public class OfflineMessageModule : IRegionModule 43 public class OfflineMessageModule : ISharedRegionModule
44 { 44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46 46
47 private bool enabled = true; 47 private bool enabled = true;
48 private List<Scene> m_SceneList = new List<Scene>(); 48 private List<Scene> m_SceneList = new List<Scene>();
49 private string m_RestURL = String.Empty; 49 private string m_RestURL = String.Empty;
50 IMessageTransferModule m_TransferModule = null;
50 private bool m_ForwardOfflineGroupMessages = true; 51 private bool m_ForwardOfflineGroupMessages = true;
51 52
52 public void Initialise(Scene scene, IConfigSource config) 53 public void Initialise(IConfigSource config)
53 { 54 {
54 if (!enabled)
55 return;
56
57 IConfig cnf = config.Configs["Messaging"]; 55 IConfig cnf = config.Configs["Messaging"];
58 if (cnf == null) 56 if (cnf == null)
59 { 57 {
60 enabled = false; 58 enabled = false;
61 return; 59 return;
62 } 60 }
63 if (cnf != null && cnf.GetString( 61 if (cnf != null && cnf.GetString("OfflineMessageModule", "None") !=
64 "OfflineMessageModule", "None") !=
65 "OfflineMessageModule") 62 "OfflineMessageModule")
66 { 63 {
67 enabled = false; 64 enabled = false;
68 return; 65 return;
69 } 66 }
70 67
71 if (cnf != null) 68 m_RestURL = cnf.GetString("OfflineMessageURL", "");
72 m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", m_ForwardOfflineGroupMessages); 69 if (m_RestURL == "")
70 {
71 m_log.Error("[OFFLINE MESSAGING] Module was enabled, but no URL is given, disabling");
72 enabled = false;
73 return;
74 }
75
76 m_ForwardOfflineGroupMessages = cnf.GetBoolean("ForwardOfflineGroupMessages", m_ForwardOfflineGroupMessages);
77 }
78
79 public void AddRegion(Scene scene)
80 {
81 if (!enabled)
82 return;
73 83
74 lock (m_SceneList) 84 lock (m_SceneList)
75 { 85 {
76 if (m_SceneList.Count == 0) 86 m_SceneList.Add(scene);
77 {
78 m_RestURL = cnf.GetString("OfflineMessageURL", "");
79 if (m_RestURL == "")
80 {
81 m_log.Error("[OFFLINE MESSAGING] Module was enabled, but no URL is given, disabling");
82 enabled = false;
83 return;
84 }
85 }
86 if (!m_SceneList.Contains(scene))
87 m_SceneList.Add(scene);
88 87
89 scene.EventManager.OnNewClient += OnNewClient; 88 scene.EventManager.OnNewClient += OnNewClient;
90 } 89 }
91 } 90 }
92 91
93 public void PostInitialise() 92 public void RegionLoaded(Scene scene)
94 { 93 {
95 if (!enabled) 94 if (!enabled)
96 return; 95 return;
97 96
98 if (m_SceneList.Count == 0) 97 if (m_TransferModule == null)
99 return;
100
101 IMessageTransferModule trans = m_SceneList[0].RequestModuleInterface<IMessageTransferModule>();
102 if (trans == null)
103 { 98 {
104 enabled = false; 99 m_TransferModule = scene.RequestModuleInterface<IMessageTransferModule>();
105 100 if (m_TransferModule == null)
106 lock (m_SceneList)
107 { 101 {
108 foreach (Scene s in m_SceneList) 102 scene.EventManager.OnNewClient -= OnNewClient;
109 s.EventManager.OnNewClient -= OnNewClient;
110 103
104 enabled = false;
111 m_SceneList.Clear(); 105 m_SceneList.Clear();
106
107 m_log.Error("[OFFLINE MESSAGING] No message transfer module is enabled. Diabling offline messages");
112 } 108 }
109 m_TransferModule.OnUndeliveredMessage += UndeliveredMessage;
110 }
111 }
113 112
114 m_log.Error("[OFFLINE MESSAGING] No message transfer module is enabled. Diabling offline messages"); 113 public void RemoveRegion(Scene scene)
114 {
115 if (!enabled)
115 return; 116 return;
117
118 lock (m_SceneList)
119 {
120 m_SceneList.Remove(scene);
116 } 121 }
122 }
117 123
118 trans.OnUndeliveredMessage += UndeliveredMessage; 124 public void PostInitialise()
125 {
126 if (!enabled)
127 return;
119 128
120 m_log.Debug("[OFFLINE MESSAGING] Offline messages enabled"); 129 m_log.Debug("[OFFLINE MESSAGING] Offline messages enabled");
121 } 130 }
@@ -125,9 +134,9 @@ namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
125 get { return "OfflineMessageModule"; } 134 get { return "OfflineMessageModule"; }
126 } 135 }
127 136
128 public bool IsSharedModule 137 public Type ReplaceableInterface
129 { 138 {
130 get { return true; } 139 get { return null; }
131 } 140 }
132 141
133 public void Close() 142 public void Close()
diff --git a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
index f5ab454..267a90a 100644
--- a/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/InstantMessage/PresenceModule.cs
@@ -24,6 +24,7 @@
24 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 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. 25 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
26 */ 26 */
27using System;
27using System.Collections; 28using System.Collections;
28using System.Collections.Generic; 29using System.Collections.Generic;
29using System.Net; 30using System.Net;
@@ -39,404 +40,54 @@ using GridRegion = OpenSim.Services.Interfaces.GridRegion;
39 40
40namespace OpenSim.Region.CoreModules.Avatar.InstantMessage 41namespace OpenSim.Region.CoreModules.Avatar.InstantMessage
41{ 42{
42 public class PresenceModule : IRegionModule, IPresenceModule 43 public class PresenceModule : ISharedRegionModule, IPresenceModule
43 { 44 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 private static readonly ILog m_log = LogManager.GetLogger(
45 46 MethodBase.GetCurrentMethod().DeclaringType);
46 private bool m_Enabled = false;
47 private bool m_Gridmode = false;
48
49 // some default scene for doing things that aren't connected to a specific scene. Avoids locking.
50 private Scene m_initialScene;
51
52 private List<Scene> m_Scenes = new List<Scene>();
53
54 // we currently are only interested in root-agents. If the root isn't here, we don't know the region the
55 // user is in, so we have to ask the messaging server anyway.
56 private Dictionary<UUID, Scene> m_RootAgents =
57 new Dictionary<UUID, Scene>();
58 47
59 public event PresenceChange OnPresenceChange; 48 public event PresenceChange OnPresenceChange;
60 public event BulkPresenceData OnBulkPresenceData; 49 public event BulkPresenceData OnBulkPresenceData;
61 50
62 public void Initialise(Scene scene, IConfigSource config) 51 public void Initialise(IConfigSource config)
63 { 52 {
64 lock (m_Scenes)
65 {
66 // This is a shared module; Initialise will be called for every region on this server.
67 // Only check config once for the first region.
68 if (m_Scenes.Count == 0)
69 {
70 IConfig cnf = config.Configs["Messaging"];
71 if (cnf != null && cnf.GetString(
72 "PresenceModule", "PresenceModule") !=
73 "PresenceModule")
74 return;
75
76 cnf = config.Configs["Startup"];
77 if (cnf != null)
78 m_Gridmode = cnf.GetBoolean("gridmode", false);
79
80 m_Enabled = true;
81
82 m_initialScene = scene;
83 }
84
85 if (m_Gridmode)
86 NotifyMessageServerOfStartup(scene);
87
88 m_Scenes.Add(scene);
89 }
90
91 scene.RegisterModuleInterface<IPresenceModule>(this);
92
93 scene.EventManager.OnNewClient += OnNewClient;
94 scene.EventManager.OnSetRootAgentScene += OnSetRootAgentScene;
95 scene.EventManager.OnMakeChildAgent += OnMakeChildAgent;
96 } 53 }
97 54
98 public void PostInitialise() 55 public void AddRegion(Scene scene)
99 { 56 {
100 } 57 }
101 58
102 public void Close() 59 public void RegionLoaded(Scene scene)
103 { 60 {
104 if (!m_Gridmode || !m_Enabled)
105 return;
106
107 if (OnPresenceChange != null)
108 {
109 lock (m_RootAgents)
110 {
111 // on shutdown, users are kicked, too
112 foreach (KeyValuePair<UUID, Scene> pair in m_RootAgents)
113 {
114 OnPresenceChange(new PresenceInfo(pair.Key, UUID.Zero));
115 }
116 }
117 }
118
119 lock (m_Scenes)
120 {
121 foreach (Scene scene in m_Scenes)
122 NotifyMessageServerOfShutdown(scene);
123 }
124 } 61 }
125 62
126 public string Name 63 public void RemoveRegion(Scene scene)
127 { 64 {
128 get { return "PresenceModule"; }
129 }
130
131 public bool IsSharedModule
132 {
133 get { return true; }
134 }
135
136 public void RequestBulkPresenceData(UUID[] users)
137 {
138 if (OnBulkPresenceData != null)
139 {
140 PresenceInfo[] result = new PresenceInfo[users.Length];
141 if (m_Gridmode)
142 {
143 // first check the local information
144 List<UUID> uuids = new List<UUID>(); // the uuids to check remotely
145 List<int> indices = new List<int>(); // just for performance.
146 lock (m_RootAgents)
147 {
148 for (int i = 0; i < uuids.Count; ++i)
149 {
150 Scene scene;
151 if (m_RootAgents.TryGetValue(users[i], out scene))
152 {
153 result[i] = new PresenceInfo(users[i], scene.RegionInfo.RegionID);
154 }
155 else
156 {
157 uuids.Add(users[i]);
158 indices.Add(i);
159 }
160 }
161 }
162
163 // now we have filtered out all the local root agents. The rest we have to request info about
164 Dictionary<UUID, FriendRegionInfo> infos = m_initialScene.GetFriendRegionInfos(uuids);
165 for (int i = 0; i < uuids.Count; ++i)
166 {
167 FriendRegionInfo info;
168 if (infos.TryGetValue(uuids[i], out info) && info.isOnline)
169 {
170 UUID regionID = info.regionID;
171 if (regionID == UUID.Zero)
172 {
173 // TODO this is the old messaging-server protocol; only the regionHandle is available.
174 // Fetch region-info to get the id
175 uint x = 0, y = 0;
176 Utils.LongToUInts(info.regionHandle, out x, out y);
177 GridRegion regionInfo = m_initialScene.GridService.GetRegionByPosition(m_initialScene.RegionInfo.ScopeID,
178 (int)x, (int)y);
179 regionID = regionInfo.RegionID;
180 }
181 result[indices[i]] = new PresenceInfo(uuids[i], regionID);
182 }
183 else result[indices[i]] = new PresenceInfo(uuids[i], UUID.Zero);
184 }
185 }
186 else
187 {
188 // in standalone mode, we have all the info locally available.
189 lock (m_RootAgents)
190 {
191 for (int i = 0; i < users.Length; ++i)
192 {
193 Scene scene;
194 if (m_RootAgents.TryGetValue(users[i], out scene))
195 {
196 result[i] = new PresenceInfo(users[i], scene.RegionInfo.RegionID);
197 }
198 else
199 {
200 result[i] = new PresenceInfo(users[i], UUID.Zero);
201 }
202 }
203 }
204 }
205
206 // tell everyone
207 OnBulkPresenceData(result);
208 }
209 }
210
211 // new client doesn't mean necessarily that user logged in, it just means it entered one of the
212 // the regions on this server
213 public void OnNewClient(IClientAPI client)
214 {
215 client.OnConnectionClosed += OnConnectionClosed;
216 client.OnLogout += OnLogout;
217
218 // KLUDGE: See handler for details.
219 client.OnEconomyDataRequest += OnEconomyDataRequest;
220 } 65 }
221 66
222 // connection closed just means *one* client connection has been closed. It doesn't mean that the 67 public void PostInitialise()
223 // user has logged off; it might have just TPed away.
224 public void OnConnectionClosed(IClientAPI client)
225 {
226 // TODO: Have to think what we have to do here...
227 // Should we just remove the root from the list (if scene matches)?
228 if (!(client.Scene is Scene))
229 return;
230 Scene scene = (Scene)client.Scene;
231
232 lock (m_RootAgents)
233 {
234 Scene rootScene;
235 if (!(m_RootAgents.TryGetValue(client.AgentId, out rootScene)) || scene != rootScene)
236 return;
237
238 m_RootAgents.Remove(client.AgentId);
239 }
240
241 // Should it have logged off, we'll do the logout part in OnLogout, even if no root is stored
242 // anymore. It logged off, after all...
243 }
244
245 // Triggered when the user logs off.
246 public void OnLogout(IClientAPI client)
247 {
248 if (!(client.Scene is Scene))
249 return;
250 Scene scene = (Scene)client.Scene;
251
252 // On logout, we really remove the client from rootAgents, even if the scene doesn't match
253 lock (m_RootAgents)
254 {
255 if (m_RootAgents.ContainsKey(client.AgentId)) m_RootAgents.Remove(client.AgentId);
256 }
257
258 // now inform the messaging server and anyone who is interested
259 NotifyMessageServerOfAgentLeaving(client.AgentId, scene.RegionInfo.RegionID, scene.RegionInfo.RegionHandle);
260 if (OnPresenceChange != null) OnPresenceChange(new PresenceInfo(client.AgentId, UUID.Zero));
261 }
262
263 public void OnSetRootAgentScene(UUID agentID, Scene scene)
264 {
265 // OnSetRootAgentScene can be called from several threads at once (with different agentID).
266 // Concurrent access to m_RootAgents is prone to failure on multi-core/-processor systems without
267 // correct locking).
268 lock (m_RootAgents)
269 {
270 Scene rootScene;
271 if (m_RootAgents.TryGetValue(agentID, out rootScene) && scene == rootScene)
272 {
273 return;
274 }
275 m_RootAgents[agentID] = scene;
276 }
277
278 // inform messaging server that agent changed the region
279 Util.FireAndForget(
280 delegate(object o)
281 {
282 NotifyMessageServerOfAgentLocation(agentID, scene.RegionInfo.RegionID, scene.RegionInfo.RegionHandle);
283 }
284 );
285 }
286
287 private void OnEconomyDataRequest(UUID agentID)
288 { 68 {
289 // KLUDGE: This is the only way I found to get a message (only) after login was completed and the
290 // client is connected enough to receive UDP packets.
291 // This packet seems to be sent only once, just after connection was established to the first
292 // region after login.
293 // We use it here to trigger a presence update; the old update-on-login was never be heard by
294 // the freshly logged in viewer, as it wasn't connected to the region at that time.
295 // TODO: Feel free to replace this by a better solution if you find one.
296
297 // get the agent. This should work every time, as we just got a packet from it
298 ScenePresence agent = null;
299 lock (m_Scenes)
300 {
301 foreach (Scene scene in m_Scenes)
302 {
303 agent = scene.GetScenePresence(agentID);
304 if (agent != null) break;
305 }
306 }
307
308 // just to be paranoid...
309 if (agent == null)
310 {
311 m_log.ErrorFormat("[PRESENCE]: Got a packet from agent {0} who can't be found anymore!?", agentID);
312 return;
313 }
314
315 // we are a bit premature here, but the next packet will switch this child agent to root.
316 if (OnPresenceChange != null) OnPresenceChange(new PresenceInfo(agentID, agent.Scene.RegionInfo.RegionID));
317 } 69 }
318 70
319 public void OnMakeChildAgent(ScenePresence agent) 71 public void Close()
320 { 72 {
321 // OnMakeChildAgent can be called from several threads at once (with different agent).
322 // Concurrent access to m_RootAgents is prone to failure on multi-core/-processor systems without
323 // correct locking).
324 lock (m_RootAgents)
325 {
326 Scene rootScene;
327 if (m_RootAgents.TryGetValue(agent.UUID, out rootScene) && agent.Scene == rootScene)
328 {
329 m_RootAgents.Remove(agent.UUID);
330 }
331 }
332 // don't notify the messaging-server; either this agent just had been downgraded and another one will be upgraded
333 // to root momentarily (which will notify the messaging-server), or possibly it will be closed in a moment,
334 // which will update the messaging-server, too.
335 } 73 }
336 74
337 private void NotifyMessageServerOfStartup(Scene scene) 75 public string Name
338 { 76 {
339 Hashtable xmlrpcdata = new Hashtable(); 77 get { return "PresenceModule"; }
340 xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString();
341 ArrayList SendParams = new ArrayList();
342 SendParams.Add(xmlrpcdata);
343 try
344 {
345 XmlRpcRequest UpRequest = new XmlRpcRequest("region_startup", SendParams);
346 XmlRpcResponse resp = UpRequest.Send(scene.CommsManager.NetworkServersInfo.MessagingURL, 5000);
347
348 Hashtable responseData = (Hashtable)resp.Value;
349 if (responseData == null || (!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
350 {
351 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
352 }
353 }
354 catch (WebException)
355 {
356 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region startup for region {0}", scene.RegionInfo.RegionName);
357 }
358 } 78 }
359 79
360 private void NotifyMessageServerOfShutdown(Scene scene) 80 public Type ReplaceableInterface
361 { 81 {
362 if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty) 82 get { return null; }
363 return;
364
365 Hashtable xmlrpcdata = new Hashtable();
366 xmlrpcdata["RegionUUID"] = scene.RegionInfo.RegionID.ToString();
367 ArrayList SendParams = new ArrayList();
368 SendParams.Add(xmlrpcdata);
369 try
370 {
371 XmlRpcRequest DownRequest = new XmlRpcRequest("region_shutdown", SendParams);
372 XmlRpcResponse resp = DownRequest.Send(scene.CommsManager.NetworkServersInfo.MessagingURL, 5000);
373
374 Hashtable responseData = (Hashtable)resp.Value;
375 if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
376 {
377 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
378 }
379 }
380 catch (WebException)
381 {
382 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of region shutdown for region {0}", scene.RegionInfo.RegionName);
383 }
384 } 83 }
385 84
386 private void NotifyMessageServerOfAgentLocation(UUID agentID, UUID region, ulong regionHandle) 85 public void RequestBulkPresenceData(UUID[] users)
387 { 86 {
388 if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
389 return;
390
391 Hashtable xmlrpcdata = new Hashtable();
392 xmlrpcdata["AgentID"] = agentID.ToString();
393 xmlrpcdata["RegionUUID"] = region.ToString();
394 xmlrpcdata["RegionHandle"] = regionHandle.ToString();
395 ArrayList SendParams = new ArrayList();
396 SendParams.Add(xmlrpcdata);
397 try
398 {
399 XmlRpcRequest LocationRequest = new XmlRpcRequest("agent_location", SendParams);
400 XmlRpcResponse resp = LocationRequest.Send(m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL, 5000);
401
402 Hashtable responseData = (Hashtable)resp.Value;
403 if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
404 {
405 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
406 }
407 }
408 catch (WebException)
409 {
410 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent location for {0}", agentID.ToString());
411 }
412 } 87 }
413 88
414 private void NotifyMessageServerOfAgentLeaving(UUID agentID, UUID region, ulong regionHandle) 89 public void OnNewClient(IClientAPI client)
415 { 90 {
416 if (m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL == string.Empty)
417 return;
418
419 Hashtable xmlrpcdata = new Hashtable();
420 xmlrpcdata["AgentID"] = agentID.ToString();
421 xmlrpcdata["RegionUUID"] = region.ToString();
422 xmlrpcdata["RegionHandle"] = regionHandle.ToString();
423 ArrayList SendParams = new ArrayList();
424 SendParams.Add(xmlrpcdata);
425 try
426 {
427 XmlRpcRequest LeavingRequest = new XmlRpcRequest("agent_leaving", SendParams);
428 XmlRpcResponse resp = LeavingRequest.Send(m_Scenes[0].CommsManager.NetworkServersInfo.MessagingURL, 5000);
429
430 Hashtable responseData = (Hashtable)resp.Value;
431 if ((!responseData.ContainsKey("success")) || (string)responseData["success"] != "TRUE")
432 {
433 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
434 }
435 }
436 catch (WebException)
437 {
438 m_log.ErrorFormat("[PRESENCE]: Failed to notify message server of agent leaving for {0}", agentID.ToString());
439 }
440 } 91 }
441 } 92 }
442} 93}
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
index 160a9bd..65ad703 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveReadRequest.cs
@@ -37,7 +37,7 @@ using log4net;
37using OpenMetaverse; 37using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Cache; 40
41using OpenSim.Framework.Communications.Osp; 41using OpenSim.Framework.Communications.Osp;
42using OpenSim.Framework.Serialization; 42using OpenSim.Framework.Serialization;
43using OpenSim.Framework.Serialization.External; 43using OpenSim.Framework.Serialization.External;
@@ -53,7 +53,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
53 53
54 protected TarArchiveReader archive; 54 protected TarArchiveReader archive;
55 55
56 private CachedUserInfo m_userInfo; 56 private UserAccount m_userInfo;
57 private string m_invPath; 57 private string m_invPath;
58 58
59 /// <value> 59 /// <value>
@@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
67 private Stream m_loadStream; 67 private Stream m_loadStream;
68 68
69 public InventoryArchiveReadRequest( 69 public InventoryArchiveReadRequest(
70 Scene scene, CachedUserInfo userInfo, string invPath, string loadPath) 70 Scene scene, UserAccount userInfo, string invPath, string loadPath)
71 : this( 71 : this(
72 scene, 72 scene,
73 userInfo, 73 userInfo,
@@ -77,7 +77,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
77 } 77 }
78 78
79 public InventoryArchiveReadRequest( 79 public InventoryArchiveReadRequest(
80 Scene scene, CachedUserInfo userInfo, string invPath, Stream loadStream) 80 Scene scene, UserAccount userInfo, string invPath, Stream loadStream)
81 { 81 {
82 m_scene = scene; 82 m_scene = scene;
83 m_userInfo = userInfo; 83 m_userInfo = userInfo;
@@ -103,7 +103,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
103 //InventoryFolderImpl rootDestinationFolder = m_userInfo.RootFolder.FindFolderByPath(m_invPath); 103 //InventoryFolderImpl rootDestinationFolder = m_userInfo.RootFolder.FindFolderByPath(m_invPath);
104 InventoryFolderBase rootDestinationFolder 104 InventoryFolderBase rootDestinationFolder
105 = InventoryArchiveUtils.FindFolderByPath( 105 = InventoryArchiveUtils.FindFolderByPath(
106 m_scene.InventoryService, m_userInfo.UserProfile.ID, m_invPath); 106 m_scene.InventoryService, m_userInfo.PrincipalID, m_invPath);
107 107
108 if (null == rootDestinationFolder) 108 if (null == rootDestinationFolder)
109 { 109 {
@@ -280,7 +280,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
280 // even though there is a AssetType.RootCategory 280 // even though there is a AssetType.RootCategory
281 destFolder 281 destFolder
282 = new InventoryFolderBase( 282 = new InventoryFolderBase(
283 newFolderId, newFolderName, m_userInfo.UserProfile.ID, 283 newFolderId, newFolderName, m_userInfo.PrincipalID,
284 (short)AssetType.Unknown, destFolder.ID, 1); 284 (short)AssetType.Unknown, destFolder.ID, 1);
285 m_scene.InventoryService.AddFolder(destFolder); 285 m_scene.InventoryService.AddFolder(destFolder);
286 286
@@ -357,7 +357,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
357 // Don't use the item ID that's in the file 357 // Don't use the item ID that's in the file
358 item.ID = UUID.Random(); 358 item.ID = UUID.Random();
359 359
360 UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.CommsManager); 360 UUID ospResolvedId = OspResolver.ResolveOspa(item.CreatorId, m_scene.UserAccountService);
361 if (UUID.Zero != ospResolvedId) 361 if (UUID.Zero != ospResolvedId)
362 { 362 {
363 item.CreatorIdAsUuid = ospResolvedId; 363 item.CreatorIdAsUuid = ospResolvedId;
@@ -368,10 +368,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
368 } 368 }
369 else 369 else
370 { 370 {
371 item.CreatorIdAsUuid = m_userInfo.UserProfile.ID; 371 item.CreatorIdAsUuid = m_userInfo.PrincipalID;
372 } 372 }
373 373
374 item.Owner = m_userInfo.UserProfile.ID; 374 item.Owner = m_userInfo.PrincipalID;
375 375
376 // Reset folder ID to the one in which we want to load it 376 // Reset folder ID to the one in which we want to load it
377 item.Folder = loadFolder.ID; 377 item.Folder = loadFolder.ID;
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
index 98b686e..ef10104 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
@@ -37,10 +37,11 @@ using OpenSim.Framework;
37using OpenSim.Framework.Serialization; 37using OpenSim.Framework.Serialization;
38using OpenSim.Framework.Serialization.External; 38using OpenSim.Framework.Serialization.External;
39using OpenSim.Framework.Communications; 39using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Cache; 40
41using OpenSim.Framework.Communications.Osp; 41using OpenSim.Framework.Communications.Osp;
42using OpenSim.Region.CoreModules.World.Archiver; 42using OpenSim.Region.CoreModules.World.Archiver;
43using OpenSim.Region.Framework.Scenes; 43using OpenSim.Region.Framework.Scenes;
44using OpenSim.Services.Interfaces;
44 45
45namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver 46namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
46{ 47{
@@ -54,7 +55,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
54 private const string STAR_WILDCARD = "*"; 55 private const string STAR_WILDCARD = "*";
55 56
56 private InventoryArchiverModule m_module; 57 private InventoryArchiverModule m_module;
57 private CachedUserInfo m_userInfo; 58 private UserAccount m_userInfo;
58 private string m_invPath; 59 private string m_invPath;
59 protected TarArchiveWriter m_archiveWriter; 60 protected TarArchiveWriter m_archiveWriter;
60 protected UuidGatherer m_assetGatherer; 61 protected UuidGatherer m_assetGatherer;
@@ -89,7 +90,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
89 /// </summary> 90 /// </summary>
90 public InventoryArchiveWriteRequest( 91 public InventoryArchiveWriteRequest(
91 Guid id, InventoryArchiverModule module, Scene scene, 92 Guid id, InventoryArchiverModule module, Scene scene,
92 CachedUserInfo userInfo, string invPath, string savePath) 93 UserAccount userInfo, string invPath, string savePath)
93 : this( 94 : this(
94 id, 95 id,
95 module, 96 module,
@@ -105,7 +106,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
105 /// </summary> 106 /// </summary>
106 public InventoryArchiveWriteRequest( 107 public InventoryArchiveWriteRequest(
107 Guid id, InventoryArchiverModule module, Scene scene, 108 Guid id, InventoryArchiverModule module, Scene scene,
108 CachedUserInfo userInfo, string invPath, Stream saveStream) 109 UserAccount userInfo, string invPath, Stream saveStream)
109 { 110 {
110 m_id = id; 111 m_id = id;
111 m_module = module; 112 m_module = module;
@@ -148,7 +149,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
148 m_userUuids[inventoryItem.CreatorIdAsUuid] = 1; 149 m_userUuids[inventoryItem.CreatorIdAsUuid] = 1;
149 150
150 InventoryItemBase saveItem = (InventoryItemBase)inventoryItem.Clone(); 151 InventoryItemBase saveItem = (InventoryItemBase)inventoryItem.Clone();
151 saveItem.CreatorId = OspResolver.MakeOspa(saveItem.CreatorIdAsUuid, m_scene.CommsManager); 152 saveItem.CreatorId = OspResolver.MakeOspa(saveItem.CreatorIdAsUuid, m_scene.UserAccountService);
152 153
153 string serialization = UserInventoryItemSerializer.Serialize(saveItem); 154 string serialization = UserInventoryItemSerializer.Serialize(saveItem);
154 m_archiveWriter.WriteFile(filename, serialization); 155 m_archiveWriter.WriteFile(filename, serialization);
@@ -215,7 +216,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
215 { 216 {
216 InventoryFolderBase inventoryFolder = null; 217 InventoryFolderBase inventoryFolder = null;
217 InventoryItemBase inventoryItem = null; 218 InventoryItemBase inventoryItem = null;
218 InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.UserProfile.ID); 219 InventoryFolderBase rootFolder = m_scene.InventoryService.GetRootFolder(m_userInfo.PrincipalID);
219 220
220 bool foundStar = false; 221 bool foundStar = false;
221 222
@@ -318,14 +319,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
318 foreach (UUID creatorId in m_userUuids.Keys) 319 foreach (UUID creatorId in m_userUuids.Keys)
319 { 320 {
320 // Record the creator of this item 321 // Record the creator of this item
321 CachedUserInfo creator 322 UserAccount creator = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, creatorId);
322 = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(creatorId);
323 323
324 if (creator != null) 324 if (creator != null)
325 { 325 {
326 m_archiveWriter.WriteFile( 326 m_archiveWriter.WriteFile(
327 ArchiveConstants.USERS_PATH + creator.UserProfile.Name + ".xml", 327 ArchiveConstants.USERS_PATH + creator.FirstName + " " + creator.LastName + ".xml",
328 UserProfileSerializer.Serialize(creator.UserProfile)); 328 UserProfileSerializer.Serialize(creator.PrincipalID, creator.FirstName, creator.LastName));
329 } 329 }
330 else 330 else
331 { 331 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
index ecd60bd..b055f8b 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
@@ -34,7 +34,7 @@ using Nini.Config;
34using OpenMetaverse; 34using OpenMetaverse;
35using OpenSim.Framework; 35using OpenSim.Framework;
36using OpenSim.Framework.Communications; 36using OpenSim.Framework.Communications;
37using OpenSim.Framework.Communications.Cache; 37
38using OpenSim.Region.Framework.Interfaces; 38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Region.Framework.Scenes; 39using OpenSim.Region.Framework.Scenes;
40using OpenSim.Services.Interfaces; 40using OpenSim.Services.Interfaces;
@@ -113,7 +113,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
113 /// Trigger the inventory archive saved event. 113 /// Trigger the inventory archive saved event.
114 /// </summary> 114 /// </summary>
115 protected internal void TriggerInventoryArchiveSaved( 115 protected internal void TriggerInventoryArchiveSaved(
116 Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, 116 Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
117 Exception reportedException) 117 Exception reportedException)
118 { 118 {
119 InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved; 119 InventoryArchiveSaved handlerInventoryArchiveSaved = OnInventoryArchiveSaved;
@@ -125,11 +125,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
125 { 125 {
126 if (m_scenes.Count > 0) 126 if (m_scenes.Count > 0)
127 { 127 {
128 CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); 128 UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
129 129
130 if (userInfo != null) 130 if (userInfo != null)
131 { 131 {
132 if (CheckPresence(userInfo.UserProfile.ID)) 132 if (CheckPresence(userInfo.PrincipalID))
133 { 133 {
134 new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, saveStream).Execute(); 134 new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, saveStream).Execute();
135 return true; 135 return true;
@@ -137,8 +137,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
137 else 137 else
138 { 138 {
139 m_log.ErrorFormat( 139 m_log.ErrorFormat(
140 "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", 140 "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator",
141 userInfo.UserProfile.Name, userInfo.UserProfile.ID); 141 userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID);
142 } 142 }
143 } 143 }
144 } 144 }
@@ -150,11 +150,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
150 { 150 {
151 if (m_scenes.Count > 0) 151 if (m_scenes.Count > 0)
152 { 152 {
153 CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); 153 UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
154 154
155 if (userInfo != null) 155 if (userInfo != null)
156 { 156 {
157 if (CheckPresence(userInfo.UserProfile.ID)) 157 if (CheckPresence(userInfo.PrincipalID))
158 { 158 {
159 new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, savePath).Execute(); 159 new InventoryArchiveWriteRequest(id, this, m_aScene, userInfo, invPath, savePath).Execute();
160 return true; 160 return true;
@@ -162,8 +162,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
162 else 162 else
163 { 163 {
164 m_log.ErrorFormat( 164 m_log.ErrorFormat(
165 "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", 165 "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator",
166 userInfo.UserProfile.Name, userInfo.UserProfile.ID); 166 userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID);
167 } 167 }
168 } 168 }
169 } 169 }
@@ -175,11 +175,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
175 { 175 {
176 if (m_scenes.Count > 0) 176 if (m_scenes.Count > 0)
177 { 177 {
178 CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); 178 UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
179 179
180 if (userInfo != null) 180 if (userInfo != null)
181 { 181 {
182 if (CheckPresence(userInfo.UserProfile.ID)) 182 if (CheckPresence(userInfo.PrincipalID))
183 { 183 {
184 InventoryArchiveReadRequest request = 184 InventoryArchiveReadRequest request =
185 new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream); 185 new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadStream);
@@ -190,8 +190,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
190 else 190 else
191 { 191 {
192 m_log.ErrorFormat( 192 m_log.ErrorFormat(
193 "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", 193 "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator",
194 userInfo.UserProfile.Name, userInfo.UserProfile.ID); 194 userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID);
195 } 195 }
196 } 196 }
197 } 197 }
@@ -203,11 +203,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
203 { 203 {
204 if (m_scenes.Count > 0) 204 if (m_scenes.Count > 0)
205 { 205 {
206 CachedUserInfo userInfo = GetUserInfo(firstName, lastName, pass); 206 UserAccount userInfo = GetUserInfo(firstName, lastName, pass);
207 207
208 if (userInfo != null) 208 if (userInfo != null)
209 { 209 {
210 if (CheckPresence(userInfo.UserProfile.ID)) 210 if (CheckPresence(userInfo.PrincipalID))
211 { 211 {
212 InventoryArchiveReadRequest request = 212 InventoryArchiveReadRequest request =
213 new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath); 213 new InventoryArchiveReadRequest(m_aScene, userInfo, invPath, loadPath);
@@ -218,8 +218,8 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
218 else 218 else
219 { 219 {
220 m_log.ErrorFormat( 220 m_log.ErrorFormat(
221 "[INVENTORY ARCHIVER]: User {0} {1} not logged in to this region simulator", 221 "[INVENTORY ARCHIVER]: User {0} {1} {2} not logged in to this region simulator",
222 userInfo.UserProfile.Name, userInfo.UserProfile.ID); 222 userInfo.FirstName, userInfo.LastName, userInfo.PrincipalID);
223 } 223 }
224 } 224 }
225 } 225 }
@@ -291,7 +291,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
291 } 291 }
292 292
293 private void SaveInvConsoleCommandCompleted( 293 private void SaveInvConsoleCommandCompleted(
294 Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, 294 Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
295 Exception reportedException) 295 Exception reportedException)
296 { 296 {
297 lock (m_pendingConsoleSaves) 297 lock (m_pendingConsoleSaves)
@@ -304,13 +304,13 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
304 304
305 if (succeeded) 305 if (succeeded)
306 { 306 {
307 m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive for {0}", userInfo.UserProfile.Name); 307 m_log.InfoFormat("[INVENTORY ARCHIVER]: Saved archive for {0} {1}", userInfo.FirstName, userInfo.LastName);
308 } 308 }
309 else 309 else
310 { 310 {
311 m_log.ErrorFormat( 311 m_log.ErrorFormat(
312 "[INVENTORY ARCHIVER]: Archive save for {0} failed - {1}", 312 "[INVENTORY ARCHIVER]: Archive save for {0} {1} failed - {2}",
313 userInfo.UserProfile.Name, reportedException.Message); 313 userInfo.FirstName, userInfo.LastName, reportedException.Message);
314 } 314 }
315 } 315 }
316 316
@@ -321,11 +321,10 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
321 /// <param name="lastName"></param> 321 /// <param name="lastName"></param>
322 /// <param name="pass">User password</param> 322 /// <param name="pass">User password</param>
323 /// <returns></returns> 323 /// <returns></returns>
324 protected CachedUserInfo GetUserInfo(string firstName, string lastName, string pass) 324 protected UserAccount GetUserInfo(string firstName, string lastName, string pass)
325 { 325 {
326 CachedUserInfo userInfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(firstName, lastName); 326 UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, firstName, lastName);
327 //m_aScene.CommsManager.UserService.GetUserProfile(firstName, lastName); 327 if (null == account)
328 if (null == userInfo)
329 { 328 {
330 m_log.ErrorFormat( 329 m_log.ErrorFormat(
331 "[INVENTORY ARCHIVER]: Failed to find user info for {0} {1}", 330 "[INVENTORY ARCHIVER]: Failed to find user info for {0} {1}",
@@ -335,9 +334,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
335 334
336 try 335 try
337 { 336 {
338 if (m_aScene.CommsManager.UserService.AuthenticateUserByPassword(userInfo.UserProfile.ID, pass)) 337 if (m_aScene.AuthenticationService.Authenticate(account.PrincipalID, pass, 1) != string.Empty)
339 { 338 {
340 return userInfo; 339 return account;
341 } 340 }
342 else 341 else
343 { 342 {
@@ -358,14 +357,14 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver
358 /// Notify the client of loaded nodes if they are logged in 357 /// Notify the client of loaded nodes if they are logged in
359 /// </summary> 358 /// </summary>
360 /// <param name="loadedNodes">Can be empty. In which case, nothing happens</param> 359 /// <param name="loadedNodes">Can be empty. In which case, nothing happens</param>
361 private void UpdateClientWithLoadedNodes(CachedUserInfo userInfo, List<InventoryNodeBase> loadedNodes) 360 private void UpdateClientWithLoadedNodes(UserAccount userInfo, List<InventoryNodeBase> loadedNodes)
362 { 361 {
363 if (loadedNodes.Count == 0) 362 if (loadedNodes.Count == 0)
364 return; 363 return;
365 364
366 foreach (Scene scene in m_scenes.Values) 365 foreach (Scene scene in m_scenes.Values)
367 { 366 {
368 ScenePresence user = scene.GetScenePresence(userInfo.UserProfile.ID); 367 ScenePresence user = scene.GetScenePresence(userInfo.PrincipalID);
369 368
370 if (user != null && !user.IsChildAgent) 369 if (user != null && !user.IsChildAgent)
371 { 370 {
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
index e4dad18..9c95e78 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/Tests/InventoryArchiverTests.cs
@@ -38,7 +38,7 @@ using OpenSim.Framework;
38using OpenSim.Framework.Serialization; 38using OpenSim.Framework.Serialization;
39using OpenSim.Framework.Serialization.External; 39using OpenSim.Framework.Serialization.External;
40using OpenSim.Framework.Communications; 40using OpenSim.Framework.Communications;
41using OpenSim.Framework.Communications.Cache; 41
42using OpenSim.Framework.Communications.Osp; 42using OpenSim.Framework.Communications.Osp;
43using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 43using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
44using OpenSim.Region.CoreModules.World.Serialiser; 44using OpenSim.Region.CoreModules.World.Serialiser;
@@ -65,7 +65,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
65 } 65 }
66 66
67 private void SaveCompleted( 67 private void SaveCompleted(
68 Guid id, bool succeeded, CachedUserInfo userInfo, string invPath, Stream saveStream, 68 Guid id, bool succeeded, UserAccount userInfo, string invPath, Stream saveStream,
69 Exception reportedException) 69 Exception reportedException)
70 { 70 {
71 mre.Set(); 71 mre.Set();
@@ -76,124 +76,126 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
76 /// </summary> 76 /// </summary>
77 // Commenting for now! The mock inventory service needs more beef, at least for 77 // Commenting for now! The mock inventory service needs more beef, at least for
78 // GetFolderForType 78 // GetFolderForType
79 [Test] 79 // REFACTORING PROBLEM. This needs to be rewritten.
80 public void TestSaveIarV0_1() 80
81 { 81// [Test]
82 TestHelper.InMethod(); 82// public void TestSaveIarV0_1()
83 //log4net.Config.XmlConfigurator.Configure(); 83// {
84 84// TestHelper.InMethod();
85 InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); 85// //log4net.Config.XmlConfigurator.Configure();
86 86
87 Scene scene = SceneSetupHelpers.SetupScene("Inventory"); 87// InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
88 SceneSetupHelpers.SetupSceneModules(scene, archiverModule); 88
89 CommunicationsManager cm = scene.CommsManager; 89// Scene scene = SceneSetupHelpers.SetupScene("Inventory");
90 90// SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
91 // Create user 91// CommunicationsManager cm = scene.CommsManager;
92 string userFirstName = "Jock"; 92
93 string userLastName = "Stirrup"; 93// // Create user
94 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020"); 94// string userFirstName = "Jock";
95 95// string userLastName = "Stirrup";
96 lock (this) 96// UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
97 { 97
98 UserProfileTestUtils.CreateUserWithInventory( 98// lock (this)
99 cm, userFirstName, userLastName, userId, InventoryReceived); 99// {
100 Monitor.Wait(this, 60000); 100// UserProfileTestUtils.CreateUserWithInventory(
101 } 101// cm, userFirstName, userLastName, userId, InventoryReceived);
102 102// Monitor.Wait(this, 60000);
103 // Create asset 103// }
104 SceneObjectGroup object1; 104
105 SceneObjectPart part1; 105// // Create asset
106 { 106// SceneObjectGroup object1;
107 string partName = "My Little Dog Object"; 107// SceneObjectPart part1;
108 UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040"); 108// {
109 PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere(); 109// string partName = "My Little Dog Object";
110 Vector3 groupPosition = new Vector3(10, 20, 30); 110// UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
111 Quaternion rotationOffset = new Quaternion(20, 30, 40, 50); 111// PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
112 Vector3 offsetPosition = new Vector3(5, 10, 15); 112// Vector3 groupPosition = new Vector3(10, 20, 30);
113 113// Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
114 part1 114// Vector3 offsetPosition = new Vector3(5, 10, 15);
115 = new SceneObjectPart( 115
116 ownerId, shape, groupPosition, rotationOffset, offsetPosition); 116// part1
117 part1.Name = partName; 117// = new SceneObjectPart(
118 118// ownerId, shape, groupPosition, rotationOffset, offsetPosition);
119 object1 = new SceneObjectGroup(part1); 119// part1.Name = partName;
120 scene.AddNewSceneObject(object1, false); 120
121 } 121// object1 = new SceneObjectGroup(part1);
122 122// scene.AddNewSceneObject(object1, false);
123 UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060"); 123// }
124 AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1); 124
125 scene.AssetService.Store(asset1); 125// UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
126 126// AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
127 // Create item 127// scene.AssetService.Store(asset1);
128 UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080"); 128
129 InventoryItemBase item1 = new InventoryItemBase(); 129// // Create item
130 item1.Name = "My Little Dog"; 130// UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
131 item1.AssetID = asset1.FullID; 131// InventoryItemBase item1 = new InventoryItemBase();
132 item1.ID = item1Id; 132// item1.Name = "My Little Dog";
133 InventoryFolderBase objsFolder 133// item1.AssetID = asset1.FullID;
134 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects"); 134// item1.ID = item1Id;
135 item1.Folder = objsFolder.ID; 135// InventoryFolderBase objsFolder
136 scene.AddInventoryItem(userId, item1); 136// = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects");
137 137// item1.Folder = objsFolder.ID;
138 MemoryStream archiveWriteStream = new MemoryStream(); 138// scene.AddInventoryItem(userId, item1);
139 archiverModule.OnInventoryArchiveSaved += SaveCompleted; 139
140 140// MemoryStream archiveWriteStream = new MemoryStream();
141 mre.Reset(); 141// archiverModule.OnInventoryArchiveSaved += SaveCompleted;
142 archiverModule.ArchiveInventory( 142
143 Guid.NewGuid(), userFirstName, userLastName, "Objects", "troll", archiveWriteStream); 143// mre.Reset();
144 mre.WaitOne(60000, false); 144// archiverModule.ArchiveInventory(
145 145// Guid.NewGuid(), userFirstName, userLastName, "Objects", "troll", archiveWriteStream);
146 byte[] archive = archiveWriteStream.ToArray(); 146// mre.WaitOne(60000, false);
147 MemoryStream archiveReadStream = new MemoryStream(archive); 147
148 TarArchiveReader tar = new TarArchiveReader(archiveReadStream); 148// byte[] archive = archiveWriteStream.ToArray();
149 149// MemoryStream archiveReadStream = new MemoryStream(archive);
150 //bool gotControlFile = false; 150// TarArchiveReader tar = new TarArchiveReader(archiveReadStream);
151 bool gotObject1File = false; 151
152 //bool gotObject2File = false; 152// //bool gotControlFile = false;
153 string expectedObject1FileName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1); 153// bool gotObject1File = false;
154 string expectedObject1FilePath = string.Format( 154// //bool gotObject2File = false;
155 "{0}{1}{2}", 155// string expectedObject1FileName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1);
156 ArchiveConstants.INVENTORY_PATH, 156// string expectedObject1FilePath = string.Format(
157 InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder), 157// "{0}{1}{2}",
158 expectedObject1FileName); 158// ArchiveConstants.INVENTORY_PATH,
159 159// InventoryArchiveWriteRequest.CreateArchiveFolderName(objsFolder),
160 string filePath; 160// expectedObject1FileName);
161 TarArchiveReader.TarEntryType tarEntryType; 161
162 162// string filePath;
163 Console.WriteLine("Reading archive"); 163// TarArchiveReader.TarEntryType tarEntryType;
164 164
165 while (tar.ReadEntry(out filePath, out tarEntryType) != null) 165// Console.WriteLine("Reading archive");
166 { 166
167 Console.WriteLine("Got {0}", filePath); 167// while (tar.ReadEntry(out filePath, out tarEntryType) != null)
168 168// {
169// if (ArchiveConstants.CONTROL_FILE_PATH == filePath) 169// Console.WriteLine("Got {0}", filePath);
170
171//// if (ArchiveConstants.CONTROL_FILE_PATH == filePath)
172//// {
173//// gotControlFile = true;
174//// }
175
176// if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
170// { 177// {
171// gotControlFile = true; 178//// string fileName = filePath.Remove(0, "Objects/".Length);
179////
180//// if (fileName.StartsWith(part1.Name))
181//// {
182// Assert.That(expectedObject1FilePath, Is.EqualTo(filePath));
183// gotObject1File = true;
184//// }
185//// else if (fileName.StartsWith(part2.Name))
186//// {
187//// Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
188//// gotObject2File = true;
189//// }
172// } 190// }
173 191// }
174 if (filePath.StartsWith(ArchiveConstants.INVENTORY_PATH) && filePath.EndsWith(".xml"))
175 {
176// string fileName = filePath.Remove(0, "Objects/".Length);
177//
178// if (fileName.StartsWith(part1.Name))
179// {
180 Assert.That(expectedObject1FilePath, Is.EqualTo(filePath));
181 gotObject1File = true;
182// }
183// else if (fileName.StartsWith(part2.Name))
184// {
185// Assert.That(fileName, Is.EqualTo(expectedObject2FileName));
186// gotObject2File = true;
187// }
188 }
189 }
190 192
191// Assert.That(gotControlFile, Is.True, "No control file in archive"); 193//// Assert.That(gotControlFile, Is.True, "No control file in archive");
192 Assert.That(gotObject1File, Is.True, "No item1 file in archive"); 194// Assert.That(gotObject1File, Is.True, "No item1 file in archive");
193// Assert.That(gotObject2File, Is.True, "No object2 file in archive"); 195//// Assert.That(gotObject2File, Is.True, "No object2 file in archive");
194 196
195 // TODO: Test presence of more files and contents of files. 197// // TODO: Test presence of more files and contents of files.
196 } 198// }
197 199
198 /// <summary> 200 /// <summary>
199 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where 201 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
@@ -201,187 +203,189 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
201 /// </summary> 203 /// </summary>
202 /// 204 ///
203 /// This test also does some deeper probing of loading into nested inventory structures 205 /// This test also does some deeper probing of loading into nested inventory structures
204 [Test] 206 /// REFACTORING PROBLEM. This needs to be rewritten.
205 public void TestLoadIarV0_1ExistingUsers() 207// [Test]
206 { 208// public void TestLoadIarV0_1ExistingUsers()
207 TestHelper.InMethod(); 209// {
208 210// TestHelper.InMethod();
209 //log4net.Config.XmlConfigurator.Configure(); 211
210 212// //log4net.Config.XmlConfigurator.Configure();
211 string userFirstName = "Mr"; 213
212 string userLastName = "Tiddles"; 214// string userFirstName = "Mr";
213 UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555"); 215// string userLastName = "Tiddles";
214 string userItemCreatorFirstName = "Lord"; 216// UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000555");
215 string userItemCreatorLastName = "Lucan"; 217// string userItemCreatorFirstName = "Lord";
216 UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666"); 218// string userItemCreatorLastName = "Lucan";
217 219// UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000000666");
218 string item1Name = "b.lsl"; 220
219 string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1Name, UUID.Random()); 221// string item1Name = "b.lsl";
220 222// string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(item1Name, UUID.Random());
221 MemoryStream archiveWriteStream = new MemoryStream(); 223
222 TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); 224// MemoryStream archiveWriteStream = new MemoryStream();
223 225// TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
224 InventoryItemBase item1 = new InventoryItemBase(); 226
225 item1.Name = item1Name; 227// InventoryItemBase item1 = new InventoryItemBase();
226 item1.AssetID = UUID.Random(); 228// item1.Name = item1Name;
227 item1.GroupID = UUID.Random(); 229// item1.AssetID = UUID.Random();
228 item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName); 230// item1.GroupID = UUID.Random();
229 //item1.CreatorId = userUuid.ToString(); 231// item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
230 //item1.CreatorId = "00000000-0000-0000-0000-000000000444"; 232// //item1.CreatorId = userUuid.ToString();
231 item1.Owner = UUID.Zero; 233// //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
232 234// item1.Owner = UUID.Zero;
233 string item1FileName 235
234 = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName); 236// string item1FileName
235 tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1)); 237// = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
236 tar.Close(); 238// tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
237 239// tar.Close();
238 MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); 240
239 SerialiserModule serialiserModule = new SerialiserModule(); 241// MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
240 InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); 242// SerialiserModule serialiserModule = new SerialiserModule();
241 243// InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
242 // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene 244
243 Scene scene = SceneSetupHelpers.SetupScene("inventory"); 245// // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
244 IUserAdminService userAdminService = scene.CommsManager.UserAdminService; 246// Scene scene = SceneSetupHelpers.SetupScene("inventory");
245 247// IUserAdminService userAdminService = scene.CommsManager.UserAdminService;
246 SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); 248
247 userAdminService.AddUser( 249// SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
248 userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); 250// userAdminService.AddUser(
249 userAdminService.AddUser( 251// userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
250 userItemCreatorFirstName, userItemCreatorLastName, "hampshire", 252// userAdminService.AddUser(
251 String.Empty, 1000, 1000, userItemCreatorUuid); 253// userItemCreatorFirstName, userItemCreatorLastName, "hampshire",
252 254// String.Empty, 1000, 1000, userItemCreatorUuid);
253 archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream); 255
254 256// archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream);
255 CachedUserInfo userInfo 257
256 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); 258// CachedUserInfo userInfo
257 259// = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
258 InventoryItemBase foundItem1 260
259 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, item1Name); 261// InventoryItemBase foundItem1
260 262// = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, item1Name);
261 Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); 263
262 264// Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
263// We have to disable this check since loaded items that did find users via OSPA resolution are now only storing the 265
264// UUID, not the OSPA itself. 266//// We have to disable this check since loaded items that did find users via OSPA resolution are now only storing the
267//// UUID, not the OSPA itself.
268//// Assert.That(
269//// foundItem1.CreatorId, Is.EqualTo(item1.CreatorId),
270//// "Loaded item non-uuid creator doesn't match original");
265// Assert.That( 271// Assert.That(
266// foundItem1.CreatorId, Is.EqualTo(item1.CreatorId), 272// foundItem1.CreatorId, Is.EqualTo(userItemCreatorUuid.ToString()),
267// "Loaded item non-uuid creator doesn't match original"); 273// "Loaded item non-uuid creator doesn't match original");
268 Assert.That(
269 foundItem1.CreatorId, Is.EqualTo(userItemCreatorUuid.ToString()),
270 "Loaded item non-uuid creator doesn't match original");
271
272 Assert.That(
273 foundItem1.CreatorIdAsUuid, Is.EqualTo(userItemCreatorUuid),
274 "Loaded item uuid creator doesn't match original");
275 Assert.That(foundItem1.Owner, Is.EqualTo(userUuid),
276 "Loaded item owner doesn't match inventory reciever");
277
278 // Now try loading to a root child folder
279 UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA");
280 archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
281 archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream);
282
283 InventoryItemBase foundItem2
284 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xA/" + item1Name);
285 Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2");
286
287 // Now try loading to a more deeply nested folder
288 UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC");
289 archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
290 archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream);
291
292 InventoryItemBase foundItem3
293 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + item1Name);
294 Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
295 }
296
297 [Test]
298 public void TestIarV0_1WithEscapedChars()
299 {
300 TestHelper.InMethod();
301// log4net.Config.XmlConfigurator.Configure();
302
303 string itemName = "You & you are a mean/man/";
304 string humanEscapedItemName = @"You & you are a mean\/man\/";
305 string userPassword = "meowfood";
306
307 InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
308
309 Scene scene = SceneSetupHelpers.SetupScene("Inventory");
310 SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
311 CommunicationsManager cm = scene.CommsManager;
312
313 // Create user
314 string userFirstName = "Jock";
315 string userLastName = "Stirrup";
316 UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
317
318 lock (this)
319 {
320 UserProfileTestUtils.CreateUserWithInventory(
321 cm, userFirstName, userLastName, userPassword, userId, InventoryReceived);
322 Monitor.Wait(this, 60000);
323 }
324
325 // Create asset
326 SceneObjectGroup object1;
327 SceneObjectPart part1;
328 {
329 string partName = "part name";
330 UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
331 PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
332 Vector3 groupPosition = new Vector3(10, 20, 30);
333 Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
334 Vector3 offsetPosition = new Vector3(5, 10, 15);
335
336 part1
337 = new SceneObjectPart(
338 ownerId, shape, groupPosition, rotationOffset, offsetPosition);
339 part1.Name = partName;
340
341 object1 = new SceneObjectGroup(part1);
342 scene.AddNewSceneObject(object1, false);
343 }
344
345 UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
346 AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
347 scene.AssetService.Store(asset1);
348
349 // Create item
350 UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
351 InventoryItemBase item1 = new InventoryItemBase();
352 item1.Name = itemName;
353 item1.AssetID = asset1.FullID;
354 item1.ID = item1Id;
355 InventoryFolderBase objsFolder
356 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects");
357 item1.Folder = objsFolder.ID;
358 scene.AddInventoryItem(userId, item1);
359
360 MemoryStream archiveWriteStream = new MemoryStream();
361 archiverModule.OnInventoryArchiveSaved += SaveCompleted;
362
363 mre.Reset();
364 archiverModule.ArchiveInventory(
365 Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
366 mre.WaitOne(60000, false);
367
368 // LOAD ITEM
369 MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
370
371 archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream);
372
373 InventoryItemBase foundItem1
374 = InventoryArchiveUtils.FindItemByPath(
375 scene.InventoryService, userId, "Scripts/Objects/" + humanEscapedItemName);
376 274
377 Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
378// Assert.That( 275// Assert.That(
379// foundItem1.CreatorId, Is.EqualTo(userUuid), 276// foundItem1.CreatorIdAsUuid, Is.EqualTo(userItemCreatorUuid),
380// "Loaded item non-uuid creator doesn't match that of the loading user"); 277// "Loaded item uuid creator doesn't match original");
381 Assert.That( 278// Assert.That(foundItem1.Owner, Is.EqualTo(userUuid),
382 foundItem1.Name, Is.EqualTo(itemName), 279// "Loaded item owner doesn't match inventory reciever");
383 "Loaded item name doesn't match saved name"); 280
384 } 281// // Now try loading to a root child folder
282// UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xA");
283// archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
284// archiverModule.DearchiveInventory(userFirstName, userLastName, "xA", "meowfood", archiveReadStream);
285
286// InventoryItemBase foundItem2
287// = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xA/" + item1Name);
288// Assert.That(foundItem2, Is.Not.Null, "Didn't find loaded item 2");
289
290// // Now try loading to a more deeply nested folder
291// UserInventoryTestUtils.CreateInventoryFolder(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC");
292// archiveReadStream = new MemoryStream(archiveReadStream.ToArray());
293// archiverModule.DearchiveInventory(userFirstName, userLastName, "xB/xC", "meowfood", archiveReadStream);
294
295// InventoryItemBase foundItem3
296// = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, "xB/xC/" + item1Name);
297// Assert.That(foundItem3, Is.Not.Null, "Didn't find loaded item 3");
298 //}
299
300 // REFACTORING PROBLEM. Needs rewrite.
301// [Test]
302// public void TestIarV0_1WithEscapedChars()
303// {
304// TestHelper.InMethod();
305//// log4net.Config.XmlConfigurator.Configure();
306
307// string itemName = "You & you are a mean/man/";
308// string humanEscapedItemName = @"You & you are a mean\/man\/";
309// string userPassword = "meowfood";
310
311// InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
312
313// Scene scene = SceneSetupHelpers.SetupScene("Inventory");
314// SceneSetupHelpers.SetupSceneModules(scene, archiverModule);
315// CommunicationsManager cm = scene.CommsManager;
316
317// // Create user
318// string userFirstName = "Jock";
319// string userLastName = "Stirrup";
320// UUID userId = UUID.Parse("00000000-0000-0000-0000-000000000020");
321
322// lock (this)
323// {
324// UserProfileTestUtils.CreateUserWithInventory(
325// cm, userFirstName, userLastName, userPassword, userId, InventoryReceived);
326// Monitor.Wait(this, 60000);
327// }
328
329// // Create asset
330// SceneObjectGroup object1;
331// SceneObjectPart part1;
332// {
333// string partName = "part name";
334// UUID ownerId = UUID.Parse("00000000-0000-0000-0000-000000000040");
335// PrimitiveBaseShape shape = PrimitiveBaseShape.CreateSphere();
336// Vector3 groupPosition = new Vector3(10, 20, 30);
337// Quaternion rotationOffset = new Quaternion(20, 30, 40, 50);
338// Vector3 offsetPosition = new Vector3(5, 10, 15);
339
340// part1
341// = new SceneObjectPart(
342// ownerId, shape, groupPosition, rotationOffset, offsetPosition);
343// part1.Name = partName;
344
345// object1 = new SceneObjectGroup(part1);
346// scene.AddNewSceneObject(object1, false);
347// }
348
349// UUID asset1Id = UUID.Parse("00000000-0000-0000-0000-000000000060");
350// AssetBase asset1 = AssetHelpers.CreateAsset(asset1Id, object1);
351// scene.AssetService.Store(asset1);
352
353// // Create item
354// UUID item1Id = UUID.Parse("00000000-0000-0000-0000-000000000080");
355// InventoryItemBase item1 = new InventoryItemBase();
356// item1.Name = itemName;
357// item1.AssetID = asset1.FullID;
358// item1.ID = item1Id;
359// InventoryFolderBase objsFolder
360// = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userId, "Objects");
361// item1.Folder = objsFolder.ID;
362// scene.AddInventoryItem(userId, item1);
363
364// MemoryStream archiveWriteStream = new MemoryStream();
365// archiverModule.OnInventoryArchiveSaved += SaveCompleted;
366
367// mre.Reset();
368// archiverModule.ArchiveInventory(
369// Guid.NewGuid(), userFirstName, userLastName, "Objects", userPassword, archiveWriteStream);
370// mre.WaitOne(60000, false);
371
372// // LOAD ITEM
373// MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
374
375// archiverModule.DearchiveInventory(userFirstName, userLastName, "Scripts", userPassword, archiveReadStream);
376
377// InventoryItemBase foundItem1
378// = InventoryArchiveUtils.FindItemByPath(
379// scene.InventoryService, userId, "Scripts/Objects/" + humanEscapedItemName);
380
381// Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
382//// Assert.That(
383//// foundItem1.CreatorId, Is.EqualTo(userUuid),
384//// "Loaded item non-uuid creator doesn't match that of the loading user");
385// Assert.That(
386// foundItem1.Name, Is.EqualTo(itemName),
387// "Loaded item name doesn't match saved name");
388// }
385 389
386 /// <summary> 390 /// <summary>
387 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where 391 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
@@ -390,199 +394,203 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Archiver.Tests
390 /// 394 ///
391 /// This may possibly one day get overtaken by the as yet incomplete temporary profiles feature 395 /// This may possibly one day get overtaken by the as yet incomplete temporary profiles feature
392 /// (as tested in the a later commented out test) 396 /// (as tested in the a later commented out test)
393 [Test] 397 /// REFACTORING PROBLEM. Needs rewrite.
394 public void TestLoadIarV0_1AbsentUsers() 398// [Test]
395 { 399// public void TestLoadIarV0_1AbsentUsers()
396 TestHelper.InMethod(); 400// {
397 401// TestHelper.InMethod();
398 //log4net.Config.XmlConfigurator.Configure(); 402
399 403// //log4net.Config.XmlConfigurator.Configure();
400 string userFirstName = "Charlie"; 404
401 string userLastName = "Chan"; 405// string userFirstName = "Charlie";
402 UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000999"); 406// string userLastName = "Chan";
403 string userItemCreatorFirstName = "Bat"; 407// UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000999");
404 string userItemCreatorLastName = "Man"; 408// string userItemCreatorFirstName = "Bat";
405 //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888"); 409// string userItemCreatorLastName = "Man";
406 410// //UUID userItemCreatorUuid = UUID.Parse("00000000-0000-0000-0000-000000008888");
407 string itemName = "b.lsl"; 411
408 string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); 412// string itemName = "b.lsl";
409 413// string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
410 MemoryStream archiveWriteStream = new MemoryStream(); 414
411 TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); 415// MemoryStream archiveWriteStream = new MemoryStream();
412 416// TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
413 InventoryItemBase item1 = new InventoryItemBase(); 417
414 item1.Name = itemName; 418// InventoryItemBase item1 = new InventoryItemBase();
415 item1.AssetID = UUID.Random(); 419// item1.Name = itemName;
416 item1.GroupID = UUID.Random(); 420// item1.AssetID = UUID.Random();
417 item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName); 421// item1.GroupID = UUID.Random();
418 //item1.CreatorId = userUuid.ToString(); 422// item1.CreatorId = OspResolver.MakeOspa(userItemCreatorFirstName, userItemCreatorLastName);
419 //item1.CreatorId = "00000000-0000-0000-0000-000000000444"; 423// //item1.CreatorId = userUuid.ToString();
420 item1.Owner = UUID.Zero; 424// //item1.CreatorId = "00000000-0000-0000-0000-000000000444";
421 425// item1.Owner = UUID.Zero;
422 string item1FileName 426
423 = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName); 427// string item1FileName
424 tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1)); 428// = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
425 tar.Close(); 429// tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
426 430// tar.Close();
427 MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); 431
428 SerialiserModule serialiserModule = new SerialiserModule(); 432// MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
429 InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); 433// SerialiserModule serialiserModule = new SerialiserModule();
430 434// InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
431 // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene 435
432 Scene scene = SceneSetupHelpers.SetupScene("inventory"); 436// // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
433 IUserAdminService userAdminService = scene.CommsManager.UserAdminService; 437// Scene scene = SceneSetupHelpers.SetupScene("inventory");
434 438// IUserAdminService userAdminService = scene.CommsManager.UserAdminService;
435 SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); 439
436 userAdminService.AddUser( 440// SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
437 userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); 441// userAdminService.AddUser(
438 442// userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
439 archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream); 443
440 444// archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "meowfood", archiveReadStream);
441 CachedUserInfo userInfo 445
442 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); 446// CachedUserInfo userInfo
443 447// = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
444 InventoryItemBase foundItem1 448
445 = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, itemName); 449// InventoryItemBase foundItem1
446 450// = InventoryArchiveUtils.FindItemByPath(scene.InventoryService, userInfo.UserProfile.ID, itemName);
447 Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1"); 451
452// Assert.That(foundItem1, Is.Not.Null, "Didn't find loaded item 1");
453//// Assert.That(
454//// foundItem1.CreatorId, Is.EqualTo(userUuid),
455//// "Loaded item non-uuid creator doesn't match that of the loading user");
448// Assert.That( 456// Assert.That(
449// foundItem1.CreatorId, Is.EqualTo(userUuid), 457// foundItem1.CreatorIdAsUuid, Is.EqualTo(userUuid),
450// "Loaded item non-uuid creator doesn't match that of the loading user"); 458// "Loaded item uuid creator doesn't match that of the loading user");
451 Assert.That( 459// }
452 foundItem1.CreatorIdAsUuid, Is.EqualTo(userUuid),
453 "Loaded item uuid creator doesn't match that of the loading user");
454 }
455 460
456 /// <summary> 461 /// <summary>
457 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where 462 /// Test loading a V0.1 OpenSim Inventory Archive (subject to change since there is no fixed format yet) where
458 /// no account exists with the creator name 463 /// no account exists with the creator name
459 /// </summary> 464 /// </summary>
460 /// Disabled since temporary profiles have not yet been implemented. 465 /// Disabled since temporary profiles have not yet been implemented.
466 /// REFACTORING PROBLEM. Needs rewrite.
467 ///
461 //[Test] 468 //[Test]
462 public void TestLoadIarV0_1TempProfiles() 469 //public void TestLoadIarV0_1TempProfiles()
463 { 470 //{
464 TestHelper.InMethod(); 471 // TestHelper.InMethod();
465 472
466 //log4net.Config.XmlConfigurator.Configure(); 473 // //log4net.Config.XmlConfigurator.Configure();
467 474
468 string userFirstName = "Dennis"; 475 // string userFirstName = "Dennis";
469 string userLastName = "Menace"; 476 // string userLastName = "Menace";
470 UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000aaa"); 477 // UUID userUuid = UUID.Parse("00000000-0000-0000-0000-000000000aaa");
471 string user2FirstName = "Walter"; 478 // string user2FirstName = "Walter";
472 string user2LastName = "Mitty"; 479 // string user2LastName = "Mitty";
473 480
474 string itemName = "b.lsl"; 481 // string itemName = "b.lsl";
475 string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); 482 // string archiveItemName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
476 483
477 MemoryStream archiveWriteStream = new MemoryStream(); 484 // MemoryStream archiveWriteStream = new MemoryStream();
478 TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream); 485 // TarArchiveWriter tar = new TarArchiveWriter(archiveWriteStream);
479 486
480 InventoryItemBase item1 = new InventoryItemBase(); 487 // InventoryItemBase item1 = new InventoryItemBase();
481 item1.Name = itemName; 488 // item1.Name = itemName;
482 item1.AssetID = UUID.Random(); 489 // item1.AssetID = UUID.Random();
483 item1.GroupID = UUID.Random(); 490 // item1.GroupID = UUID.Random();
484 item1.CreatorId = OspResolver.MakeOspa(user2FirstName, user2LastName); 491 // item1.CreatorId = OspResolver.MakeOspa(user2FirstName, user2LastName);
485 item1.Owner = UUID.Zero; 492 // item1.Owner = UUID.Zero;
486 493
487 string item1FileName 494 // string item1FileName
488 = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName); 495 // = string.Format("{0}{1}", ArchiveConstants.INVENTORY_PATH, archiveItemName);
489 tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1)); 496 // tar.WriteFile(item1FileName, UserInventoryItemSerializer.Serialize(item1));
490 tar.Close(); 497 // tar.Close();
491 498
492 MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray()); 499 // MemoryStream archiveReadStream = new MemoryStream(archiveWriteStream.ToArray());
493 SerialiserModule serialiserModule = new SerialiserModule(); 500 // SerialiserModule serialiserModule = new SerialiserModule();
494 InventoryArchiverModule archiverModule = new InventoryArchiverModule(true); 501 // InventoryArchiverModule archiverModule = new InventoryArchiverModule(true);
495 502
496 // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene 503 // // Annoyingly, we have to set up a scene even though inventory loading has nothing to do with a scene
497 Scene scene = SceneSetupHelpers.SetupScene(); 504 // Scene scene = SceneSetupHelpers.SetupScene();
498 IUserAdminService userAdminService = scene.CommsManager.UserAdminService; 505 // IUserAdminService userAdminService = scene.CommsManager.UserAdminService;
499 506
500 SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule); 507 // SceneSetupHelpers.SetupSceneModules(scene, serialiserModule, archiverModule);
501 userAdminService.AddUser( 508 // userAdminService.AddUser(
502 userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid); 509 // userFirstName, userLastName, "meowfood", String.Empty, 1000, 1000, userUuid);
503 510
504 archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "troll", archiveReadStream); 511 // archiverModule.DearchiveInventory(userFirstName, userLastName, "/", "troll", archiveReadStream);
505 512
506 // Check that a suitable temporary user profile has been created. 513 // // Check that a suitable temporary user profile has been created.
507 UserProfileData user2Profile 514 // UserProfileData user2Profile
508 = scene.CommsManager.UserService.GetUserProfile( 515 // = scene.CommsManager.UserService.GetUserProfile(
509 OspResolver.HashName(user2FirstName + " " + user2LastName)); 516 // OspResolver.HashName(user2FirstName + " " + user2LastName));
510 Assert.That(user2Profile, Is.Not.Null); 517 // Assert.That(user2Profile, Is.Not.Null);
511 Assert.That(user2Profile.FirstName == user2FirstName); 518 // Assert.That(user2Profile.FirstName == user2FirstName);
512 Assert.That(user2Profile.SurName == user2LastName); 519 // Assert.That(user2Profile.SurName == user2LastName);
513 520
514 CachedUserInfo userInfo 521 // CachedUserInfo userInfo
515 = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName); 522 // = scene.CommsManager.UserProfileCacheService.GetUserDetails(userFirstName, userLastName);
516 userInfo.OnInventoryReceived += InventoryReceived; 523 // userInfo.OnInventoryReceived += InventoryReceived;
517 524
518 lock (this) 525 // lock (this)
519 { 526 // {
520 userInfo.FetchInventory(); 527 // userInfo.FetchInventory();
521 Monitor.Wait(this, 60000); 528 // Monitor.Wait(this, 60000);
522 } 529 // }
523 530
524 InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName); 531 // InventoryItemBase foundItem = userInfo.RootFolder.FindItemByPath(itemName);
525 532
526 Assert.That(foundItem.CreatorId, Is.EqualTo(item1.CreatorId)); 533 // Assert.That(foundItem.CreatorId, Is.EqualTo(item1.CreatorId));
527 Assert.That( 534 // Assert.That(
528 foundItem.CreatorIdAsUuid, Is.EqualTo(OspResolver.HashName(user2FirstName + " " + user2LastName))); 535 // foundItem.CreatorIdAsUuid, Is.EqualTo(OspResolver.HashName(user2FirstName + " " + user2LastName)));
529 Assert.That(foundItem.Owner, Is.EqualTo(userUuid)); 536 // Assert.That(foundItem.Owner, Is.EqualTo(userUuid));
530 537
531 Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod()); 538 // Console.WriteLine("### Successfully completed {0} ###", MethodBase.GetCurrentMethod());
532 } 539 //}
533 540
534 /// <summary> 541 /// <summary>
535 /// Test replication of an archive path to the user's inventory. 542 /// Test replication of an archive path to the user's inventory.
536 /// </summary> 543 /// </summary>
537 [Test] 544 //[Test]
538 public void TestReplicateArchivePathToUserInventory() 545 //public void TestReplicateArchivePathToUserInventory()
539 { 546 //{
540 TestHelper.InMethod(); 547 // TestHelper.InMethod();
541 548
542 //log4net.Config.XmlConfigurator.Configure(); 549 // //log4net.Config.XmlConfigurator.Configure();
543 550
544 Scene scene = SceneSetupHelpers.SetupScene("inventory"); 551 // Scene scene = SceneSetupHelpers.SetupScene("inventory");
545 CommunicationsManager commsManager = scene.CommsManager; 552 // CommunicationsManager commsManager = scene.CommsManager;
546 CachedUserInfo userInfo; 553 // CachedUserInfo userInfo;
547 554
548 lock (this) 555 // lock (this)
549 { 556 // {
550 userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived); 557 // // !!! REFACTORING PROBLEM. This needs to be rewritten
551 Monitor.Wait(this, 60000); 558 // userInfo = UserProfileTestUtils.CreateUserWithInventory(commsManager, InventoryReceived);
552 } 559 // Monitor.Wait(this, 60000);
553 560 // }
554 //Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder); 561
555 562 // //Console.WriteLine("userInfo.RootFolder 1: {0}", userInfo.RootFolder);
556 Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>(); 563
557 List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>(); 564 // Dictionary <string, InventoryFolderBase> foldersCreated = new Dictionary<string, InventoryFolderBase>();
558 565 // List<InventoryNodeBase> nodesLoaded = new List<InventoryNodeBase>();
559 string folder1Name = "a"; 566
560 string folder2Name = "b"; 567 // string folder1Name = "a";
561 string itemName = "c.lsl"; 568 // string folder2Name = "b";
562 569 // string itemName = "c.lsl";
563 string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1Name, UUID.Random()); 570
564 string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random()); 571 // string folder1ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder1Name, UUID.Random());
565 string itemArchiveName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random()); 572 // string folder2ArchiveName = InventoryArchiveWriteRequest.CreateArchiveFolderName(folder2Name, UUID.Random());
566 573 // string itemArchiveName = InventoryArchiveWriteRequest.CreateArchiveItemName(itemName, UUID.Random());
567 string itemArchivePath 574
568 = string.Format( 575 // string itemArchivePath
569 "{0}{1}{2}{3}", 576 // = string.Format(
570 ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName); 577 // "{0}{1}{2}{3}",
571 578 // ArchiveConstants.INVENTORY_PATH, folder1ArchiveName, folder2ArchiveName, itemArchiveName);
572 //Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder); 579
573 580 // //Console.WriteLine("userInfo.RootFolder 2: {0}", userInfo.RootFolder);
574 new InventoryArchiveReadRequest(scene, userInfo, null, (Stream)null) 581
575 .ReplicateArchivePathToUserInventory( 582 // new InventoryArchiveReadRequest(scene, userInfo, null, (Stream)null)
576 itemArchivePath, false, scene.InventoryService.GetRootFolder(userInfo.UserProfile.ID), 583 // .ReplicateArchivePathToUserInventory(
577 foldersCreated, nodesLoaded); 584 // itemArchivePath, false, scene.InventoryService.GetRootFolder(userInfo.UserProfile.ID),
578 585 // foldersCreated, nodesLoaded);
579 //Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder); 586
580 //InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a"); 587 // //Console.WriteLine("userInfo.RootFolder 3: {0}", userInfo.RootFolder);
581 InventoryFolderBase folder1 588 // //InventoryFolderImpl folder1 = userInfo.RootFolder.FindFolderByPath("a");
582 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userInfo.UserProfile.ID, "a"); 589 // InventoryFolderBase folder1
583 Assert.That(folder1, Is.Not.Null, "Could not find folder a"); 590 // = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, userInfo.UserProfile.ID, "a");
584 InventoryFolderBase folder2 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1, "b"); 591 // Assert.That(folder1, Is.Not.Null, "Could not find folder a");
585 Assert.That(folder2, Is.Not.Null, "Could not find folder b"); 592 // InventoryFolderBase folder2 = InventoryArchiveUtils.FindFolderByPath(scene.InventoryService, folder1, "b");
586 } 593 // Assert.That(folder2, Is.Not.Null, "Could not find folder b");
594 //}
587 } 595 }
588} 596}
diff --git a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
index d9a021f..4f03b0e 100644
--- a/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
@@ -32,14 +32,14 @@ using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Services.Interfaces; 38using OpenSim.Services.Interfaces;
39 39
40namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer 40namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
41{ 41{
42 public class InventoryTransferModule : IInventoryTransferModule, IRegionModule 42 public class InventoryTransferModule : IInventoryTransferModule, ISharedRegionModule
43 { 43 {
44 private static readonly ILog m_log 44 private static readonly ILog m_log
45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 45 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -50,10 +50,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
50 new Dictionary<UUID, Scene>(); 50 new Dictionary<UUID, Scene>();
51 51
52 private IMessageTransferModule m_TransferModule = null; 52 private IMessageTransferModule m_TransferModule = null;
53 private bool m_Enabled = true;
53 54
54 #region IRegionModule Members 55 #region IRegionModule Members
55 56
56 public void Initialise(Scene scene, IConfigSource config) 57 public void Initialise(IConfigSource config)
57 { 58 {
58 if (config.Configs["Messaging"] != null) 59 if (config.Configs["Messaging"] != null)
59 { 60 {
@@ -62,29 +63,56 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
62 if (config.Configs["Messaging"].GetString( 63 if (config.Configs["Messaging"].GetString(
63 "InventoryTransferModule", "InventoryTransferModule") != 64 "InventoryTransferModule", "InventoryTransferModule") !=
64 "InventoryTransferModule") 65 "InventoryTransferModule")
66 {
67 m_Enabled = false;
65 return; 68 return;
69 }
66 } 70 }
71 }
67 72
68 if (!m_Scenelist.Contains(scene)) 73 public void AddRegion(Scene scene)
69 { 74 {
70 m_Scenelist.Add(scene); 75 if (!m_Enabled)
76 return;
71 77
72 scene.RegisterModuleInterface<IInventoryTransferModule>(this); 78 m_Scenelist.Add(scene);
73 79
74 scene.EventManager.OnNewClient += OnNewClient; 80 scene.RegisterModuleInterface<IInventoryTransferModule>(this);
75 scene.EventManager.OnClientClosed += ClientLoggedOut; 81
76 scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage; 82 scene.EventManager.OnNewClient += OnNewClient;
77 } 83 scene.EventManager.OnClientClosed += ClientLoggedOut;
84 scene.EventManager.OnIncomingInstantMessage += OnGridInstantMessage;
78 } 85 }
79 86
80 public void PostInitialise() 87 public void RegionLoaded(Scene scene)
81 { 88 {
82 if (m_Scenelist.Count > 0) 89 if (m_TransferModule == null)
83 { 90 {
84 m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>(); 91 m_TransferModule = m_Scenelist[0].RequestModuleInterface<IMessageTransferModule>();
85 if (m_TransferModule == null) 92 if (m_TransferModule == null)
93 {
86 m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only"); 94 m_log.Error("[INVENTORY TRANSFER] No Message transfer module found, transfers will be local only");
95 m_Enabled = false;
96
97 m_Scenelist.Clear();
98 scene.EventManager.OnNewClient -= OnNewClient;
99 scene.EventManager.OnClientClosed -= ClientLoggedOut;
100 scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
101 }
87 } 102 }
103
104 }
105
106 public void RemoveRegion(Scene scene)
107 {
108 scene.EventManager.OnNewClient -= OnNewClient;
109 scene.EventManager.OnClientClosed -= ClientLoggedOut;
110 scene.EventManager.OnIncomingInstantMessage -= OnGridInstantMessage;
111 m_Scenelist.Remove(scene);
112 }
113
114 public void PostInitialise()
115 {
88 } 116 }
89 117
90 public void Close() 118 public void Close()
@@ -96,9 +124,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Inventory.Transfer
96 get { return "InventoryModule"; } 124 get { return "InventoryModule"; }
97 } 125 }
98 126
99 public bool IsSharedModule 127 public Type ReplaceableInterface
100 { 128 {
101 get { return true; } 129 get { return null; }
102 } 130 }
103 131
104 #endregion 132 #endregion
diff --git a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
index 261bd6c..d1d7df2 100644
--- a/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
@@ -37,34 +37,72 @@ using OpenSim.Region.Framework.Scenes;
37 37
38namespace OpenSim.Region.CoreModules.Avatar.Lure 38namespace OpenSim.Region.CoreModules.Avatar.Lure
39{ 39{
40 public class LureModule : IRegionModule 40 public class LureModule : ISharedRegionModule
41 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(
43 MethodBase.GetCurrentMethod().DeclaringType);
43 44
44 private readonly List<Scene> m_scenes = new List<Scene>(); 45 private readonly List<Scene> m_scenes = new List<Scene>();
45 46
46 private IMessageTransferModule m_TransferModule = null; 47 private IMessageTransferModule m_TransferModule = null;
48 private bool m_Enabled = true;
47 49
48 public void Initialise(Scene scene, IConfigSource config) 50 public void Initialise(IConfigSource config)
49 { 51 {
50 if (config.Configs["Messaging"] != null) 52 if (config.Configs["Messaging"] != null)
51 { 53 {
52 if (config.Configs["Messaging"].GetString( 54 if (config.Configs["Messaging"].GetString(
53 "LureModule", "LureModule") != 55 "LureModule", "LureModule") !=
54 "LureModule") 56 "LureModule")
55 return; 57 m_Enabled = false;
56 } 58 }
59 }
60
61 public void AddRegion(Scene scene)
62 {
63 if (!m_Enabled)
64 return;
57 65
58 lock (m_scenes) 66 lock (m_scenes)
59 { 67 {
60 if (!m_scenes.Contains(scene)) 68 m_scenes.Add(scene);
69 scene.EventManager.OnNewClient += OnNewClient;
70 scene.EventManager.OnIncomingInstantMessage +=
71 OnGridInstantMessage;
72 }
73 }
74
75 public void RegionLoaded(Scene scene)
76 {
77 if (m_TransferModule == null)
78 {
79 m_TransferModule =
80 scene.RequestModuleInterface<IMessageTransferModule>();
81
82 if (m_TransferModule == null)
61 { 83 {
62 m_scenes.Add(scene); 84 m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
63 scene.EventManager.OnNewClient += OnNewClient; 85 "lures will not work!");
64 scene.EventManager.OnIncomingInstantMessage += 86
87 m_Enabled = false;
88 m_scenes.Clear();
89 scene.EventManager.OnNewClient -= OnNewClient;
90 scene.EventManager.OnIncomingInstantMessage -=
65 OnGridInstantMessage; 91 OnGridInstantMessage;
66 } 92 }
67 } 93 }
94
95 }
96
97 public void RemoveRegion(Scene scene)
98 {
99 lock (m_scenes)
100 {
101 m_scenes.Remove(scene);
102 scene.EventManager.OnNewClient -= OnNewClient;
103 scene.EventManager.OnIncomingInstantMessage -=
104 OnGridInstantMessage;
105 }
68 } 106 }
69 107
70 void OnNewClient(IClientAPI client) 108 void OnNewClient(IClientAPI client)
@@ -76,12 +114,6 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
76 114
77 public void PostInitialise() 115 public void PostInitialise()
78 { 116 {
79 m_TransferModule =
80 m_scenes[0].RequestModuleInterface<IMessageTransferModule>();
81
82 if (m_TransferModule == null)
83 m_log.Error("[INSTANT MESSAGE]: No message transfer module, "+
84 "lures will not work!");
85 } 117 }
86 118
87 public void Close() 119 public void Close()
@@ -93,9 +125,9 @@ namespace OpenSim.Region.CoreModules.Avatar.Lure
93 get { return "LureModule"; } 125 get { return "LureModule"; }
94 } 126 }
95 127
96 public bool IsSharedModule 128 public Type ReplaceableInterface
97 { 129 {
98 get { return true; } 130 get { return null; }
99 } 131 }
100 132
101 public void OnInstantMessage(IClientAPI client, GridInstantMessage im) 133 public void OnInstantMessage(IClientAPI client, GridInstantMessage im)
diff --git a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
index 8cf58c6..718ee2f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Profiles/AvatarProfilesModule.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
110 public void RequestAvatarProperty(IClientAPI remoteClient, UUID avatarID) 110 public void RequestAvatarProperty(IClientAPI remoteClient, UUID avatarID)
111 { 111 {
112 // FIXME: finish adding fields such as url, masking, etc. 112 // FIXME: finish adding fields such as url, masking, etc.
113 UserProfileData profile = m_scene.CommsManager.UserService.GetUserProfile(avatarID); 113 UserProfileData profile = null; // m_scene.CommsManager.UserService.GetUserProfile(avatarID);
114 if (null != profile) 114 if (null != profile)
115 { 115 {
116 Byte[] charterMember; 116 Byte[] charterMember;
@@ -143,26 +143,27 @@ namespace OpenSim.Region.CoreModules.Avatar.Profiles
143 143
144 public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile) 144 public void UpdateAvatarProperties(IClientAPI remoteClient, UserProfileData newProfile)
145 { 145 {
146 UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID); 146 return;
147 147 //UserProfileData Profile = m_scene.CommsManager.UserService.GetUserProfile(newProfile.ID);
148 // if it's the profile of the user requesting the update, then we change only a few things. 148
149 if (remoteClient.AgentId.CompareTo(Profile.ID) == 0) 149 //// if it's the profile of the user requesting the update, then we change only a few things.
150 { 150 //if (remoteClient.AgentId.CompareTo(Profile.ID) == 0)
151 Profile.Image = newProfile.Image; 151 //{
152 Profile.FirstLifeImage = newProfile.FirstLifeImage; 152 // Profile.Image = newProfile.Image;
153 Profile.AboutText = newProfile.AboutText; 153 // Profile.FirstLifeImage = newProfile.FirstLifeImage;
154 Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText; 154 // Profile.AboutText = newProfile.AboutText;
155 Profile.ProfileUrl = newProfile.ProfileUrl; 155 // Profile.FirstLifeAboutText = newProfile.FirstLifeAboutText;
156 } 156 // Profile.ProfileUrl = newProfile.ProfileUrl;
157 else 157 //}
158 { 158 //else
159 return; 159 //{
160 } 160 // return;
161 161 //}
162 if (m_scene.CommsManager.UserService.UpdateUserProfile(Profile)) 162
163 { 163 //if (m_scene.CommsManager.UserService.UpdateUserProfile(Profile))
164 RequestAvatarProperty(remoteClient, newProfile.ID); 164 //{
165 } 165 // RequestAvatarProperty(remoteClient, newProfile.ID);
166 //}
166 } 167 }
167 } 168 }
168} 169}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
new file mode 100644
index 0000000..53de269
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -0,0 +1,1600 @@
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
28using System;
29using System.Collections.Generic;
30using System.Net;
31using System.Reflection;
32using System.Threading;
33
34using OpenSim.Framework;
35using OpenSim.Framework.Capabilities;
36using OpenSim.Framework.Client;
37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Services.Interfaces;
40
41using GridRegion = OpenSim.Services.Interfaces.GridRegion;
42
43using OpenMetaverse;
44using log4net;
45using Nini.Config;
46
47namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
48{
49 public class EntityTransferModule : ISharedRegionModule, IEntityTransferModule
50 {
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52
53 protected bool m_Enabled = false;
54 protected Scene m_aScene;
55 protected List<UUID> m_agentsInTransit;
56
57 #region ISharedRegionModule
58
59 public Type ReplaceableInterface
60 {
61 get { return null; }
62 }
63
64 public virtual string Name
65 {
66 get { return "BasicEntityTransferModule"; }
67 }
68
69 public virtual void Initialise(IConfigSource source)
70 {
71 IConfig moduleConfig = source.Configs["Modules"];
72 if (moduleConfig != null)
73 {
74 string name = moduleConfig.GetString("EntityTransferModule", "");
75 if (name == Name)
76 {
77 m_agentsInTransit = new List<UUID>();
78 m_Enabled = true;
79 m_log.InfoFormat("[ENTITY TRANSFER MODULE]: {0} enabled.", Name);
80 }
81 }
82 }
83
84 public virtual void PostInitialise()
85 {
86 }
87
88 public virtual void AddRegion(Scene scene)
89 {
90 if (!m_Enabled)
91 return;
92
93 if (m_aScene == null)
94 m_aScene = scene;
95
96 scene.RegisterModuleInterface<IEntityTransferModule>(this);
97 scene.EventManager.OnNewClient += OnNewClient;
98 }
99
100 protected virtual void OnNewClient(IClientAPI client)
101 {
102 client.OnTeleportHomeRequest += TeleportHome;
103 }
104
105 public virtual void Close()
106 {
107 if (!m_Enabled)
108 return;
109 }
110
111
112 public virtual void RemoveRegion(Scene scene)
113 {
114 if (!m_Enabled)
115 return;
116 if (scene == m_aScene)
117 m_aScene = null;
118 }
119
120 public virtual void RegionLoaded(Scene scene)
121 {
122 if (!m_Enabled)
123 return;
124
125 }
126
127
128 #endregion
129
130 #region Agent Teleports
131
132 public void Teleport(ScenePresence sp, ulong regionHandle, Vector3 position, Vector3 lookAt, uint teleportFlags)
133 {
134 if (!sp.Scene.Permissions.CanTeleport(sp.UUID))
135 return;
136
137 IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
138
139 // Reset animations; the viewer does that in teleports.
140 sp.Animator.ResetAnimations();
141
142 try
143 {
144 if (regionHandle == sp.Scene.RegionInfo.RegionHandle)
145 {
146 m_log.DebugFormat(
147 "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation {0} within {1}",
148 position, sp.Scene.RegionInfo.RegionName);
149
150 // Teleport within the same region
151 if (IsOutsideRegion(sp.Scene, position) || position.Z < 0)
152 {
153 Vector3 emergencyPos = new Vector3(128, 128, 128);
154
155 m_log.WarnFormat(
156 "[ENTITY TRANSFER MODULE]: RequestTeleportToLocation() was given an illegal position of {0} for avatar {1}, {2}. Substituting {3}",
157 position, sp.Name, sp.UUID, emergencyPos);
158 position = emergencyPos;
159 }
160
161 // TODO: Get proper AVG Height
162 float localAVHeight = 1.56f;
163 float posZLimit = 22;
164
165 // TODO: Check other Scene HeightField
166 if (position.X > 0 && position.X <= (int)Constants.RegionSize && position.Y > 0 && position.Y <= (int)Constants.RegionSize)
167 {
168 posZLimit = (float)sp.Scene.Heightmap[(int)position.X, (int)position.Y];
169 }
170
171 float newPosZ = posZLimit + localAVHeight;
172 if (posZLimit >= (position.Z - (localAVHeight / 2)) && !(Single.IsInfinity(newPosZ) || Single.IsNaN(newPosZ)))
173 {
174 position.Z = newPosZ;
175 }
176
177 // Only send this if the event queue is null
178 if (eq == null)
179 sp.ControllingClient.SendTeleportLocationStart();
180
181 sp.ControllingClient.SendLocalTeleport(position, lookAt, teleportFlags);
182 sp.Teleport(position);
183 }
184 else // Another region possibly in another simulator
185 {
186 uint x = 0, y = 0;
187 Utils.LongToUInts(regionHandle, out x, out y);
188 GridRegion reg = m_aScene.GridService.GetRegionByPosition(sp.Scene.RegionInfo.ScopeID, (int)x, (int)y);
189
190 if (reg != null)
191 {
192 GridRegion finalDestination = GetFinalDestination(reg);
193 if (finalDestination == null)
194 {
195 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is having problems. Unable to teleport agent.");
196 sp.ControllingClient.SendTeleportFailed("Problem at destination");
197 return;
198 }
199 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Final destination is x={0} y={1} uuid={2}",
200 finalDestination.RegionLocX / Constants.RegionSize, finalDestination.RegionLocY / Constants.RegionSize, finalDestination.RegionID);
201
202 //
203 // This is it
204 //
205 DoTeleport(sp, reg, finalDestination, position, lookAt, teleportFlags, eq);
206 //
207 //
208 //
209 }
210 else
211 {
212 // TP to a place that doesn't exist (anymore)
213 // Inform the viewer about that
214 sp.ControllingClient.SendTeleportFailed("The region you tried to teleport to doesn't exist anymore");
215
216 // and set the map-tile to '(Offline)'
217 uint regX, regY;
218 Utils.LongToUInts(regionHandle, out regX, out regY);
219
220 MapBlockData block = new MapBlockData();
221 block.X = (ushort)(regX / Constants.RegionSize);
222 block.Y = (ushort)(regY / Constants.RegionSize);
223 block.Access = 254; // == not there
224
225 List<MapBlockData> blocks = new List<MapBlockData>();
226 blocks.Add(block);
227 sp.ControllingClient.SendMapBlock(blocks, 0);
228 }
229 }
230 }
231 catch (Exception e)
232 {
233 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Exception on teleport: {0}\n{1}", e.Message, e.StackTrace);
234 sp.ControllingClient.SendTeleportFailed("Internal error");
235 }
236 }
237
238 protected void DoTeleport(ScenePresence sp, GridRegion reg, GridRegion finalDestination, Vector3 position, Vector3 lookAt, uint teleportFlags, IEventQueue eq)
239 {
240 if (reg == null || finalDestination == null)
241 {
242 sp.ControllingClient.SendTeleportFailed("Unable to locate destination");
243 return;
244 }
245
246 m_log.DebugFormat(
247 "[ENTITY TRANSFER MODULE]: Request Teleport to {0}:{1}:{2}/{3}",
248 reg.ExternalHostName, reg.HttpPort, finalDestination.RegionName, position);
249
250 uint newRegionX = (uint)(reg.RegionHandle >> 40);
251 uint newRegionY = (((uint)(reg.RegionHandle)) >> 8);
252 uint oldRegionX = (uint)(sp.Scene.RegionInfo.RegionHandle >> 40);
253 uint oldRegionY = (((uint)(sp.Scene.RegionInfo.RegionHandle)) >> 8);
254
255 ulong destinationHandle = finalDestination.RegionHandle;
256
257 if (eq == null)
258 sp.ControllingClient.SendTeleportLocationStart();
259
260 // Let's do DNS resolution only once in this process, please!
261 // This may be a costly operation. The reg.ExternalEndPoint field is not a passive field,
262 // it's actually doing a lot of work.
263 IPEndPoint endPoint = finalDestination.ExternalEndPoint;
264 if (endPoint.Address != null)
265 {
266 // Fixing a bug where teleporting while sitting results in the avatar ending up removed from
267 // both regions
268 if (sp.ParentID != (uint)0)
269 sp.StandUp();
270
271 if (!sp.ValidateAttachments())
272 {
273 sp.ControllingClient.SendTeleportFailed("Inconsistent attachment state");
274 return;
275 }
276
277 // the avatar.Close below will clear the child region list. We need this below for (possibly)
278 // closing the child agents, so save it here (we need a copy as it is Clear()-ed).
279 //List<ulong> childRegions = new List<ulong>(avatar.GetKnownRegionList());
280 // Compared to ScenePresence.CrossToNewRegion(), there's no obvious code to handle a teleport
281 // failure at this point (unlike a border crossing failure). So perhaps this can never fail
282 // once we reach here...
283 //avatar.Scene.RemoveCapsHandler(avatar.UUID);
284
285 string capsPath = String.Empty;
286
287 AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
288 AgentCircuitData agentCircuit = sp.ControllingClient.RequestClientInfo();
289 agentCircuit.startpos = position;
290 agentCircuit.child = true;
291 agentCircuit.Appearance = sp.Appearance;
292 if (currentAgentCircuit != null)
293 agentCircuit.ServiceURLs = currentAgentCircuit.ServiceURLs;
294
295 if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY))
296 {
297 // brand new agent, let's create a new caps seed
298 agentCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath();
299 }
300
301 string reason = String.Empty;
302
303 // Let's create an agent there if one doesn't exist yet.
304 if (!CreateAgent(sp, reg, finalDestination, agentCircuit, teleportFlags, out reason))
305 {
306 sp.ControllingClient.SendTeleportFailed(String.Format("Destination refused: {0}",
307 reason));
308 return;
309 }
310
311 // OK, it got this agent. Let's close some child agents
312 sp.CloseChildAgents(newRegionX, newRegionY);
313
314 if (NeedsNewAgent(oldRegionX, newRegionX, oldRegionY, newRegionY))
315 {
316 #region IP Translation for NAT
317 IClientIPEndpoint ipepClient;
318 if (sp.ClientView.TryGet(out ipepClient))
319 {
320 capsPath
321 = "http://"
322 + NetworkUtil.GetHostFor(ipepClient.EndPoint, finalDestination.ExternalHostName)
323 + ":"
324 + finalDestination.HttpPort
325 + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
326 }
327 else
328 {
329 capsPath
330 = "http://"
331 + finalDestination.ExternalHostName
332 + ":"
333 + finalDestination.HttpPort
334 + CapsUtil.GetCapsSeedPath(agentCircuit.CapsPath);
335 }
336 #endregion
337
338 if (eq != null)
339 {
340 #region IP Translation for NAT
341 // Uses ipepClient above
342 if (sp.ClientView.TryGet(out ipepClient))
343 {
344 endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
345 }
346 #endregion
347
348 eq.EnableSimulator(destinationHandle, endPoint, sp.UUID);
349
350 // ES makes the client send a UseCircuitCode message to the destination,
351 // which triggers a bunch of things there.
352 // So let's wait
353 Thread.Sleep(200);
354
355 eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
356
357 }
358 else
359 {
360 sp.ControllingClient.InformClientOfNeighbour(destinationHandle, endPoint);
361 }
362 }
363 else
364 {
365 agentCircuit.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, reg.RegionHandle);
366 capsPath = "http://" + finalDestination.ExternalHostName + ":" + finalDestination.HttpPort
367 + "/CAPS/" + agentCircuit.CapsPath + "0000/";
368 }
369
370 // Expect avatar crossing is a heavy-duty function at the destination.
371 // That is where MakeRoot is called, which fetches appearance and inventory.
372 // Plus triggers OnMakeRoot, which spawns a series of asynchronous updates.
373 //m_commsProvider.InterRegion.ExpectAvatarCrossing(reg.RegionHandle, avatar.ControllingClient.AgentId,
374 // position, false);
375
376 //{
377 // avatar.ControllingClient.SendTeleportFailed("Problem with destination.");
378 // // We should close that agent we just created over at destination...
379 // List<ulong> lst = new List<ulong>();
380 // lst.Add(reg.RegionHandle);
381 // SendCloseChildAgentAsync(avatar.UUID, lst);
382 // return;
383 //}
384
385 SetInTransit(sp.UUID);
386
387 // Let's send a full update of the agent. This is a synchronous call.
388 AgentData agent = new AgentData();
389 sp.CopyTo(agent);
390 agent.Position = position;
391 SetCallbackURL(agent, sp.Scene.RegionInfo);
392
393 UpdateAgent(reg, finalDestination, agent);
394
395 m_log.DebugFormat(
396 "[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, sp.UUID);
397
398
399 if (eq != null)
400 {
401 eq.TeleportFinishEvent(destinationHandle, 13, endPoint,
402 0, teleportFlags, capsPath, sp.UUID);
403 }
404 else
405 {
406 sp.ControllingClient.SendRegionTeleport(destinationHandle, 13, endPoint, 4,
407 teleportFlags, capsPath);
408 }
409
410 // TeleportFinish makes the client send CompleteMovementIntoRegion (at the destination), which
411 // trigers a whole shebang of things there, including MakeRoot. So let's wait for confirmation
412 // that the client contacted the destination before we send the attachments and close things here.
413 if (!WaitForCallback(sp.UUID))
414 {
415 // Client never contacted destination. Let's restore everything back
416 sp.ControllingClient.SendTeleportFailed("Problems connecting to destination.");
417
418 ResetFromTransit(sp.UUID);
419
420 // Yikes! We should just have a ref to scene here.
421 //sp.Scene.InformClientOfNeighbours(sp);
422 EnableChildAgents(sp);
423
424 // Finally, kill the agent we just created at the destination.
425 m_aScene.SimulationService.CloseAgent(finalDestination, sp.UUID);
426
427 return;
428 }
429
430
431 // CrossAttachmentsIntoNewRegion is a synchronous call. We shouldn't need to wait after it
432 CrossAttachmentsIntoNewRegion(finalDestination, sp, true);
433
434 KillEntity(sp.Scene, sp.LocalId);
435
436 sp.MakeChildAgent();
437 // Finally, let's close this previously-known-as-root agent, when the jump is outside the view zone
438
439 if (NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
440 {
441 Thread.Sleep(5000);
442 sp.Close();
443 sp.Scene.IncomingCloseAgent(sp.UUID);
444 }
445 else
446 // now we have a child agent in this region.
447 sp.Reset();
448
449
450 // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
451 if (sp.Scene.NeedSceneCacheClear(sp.UUID))
452 {
453 m_log.DebugFormat(
454 "[ENTITY TRANSFER MODULE]: User {0} is going to another region, profile cache removed",
455 sp.UUID);
456 }
457 }
458 else
459 {
460 sp.ControllingClient.SendTeleportFailed("Remote Region appears to be down");
461 }
462 }
463
464
465 protected virtual bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason)
466 {
467 return m_aScene.SimulationService.CreateAgent(finalDestination, agentCircuit, teleportFlags, out reason);
468 }
469
470 protected virtual bool UpdateAgent(GridRegion reg, GridRegion finalDestination, AgentData agent)
471 {
472 return m_aScene.SimulationService.UpdateAgent(finalDestination, agent);
473 }
474
475 protected virtual void SetCallbackURL(AgentData agent, RegionInfo region)
476 {
477 agent.CallbackURI = "http://" + region.ExternalHostName + ":" + region.HttpPort +
478 "/agent/" + agent.AgentID.ToString() + "/" + region.RegionID.ToString() + "/release/";
479
480 }
481
482 protected void KillEntity(Scene scene, uint localID)
483 {
484 scene.SendKillObject(localID);
485 }
486
487 protected virtual GridRegion GetFinalDestination(GridRegion region)
488 {
489 return region;
490 }
491
492 protected virtual bool NeedsNewAgent(uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY)
493 {
494 return Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY);
495 }
496
497 protected virtual bool NeedsClosing(uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, GridRegion reg)
498 {
499 return Util.IsOutsideView(oldRegionX, newRegionX, oldRegionY, newRegionY);
500 }
501
502 protected virtual bool IsOutsideRegion(Scene s, Vector3 pos)
503 {
504
505 if (s.TestBorderCross(pos, Cardinals.N))
506 return true;
507 if (s.TestBorderCross(pos, Cardinals.S))
508 return true;
509 if (s.TestBorderCross(pos, Cardinals.E))
510 return true;
511 if (s.TestBorderCross(pos, Cardinals.W))
512 return true;
513
514 return false;
515 }
516
517
518 #endregion
519
520 #region Teleport Home
521
522 public virtual void TeleportHome(UUID id, IClientAPI client)
523 {
524 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
525
526 OpenSim.Services.Interfaces.PresenceInfo pinfo = m_aScene.PresenceService.GetAgent(client.SessionId);
527
528 if (pinfo != null)
529 {
530 GridRegion regionInfo = m_aScene.GridService.GetRegionByUUID(UUID.Zero, pinfo.HomeRegionID);
531 if (regionInfo == null)
532 {
533 // can't find the Home region: Tell viewer and abort
534 client.SendTeleportFailed("Your home region could not be found.");
535 return;
536 }
537 // a little eekie that this goes back to Scene and with a forced cast, will fix that at some point...
538 ((Scene)(client.Scene)).RequestTeleportLocation(
539 client, regionInfo.RegionHandle, pinfo.HomePosition, pinfo.HomeLookAt,
540 (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome));
541 }
542 }
543
544 #endregion
545
546
547 #region Agent Crossings
548
549 public void Cross(ScenePresence agent, bool isFlying)
550 {
551 Scene scene = agent.Scene;
552 Vector3 pos = agent.AbsolutePosition;
553 Vector3 newpos = new Vector3(pos.X, pos.Y, pos.Z);
554 uint neighbourx = scene.RegionInfo.RegionLocX;
555 uint neighboury = scene.RegionInfo.RegionLocY;
556 const float boundaryDistance = 1.7f;
557 Vector3 northCross = new Vector3(0, boundaryDistance, 0);
558 Vector3 southCross = new Vector3(0, -1 * boundaryDistance, 0);
559 Vector3 eastCross = new Vector3(boundaryDistance, 0, 0);
560 Vector3 westCross = new Vector3(-1 * boundaryDistance, 0, 0);
561
562 // distance to edge that will trigger crossing
563
564
565 // distance into new region to place avatar
566 const float enterDistance = 0.5f;
567
568 if (scene.TestBorderCross(pos + westCross, Cardinals.W))
569 {
570 if (scene.TestBorderCross(pos + northCross, Cardinals.N))
571 {
572 Border b = scene.GetCrossedBorder(pos + northCross, Cardinals.N);
573 neighboury += (uint)(int)(b.BorderLine.Z / (int)Constants.RegionSize);
574 }
575 else if (scene.TestBorderCross(pos + southCross, Cardinals.S))
576 {
577 Border b = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
578 if (b.TriggerRegionX == 0 && b.TriggerRegionY == 0)
579 {
580 neighboury--;
581 newpos.Y = Constants.RegionSize - enterDistance;
582 }
583 else
584 {
585 neighboury = b.TriggerRegionY;
586 neighbourx = b.TriggerRegionX;
587
588 Vector3 newposition = pos;
589 newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
590 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
591 agent.ControllingClient.SendAgentAlertMessage(
592 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
593 InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
594 return;
595 }
596 }
597
598 Border ba = scene.GetCrossedBorder(pos + westCross, Cardinals.W);
599 if (ba.TriggerRegionX == 0 && ba.TriggerRegionY == 0)
600 {
601 neighbourx--;
602 newpos.X = Constants.RegionSize - enterDistance;
603 }
604 else
605 {
606 neighboury = ba.TriggerRegionY;
607 neighbourx = ba.TriggerRegionX;
608
609
610 Vector3 newposition = pos;
611 newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
612 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
613 agent.ControllingClient.SendAgentAlertMessage(
614 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
615 InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
616
617
618 return;
619 }
620
621 }
622 else if (scene.TestBorderCross(pos + eastCross, Cardinals.E))
623 {
624 Border b = scene.GetCrossedBorder(pos + eastCross, Cardinals.E);
625 neighbourx += (uint)(int)(b.BorderLine.Z / (int)Constants.RegionSize);
626 newpos.X = enterDistance;
627
628 if (scene.TestBorderCross(pos + southCross, Cardinals.S))
629 {
630 Border ba = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
631 if (ba.TriggerRegionX == 0 && ba.TriggerRegionY == 0)
632 {
633 neighboury--;
634 newpos.Y = Constants.RegionSize - enterDistance;
635 }
636 else
637 {
638 neighboury = ba.TriggerRegionY;
639 neighbourx = ba.TriggerRegionX;
640 Vector3 newposition = pos;
641 newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
642 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
643 agent.ControllingClient.SendAgentAlertMessage(
644 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
645 InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
646 return;
647 }
648 }
649 else if (scene.TestBorderCross(pos + northCross, Cardinals.N))
650 {
651 Border c = scene.GetCrossedBorder(pos + northCross, Cardinals.N);
652 neighboury += (uint)(int)(c.BorderLine.Z / (int)Constants.RegionSize);
653 newpos.Y = enterDistance;
654 }
655
656
657 }
658 else if (scene.TestBorderCross(pos + southCross, Cardinals.S))
659 {
660 Border b = scene.GetCrossedBorder(pos + southCross, Cardinals.S);
661 if (b.TriggerRegionX == 0 && b.TriggerRegionY == 0)
662 {
663 neighboury--;
664 newpos.Y = Constants.RegionSize - enterDistance;
665 }
666 else
667 {
668 neighboury = b.TriggerRegionY;
669 neighbourx = b.TriggerRegionX;
670 Vector3 newposition = pos;
671 newposition.X += (scene.RegionInfo.RegionLocX - neighbourx) * Constants.RegionSize;
672 newposition.Y += (scene.RegionInfo.RegionLocY - neighboury) * Constants.RegionSize;
673 agent.ControllingClient.SendAgentAlertMessage(
674 String.Format("Moving you to region {0},{1}", neighbourx, neighboury), false);
675 InformClientToInitateTeleportToLocation(agent, neighbourx, neighboury, newposition, scene);
676 return;
677 }
678 }
679 else if (scene.TestBorderCross(pos + northCross, Cardinals.N))
680 {
681
682 Border b = scene.GetCrossedBorder(pos + northCross, Cardinals.N);
683 neighboury += (uint)(int)(b.BorderLine.Z / (int)Constants.RegionSize);
684 newpos.Y = enterDistance;
685 }
686
687 /*
688
689 if (pos.X < boundaryDistance) //West
690 {
691 neighbourx--;
692 newpos.X = Constants.RegionSize - enterDistance;
693 }
694 else if (pos.X > Constants.RegionSize - boundaryDistance) // East
695 {
696 neighbourx++;
697 newpos.X = enterDistance;
698 }
699
700 if (pos.Y < boundaryDistance) // South
701 {
702 neighboury--;
703 newpos.Y = Constants.RegionSize - enterDistance;
704 }
705 else if (pos.Y > Constants.RegionSize - boundaryDistance) // North
706 {
707 neighboury++;
708 newpos.Y = enterDistance;
709 }
710 */
711
712 CrossAgentToNewRegionDelegate d = CrossAgentToNewRegionAsync;
713 d.BeginInvoke(agent, newpos, neighbourx, neighboury, isFlying, CrossAgentToNewRegionCompleted, d);
714
715 }
716
717
718 public delegate void InformClientToInitateTeleportToLocationDelegate(ScenePresence agent, uint regionX, uint regionY,
719 Vector3 position,
720 Scene initiatingScene);
721
722 private void InformClientToInitateTeleportToLocation(ScenePresence agent, uint regionX, uint regionY, Vector3 position, Scene initiatingScene)
723 {
724
725 // This assumes that we know what our neighbors are.
726
727 InformClientToInitateTeleportToLocationDelegate d = InformClientToInitiateTeleportToLocationAsync;
728 d.BeginInvoke(agent, regionX, regionY, position, initiatingScene,
729 InformClientToInitiateTeleportToLocationCompleted,
730 d);
731 }
732
733 public void InformClientToInitiateTeleportToLocationAsync(ScenePresence agent, uint regionX, uint regionY, Vector3 position,
734 Scene initiatingScene)
735 {
736 Thread.Sleep(10000);
737 IMessageTransferModule im = initiatingScene.RequestModuleInterface<IMessageTransferModule>();
738 if (im != null)
739 {
740 UUID gotoLocation = Util.BuildFakeParcelID(
741 Util.UIntsToLong(
742 (regionX *
743 (uint)Constants.RegionSize),
744 (regionY *
745 (uint)Constants.RegionSize)),
746 (uint)(int)position.X,
747 (uint)(int)position.Y,
748 (uint)(int)position.Z);
749 GridInstantMessage m = new GridInstantMessage(initiatingScene, UUID.Zero,
750 "Region", agent.UUID,
751 (byte)InstantMessageDialog.GodLikeRequestTeleport, false,
752 "", gotoLocation, false, new Vector3(127, 0, 0),
753 new Byte[0]);
754 im.SendInstantMessage(m, delegate(bool success)
755 {
756 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Client Initiating Teleport sending IM success = {0}", success);
757 });
758
759 }
760 }
761
762 private void InformClientToInitiateTeleportToLocationCompleted(IAsyncResult iar)
763 {
764 InformClientToInitateTeleportToLocationDelegate icon =
765 (InformClientToInitateTeleportToLocationDelegate)iar.AsyncState;
766 icon.EndInvoke(iar);
767 }
768
769 public delegate ScenePresence CrossAgentToNewRegionDelegate(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, bool isFlying);
770
771 /// <summary>
772 /// This Closes child agents on neighboring regions
773 /// Calls an asynchronous method to do so.. so it doesn't lag the sim.
774 /// </summary>
775 protected ScenePresence CrossAgentToNewRegionAsync(ScenePresence agent, Vector3 pos, uint neighbourx, uint neighboury, bool isFlying)
776 {
777 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} to {2}-{3}", agent.Firstname, agent.Lastname, neighbourx, neighboury);
778
779 Scene m_scene = agent.Scene;
780 ulong neighbourHandle = Utils.UIntsToLong((uint)(neighbourx * Constants.RegionSize), (uint)(neighboury * Constants.RegionSize));
781
782 int x = (int)(neighbourx * Constants.RegionSize), y = (int)(neighboury * Constants.RegionSize);
783 GridRegion neighbourRegion = m_scene.GridService.GetRegionByPosition(m_scene.RegionInfo.ScopeID, (int)x, (int)y);
784
785 if (neighbourRegion != null && agent.ValidateAttachments())
786 {
787 pos = pos + (agent.Velocity);
788
789 SetInTransit(agent.UUID);
790 AgentData cAgent = new AgentData();
791 agent.CopyTo(cAgent);
792 cAgent.Position = pos;
793 if (isFlying)
794 cAgent.ControlFlags |= (uint)AgentManager.ControlFlags.AGENT_CONTROL_FLY;
795 cAgent.CallbackURI = "http://" + m_scene.RegionInfo.ExternalHostName + ":" + m_scene.RegionInfo.HttpPort +
796 "/agent/" + agent.UUID.ToString() + "/" + m_scene.RegionInfo.RegionID.ToString() + "/release/";
797
798 m_scene.SimulationService.UpdateAgent(neighbourRegion, cAgent);
799
800 // Next, let's close the child agent connections that are too far away.
801 agent.CloseChildAgents(neighbourx, neighboury);
802
803 //AgentCircuitData circuitdata = m_controllingClient.RequestClientInfo();
804 agent.ControllingClient.RequestClientInfo();
805
806 //m_log.Debug("BEFORE CROSS");
807 //Scene.DumpChildrenSeeds(UUID);
808 //DumpKnownRegions();
809 string agentcaps;
810 if (!agent.KnownRegions.TryGetValue(neighbourRegion.RegionHandle, out agentcaps))
811 {
812 m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: No ENTITY TRANSFER MODULE information for region handle {0}, exiting CrossToNewRegion.",
813 neighbourRegion.RegionHandle);
814 return agent;
815 }
816 // TODO Should construct this behind a method
817 string capsPath =
818 "http://" + neighbourRegion.ExternalHostName + ":" + neighbourRegion.HttpPort
819 + "/CAPS/" + agentcaps /*circuitdata.CapsPath*/ + "0000/";
820
821 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1}", capsPath, agent.UUID);
822
823 IEventQueue eq = agent.Scene.RequestModuleInterface<IEventQueue>();
824 if (eq != null)
825 {
826 eq.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
827 capsPath, agent.UUID, agent.ControllingClient.SessionId);
828 }
829 else
830 {
831 agent.ControllingClient.CrossRegion(neighbourHandle, pos, agent.Velocity, neighbourRegion.ExternalEndPoint,
832 capsPath);
833 }
834
835 if (!WaitForCallback(agent.UUID))
836 {
837 m_log.Debug("[ENTITY TRANSFER MODULE]: Callback never came in crossing agent");
838 ResetFromTransit(agent.UUID);
839
840 // Yikes! We should just have a ref to scene here.
841 //agent.Scene.InformClientOfNeighbours(agent);
842 EnableChildAgents(agent);
843
844 return agent;
845 }
846
847 agent.MakeChildAgent();
848 // now we have a child agent in this region. Request all interesting data about other (root) agents
849 agent.SendInitialFullUpdateToAllClients();
850
851 CrossAttachmentsIntoNewRegion(neighbourRegion, agent, true);
852
853 // m_scene.SendKillObject(m_localId);
854
855 agent.Scene.NotifyMyCoarseLocationChange();
856 // the user may change their profile information in other region,
857 // so the userinfo in UserProfileCache is not reliable any more, delete it
858 // REFACTORING PROBLEM. Well, not a problem, but this method is HORRIBLE!
859 if (agent.Scene.NeedSceneCacheClear(agent.UUID))
860 {
861 m_log.DebugFormat(
862 "[ENTITY TRANSFER MODULE]: User {0} is going to another region", agent.UUID);
863 }
864 }
865
866 //m_log.Debug("AFTER CROSS");
867 //Scene.DumpChildrenSeeds(UUID);
868 //DumpKnownRegions();
869 return agent;
870 }
871
872 private void CrossAgentToNewRegionCompleted(IAsyncResult iar)
873 {
874 CrossAgentToNewRegionDelegate icon = (CrossAgentToNewRegionDelegate)iar.AsyncState;
875 ScenePresence agent = icon.EndInvoke(iar);
876
877 // If the cross was successful, this agent is a child agent
878 if (agent.IsChildAgent)
879 agent.Reset();
880 else // Not successful
881 agent.RestoreInCurrentScene();
882
883 // In any case
884 agent.NotInTransit();
885
886 //m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Crossing agent {0} {1} completed.", agent.Firstname, agent.Lastname);
887 }
888
889 #endregion
890
891 #region Enable Child Agent
892 /// <summary>
893 /// This informs a single neighboring region about agent "avatar".
894 /// Calls an asynchronous method to do so.. so it doesn't lag the sim.
895 /// </summary>
896 public void EnableChildAgent(ScenePresence sp, GridRegion region)
897 {
898 AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
899 agent.BaseFolder = UUID.Zero;
900 agent.InventoryFolder = UUID.Zero;
901 agent.startpos = new Vector3(128, 128, 70);
902 agent.child = true;
903 agent.Appearance = sp.Appearance;
904
905 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
906 d.BeginInvoke(sp, agent, region, region.ExternalEndPoint, true,
907 InformClientOfNeighbourCompleted,
908 d);
909 }
910 #endregion
911
912 #region Enable Child Agents
913
914 private delegate void InformClientOfNeighbourDelegate(
915 ScenePresence avatar, AgentCircuitData a, GridRegion reg, IPEndPoint endPoint, bool newAgent);
916
917 /// <summary>
918 /// This informs all neighboring regions about agent "avatar".
919 /// Calls an asynchronous method to do so.. so it doesn't lag the sim.
920 /// </summary>
921 public void EnableChildAgents(ScenePresence sp)
922 {
923 List<GridRegion> neighbours = new List<GridRegion>();
924 RegionInfo m_regionInfo = sp.Scene.RegionInfo;
925
926 if (m_regionInfo != null)
927 {
928 neighbours = RequestNeighbours(sp.Scene, m_regionInfo.RegionLocX, m_regionInfo.RegionLocY);
929 }
930 else
931 {
932 m_log.Debug("[ENTITY TRANSFER MODULE]: m_regionInfo was null in EnableChildAgents, is this a NPC?");
933 }
934
935 /// We need to find the difference between the new regions where there are no child agents
936 /// and the regions where there are already child agents. We only send notification to the former.
937 List<ulong> neighbourHandles = NeighbourHandles(neighbours); // on this region
938 neighbourHandles.Add(sp.Scene.RegionInfo.RegionHandle); // add this region too
939 List<ulong> previousRegionNeighbourHandles;
940
941 if (sp.Scene.CapsModule != null)
942 {
943 previousRegionNeighbourHandles =
944 new List<ulong>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID).Keys);
945 }
946 else
947 {
948 previousRegionNeighbourHandles = new List<ulong>();
949 }
950
951 List<ulong> newRegions = NewNeighbours(neighbourHandles, previousRegionNeighbourHandles);
952 List<ulong> oldRegions = OldNeighbours(neighbourHandles, previousRegionNeighbourHandles);
953
954 //Dump("Current Neighbors", neighbourHandles);
955 //Dump("Previous Neighbours", previousRegionNeighbourHandles);
956 //Dump("New Neighbours", newRegions);
957 //Dump("Old Neighbours", oldRegions);
958
959 /// Update the scene presence's known regions here on this region
960 sp.DropOldNeighbours(oldRegions);
961
962 /// Collect as many seeds as possible
963 Dictionary<ulong, string> seeds;
964 if (sp.Scene.CapsModule != null)
965 seeds
966 = new Dictionary<ulong, string>(sp.Scene.CapsModule.GetChildrenSeeds(sp.UUID));
967 else
968 seeds = new Dictionary<ulong, string>();
969
970 //m_log.Debug(" !!! No. of seeds: " + seeds.Count);
971 if (!seeds.ContainsKey(sp.Scene.RegionInfo.RegionHandle))
972 seeds.Add(sp.Scene.RegionInfo.RegionHandle, sp.ControllingClient.RequestClientInfo().CapsPath);
973
974 /// Create the necessary child agents
975 List<AgentCircuitData> cagents = new List<AgentCircuitData>();
976 foreach (GridRegion neighbour in neighbours)
977 {
978 if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle)
979 {
980
981 AgentCircuitData currentAgentCircuit = sp.Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
982 AgentCircuitData agent = sp.ControllingClient.RequestClientInfo();
983 agent.BaseFolder = UUID.Zero;
984 agent.InventoryFolder = UUID.Zero;
985 agent.startpos = new Vector3(128, 128, 70);
986 agent.child = true;
987 agent.Appearance = sp.Appearance;
988 if (currentAgentCircuit != null)
989 agent.ServiceURLs = currentAgentCircuit.ServiceURLs;
990
991 if (newRegions.Contains(neighbour.RegionHandle))
992 {
993 agent.CapsPath = CapsUtil.GetRandomCapsObjectPath();
994 sp.AddNeighbourRegion(neighbour.RegionHandle, agent.CapsPath);
995 seeds.Add(neighbour.RegionHandle, agent.CapsPath);
996 }
997 else
998 agent.CapsPath = sp.Scene.CapsModule.GetChildSeed(sp.UUID, neighbour.RegionHandle);
999
1000 cagents.Add(agent);
1001 }
1002 }
1003
1004 /// Update all child agent with everyone's seeds
1005 foreach (AgentCircuitData a in cagents)
1006 {
1007 a.ChildrenCapSeeds = new Dictionary<ulong, string>(seeds);
1008 }
1009
1010 if (sp.Scene.CapsModule != null)
1011 {
1012 sp.Scene.CapsModule.SetChildrenSeed(sp.UUID, seeds);
1013 }
1014 sp.KnownRegions = seeds;
1015 //avatar.Scene.DumpChildrenSeeds(avatar.UUID);
1016 //avatar.DumpKnownRegions();
1017
1018 bool newAgent = false;
1019 int count = 0;
1020 foreach (GridRegion neighbour in neighbours)
1021 {
1022 //m_log.WarnFormat("--> Going to send child agent to {0}", neighbour.RegionName);
1023 // Don't do it if there's already an agent in that region
1024 if (newRegions.Contains(neighbour.RegionHandle))
1025 newAgent = true;
1026 else
1027 newAgent = false;
1028
1029 if (neighbour.RegionHandle != sp.Scene.RegionInfo.RegionHandle)
1030 {
1031 InformClientOfNeighbourDelegate d = InformClientOfNeighbourAsync;
1032 try
1033 {
1034 d.BeginInvoke(sp, cagents[count], neighbour, neighbour.ExternalEndPoint, newAgent,
1035 InformClientOfNeighbourCompleted,
1036 d);
1037 }
1038
1039 catch (ArgumentOutOfRangeException)
1040 {
1041 m_log.ErrorFormat(
1042 "[ENTITY TRANSFER MODULE]: Neighbour Regions response included the current region in the neighbor list. The following region will not display to the client: {0} for region {1} ({2}, {3}).",
1043 neighbour.ExternalHostName,
1044 neighbour.RegionHandle,
1045 neighbour.RegionLocX,
1046 neighbour.RegionLocY);
1047 }
1048 catch (Exception e)
1049 {
1050 m_log.ErrorFormat(
1051 "[ENTITY TRANSFER MODULE]: Could not resolve external hostname {0} for region {1} ({2}, {3}). {4}",
1052 neighbour.ExternalHostName,
1053 neighbour.RegionHandle,
1054 neighbour.RegionLocX,
1055 neighbour.RegionLocY,
1056 e);
1057
1058 // FIXME: Okay, even though we've failed, we're still going to throw the exception on,
1059 // since I don't know what will happen if we just let the client continue
1060
1061 // XXX: Well, decided to swallow the exception instead for now. Let us see how that goes.
1062 // throw e;
1063
1064 }
1065 }
1066 count++;
1067 }
1068 }
1069
1070 private void InformClientOfNeighbourCompleted(IAsyncResult iar)
1071 {
1072 InformClientOfNeighbourDelegate icon = (InformClientOfNeighbourDelegate)iar.AsyncState;
1073 icon.EndInvoke(iar);
1074 //m_log.WarnFormat(" --> InformClientOfNeighbourCompleted");
1075 }
1076
1077 /// <summary>
1078 /// Async component for informing client of which neighbours exist
1079 /// </summary>
1080 /// <remarks>
1081 /// This needs to run asynchronously, as a network timeout may block the thread for a long while
1082 /// </remarks>
1083 /// <param name="remoteClient"></param>
1084 /// <param name="a"></param>
1085 /// <param name="regionHandle"></param>
1086 /// <param name="endPoint"></param>
1087 private void InformClientOfNeighbourAsync(ScenePresence sp, AgentCircuitData a, GridRegion reg,
1088 IPEndPoint endPoint, bool newAgent)
1089 {
1090 // Let's wait just a little to give time to originating regions to catch up with closing child agents
1091 // after a cross here
1092 Thread.Sleep(500);
1093
1094 Scene m_scene = sp.Scene;
1095
1096 uint x, y;
1097 Utils.LongToUInts(reg.RegionHandle, out x, out y);
1098 x = x / Constants.RegionSize;
1099 y = y / Constants.RegionSize;
1100 m_log.Info("[ENTITY TRANSFER MODULE]: Starting to inform client about neighbour " + x + ", " + y + "(" + endPoint.ToString() + ")");
1101
1102 string capsPath = "http://" + reg.ExternalHostName + ":" + reg.HttpPort
1103 + "/CAPS/" + a.CapsPath + "0000/";
1104
1105 string reason = String.Empty;
1106
1107
1108 bool regionAccepted = m_scene.SimulationService.CreateAgent(reg, a, 0, out reason); // m_interregionCommsOut.SendCreateChildAgent(reg.RegionHandle, a, 0, out reason);
1109
1110 if (regionAccepted && newAgent)
1111 {
1112 IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
1113 if (eq != null)
1114 {
1115 #region IP Translation for NAT
1116 IClientIPEndpoint ipepClient;
1117 if (sp.ClientView.TryGet(out ipepClient))
1118 {
1119 endPoint.Address = NetworkUtil.GetIPFor(ipepClient.EndPoint, endPoint.Address);
1120 }
1121 #endregion
1122
1123 eq.EnableSimulator(reg.RegionHandle, endPoint, sp.UUID);
1124 eq.EstablishAgentCommunication(sp.UUID, endPoint, capsPath);
1125 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending new CAPS seed url {0} to client {1} in region {2}",
1126 capsPath, sp.UUID, sp.Scene.RegionInfo.RegionName);
1127 }
1128 else
1129 {
1130 sp.ControllingClient.InformClientOfNeighbour(reg.RegionHandle, endPoint);
1131 // TODO: make Event Queue disablable!
1132 }
1133
1134 m_log.Info("[ENTITY TRANSFER MODULE]: Completed inform client about neighbour " + endPoint.ToString());
1135
1136 }
1137
1138 }
1139
1140 protected List<GridRegion> RequestNeighbours(Scene pScene, uint pRegionLocX, uint pRegionLocY)
1141 {
1142 RegionInfo m_regionInfo = pScene.RegionInfo;
1143
1144 Border[] northBorders = pScene.NorthBorders.ToArray();
1145 Border[] southBorders = pScene.SouthBorders.ToArray();
1146 Border[] eastBorders = pScene.EastBorders.ToArray();
1147 Border[] westBorders = pScene.WestBorders.ToArray();
1148
1149 // Legacy one region. Provided for simplicity while testing the all inclusive method in the else statement.
1150 if (northBorders.Length <= 1 && southBorders.Length <= 1 && eastBorders.Length <= 1 && westBorders.Length <= 1)
1151 {
1152 return pScene.GridService.GetNeighbours(m_regionInfo.ScopeID, m_regionInfo.RegionID);
1153 }
1154 else
1155 {
1156 Vector2 extent = Vector2.Zero;
1157 for (int i = 0; i < eastBorders.Length; i++)
1158 {
1159 extent.X = (eastBorders[i].BorderLine.Z > extent.X) ? eastBorders[i].BorderLine.Z : extent.X;
1160 }
1161 for (int i = 0; i < northBorders.Length; i++)
1162 {
1163 extent.Y = (northBorders[i].BorderLine.Z > extent.Y) ? northBorders[i].BorderLine.Z : extent.Y;
1164 }
1165
1166 // Loss of fraction on purpose
1167 extent.X = ((int)extent.X / (int)Constants.RegionSize) + 1;
1168 extent.Y = ((int)extent.Y / (int)Constants.RegionSize) + 1;
1169
1170 int startX = (int)(pRegionLocX - 1) * (int)Constants.RegionSize;
1171 int startY = (int)(pRegionLocY - 1) * (int)Constants.RegionSize;
1172
1173 int endX = ((int)pRegionLocX + (int)extent.X) * (int)Constants.RegionSize;
1174 int endY = ((int)pRegionLocY + (int)extent.Y) * (int)Constants.RegionSize;
1175
1176 List<GridRegion> neighbours = pScene.GridService.GetRegionRange(m_regionInfo.ScopeID, startX, endX, startY, endY);
1177 neighbours.RemoveAll(delegate(GridRegion r) { return r.RegionID == m_regionInfo.RegionID; });
1178
1179 return neighbours;
1180 }
1181 }
1182
1183 private List<ulong> NewNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
1184 {
1185 return currentNeighbours.FindAll(delegate(ulong handle) { return !previousNeighbours.Contains(handle); });
1186 }
1187
1188 // private List<ulong> CommonNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
1189 // {
1190 // return currentNeighbours.FindAll(delegate(ulong handle) { return previousNeighbours.Contains(handle); });
1191 // }
1192
1193 private List<ulong> OldNeighbours(List<ulong> currentNeighbours, List<ulong> previousNeighbours)
1194 {
1195 return previousNeighbours.FindAll(delegate(ulong handle) { return !currentNeighbours.Contains(handle); });
1196 }
1197
1198 private List<ulong> NeighbourHandles(List<GridRegion> neighbours)
1199 {
1200 List<ulong> handles = new List<ulong>();
1201 foreach (GridRegion reg in neighbours)
1202 {
1203 handles.Add(reg.RegionHandle);
1204 }
1205 return handles;
1206 }
1207
1208 private void Dump(string msg, List<ulong> handles)
1209 {
1210 m_log.InfoFormat("-------------- HANDLE DUMP ({0}) ---------", msg);
1211 foreach (ulong handle in handles)
1212 {
1213 uint x, y;
1214 Utils.LongToUInts(handle, out x, out y);
1215 x = x / Constants.RegionSize;
1216 y = y / Constants.RegionSize;
1217 m_log.InfoFormat("({0}, {1})", x, y);
1218 }
1219 }
1220
1221 #endregion
1222
1223
1224 #region Agent Arrived
1225 public void AgentArrivedAtDestination(UUID id)
1226 {
1227 //m_log.Debug(" >>> ReleaseAgent called <<< ");
1228 ResetFromTransit(id);
1229 }
1230
1231 #endregion
1232
1233 #region Object Transfers
1234 /// <summary>
1235 /// Move the given scene object into a new region depending on which region its absolute position has moved
1236 /// into.
1237 ///
1238 /// This method locates the new region handle and offsets the prim position for the new region
1239 /// </summary>
1240 /// <param name="attemptedPosition">the attempted out of region position of the scene object</param>
1241 /// <param name="grp">the scene object that we're crossing</param>
1242 public void Cross(SceneObjectGroup grp, Vector3 attemptedPosition, bool silent)
1243 {
1244 if (grp == null)
1245 return;
1246 if (grp.IsDeleted)
1247 return;
1248
1249 Scene scene = grp.Scene;
1250 if (scene == null)
1251 return;
1252
1253 if (grp.RootPart.DIE_AT_EDGE)
1254 {
1255 // We remove the object here
1256 try
1257 {
1258 scene.DeleteSceneObject(grp, false);
1259 }
1260 catch (Exception)
1261 {
1262 m_log.Warn("[DATABASE]: exception when trying to remove the prim that crossed the border.");
1263 }
1264 return;
1265 }
1266
1267 int thisx = (int)scene.RegionInfo.RegionLocX;
1268 int thisy = (int)scene.RegionInfo.RegionLocY;
1269 Vector3 EastCross = new Vector3(0.1f, 0, 0);
1270 Vector3 WestCross = new Vector3(-0.1f, 0, 0);
1271 Vector3 NorthCross = new Vector3(0, 0.1f, 0);
1272 Vector3 SouthCross = new Vector3(0, -0.1f, 0);
1273
1274
1275 // use this if no borders were crossed!
1276 ulong newRegionHandle
1277 = Util.UIntsToLong((uint)((thisx) * Constants.RegionSize),
1278 (uint)((thisy) * Constants.RegionSize));
1279
1280 Vector3 pos = attemptedPosition;
1281
1282 int changeX = 1;
1283 int changeY = 1;
1284
1285 if (scene.TestBorderCross(attemptedPosition + WestCross, Cardinals.W))
1286 {
1287 if (scene.TestBorderCross(attemptedPosition + SouthCross, Cardinals.S))
1288 {
1289
1290 Border crossedBorderx = scene.GetCrossedBorder(attemptedPosition + WestCross, Cardinals.W);
1291
1292 if (crossedBorderx.BorderLine.Z > 0)
1293 {
1294 pos.X = ((pos.X + crossedBorderx.BorderLine.Z));
1295 changeX = (int)(crossedBorderx.BorderLine.Z / (int)Constants.RegionSize);
1296 }
1297 else
1298 pos.X = ((pos.X + Constants.RegionSize));
1299
1300 Border crossedBordery = scene.GetCrossedBorder(attemptedPosition + SouthCross, Cardinals.S);
1301 //(crossedBorderx.BorderLine.Z / (int)Constants.RegionSize)
1302
1303 if (crossedBordery.BorderLine.Z > 0)
1304 {
1305 pos.Y = ((pos.Y + crossedBordery.BorderLine.Z));
1306 changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize);
1307 }
1308 else
1309 pos.Y = ((pos.Y + Constants.RegionSize));
1310
1311
1312
1313 newRegionHandle
1314 = Util.UIntsToLong((uint)((thisx - changeX) * Constants.RegionSize),
1315 (uint)((thisy - changeY) * Constants.RegionSize));
1316 // x - 1
1317 // y - 1
1318 }
1319 else if (scene.TestBorderCross(attemptedPosition + NorthCross, Cardinals.N))
1320 {
1321 Border crossedBorderx = scene.GetCrossedBorder(attemptedPosition + WestCross, Cardinals.W);
1322
1323 if (crossedBorderx.BorderLine.Z > 0)
1324 {
1325 pos.X = ((pos.X + crossedBorderx.BorderLine.Z));
1326 changeX = (int)(crossedBorderx.BorderLine.Z / (int)Constants.RegionSize);
1327 }
1328 else
1329 pos.X = ((pos.X + Constants.RegionSize));
1330
1331
1332 Border crossedBordery = scene.GetCrossedBorder(attemptedPosition + SouthCross, Cardinals.S);
1333 //(crossedBorderx.BorderLine.Z / (int)Constants.RegionSize)
1334
1335 if (crossedBordery.BorderLine.Z > 0)
1336 {
1337 pos.Y = ((pos.Y + crossedBordery.BorderLine.Z));
1338 changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize);
1339 }
1340 else
1341 pos.Y = ((pos.Y + Constants.RegionSize));
1342
1343 newRegionHandle
1344 = Util.UIntsToLong((uint)((thisx - changeX) * Constants.RegionSize),
1345 (uint)((thisy + changeY) * Constants.RegionSize));
1346 // x - 1
1347 // y + 1
1348 }
1349 else
1350 {
1351 Border crossedBorderx = scene.GetCrossedBorder(attemptedPosition + WestCross, Cardinals.W);
1352
1353 if (crossedBorderx.BorderLine.Z > 0)
1354 {
1355 pos.X = ((pos.X + crossedBorderx.BorderLine.Z));
1356 changeX = (int)(crossedBorderx.BorderLine.Z / (int)Constants.RegionSize);
1357 }
1358 else
1359 pos.X = ((pos.X + Constants.RegionSize));
1360
1361 newRegionHandle
1362 = Util.UIntsToLong((uint)((thisx - changeX) * Constants.RegionSize),
1363 (uint)(thisy * Constants.RegionSize));
1364 // x - 1
1365 }
1366 }
1367 else if (scene.TestBorderCross(attemptedPosition + EastCross, Cardinals.E))
1368 {
1369 if (scene.TestBorderCross(attemptedPosition + SouthCross, Cardinals.S))
1370 {
1371
1372 pos.X = ((pos.X - Constants.RegionSize));
1373 Border crossedBordery = scene.GetCrossedBorder(attemptedPosition + SouthCross, Cardinals.S);
1374 //(crossedBorderx.BorderLine.Z / (int)Constants.RegionSize)
1375
1376 if (crossedBordery.BorderLine.Z > 0)
1377 {
1378 pos.Y = ((pos.Y + crossedBordery.BorderLine.Z));
1379 changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize);
1380 }
1381 else
1382 pos.Y = ((pos.Y + Constants.RegionSize));
1383
1384
1385 newRegionHandle
1386 = Util.UIntsToLong((uint)((thisx + changeX) * Constants.RegionSize),
1387 (uint)((thisy - changeY) * Constants.RegionSize));
1388 // x + 1
1389 // y - 1
1390 }
1391 else if (scene.TestBorderCross(attemptedPosition + NorthCross, Cardinals.N))
1392 {
1393 pos.X = ((pos.X - Constants.RegionSize));
1394 pos.Y = ((pos.Y - Constants.RegionSize));
1395 newRegionHandle
1396 = Util.UIntsToLong((uint)((thisx + changeX) * Constants.RegionSize),
1397 (uint)((thisy + changeY) * Constants.RegionSize));
1398 // x + 1
1399 // y + 1
1400 }
1401 else
1402 {
1403 pos.X = ((pos.X - Constants.RegionSize));
1404 newRegionHandle
1405 = Util.UIntsToLong((uint)((thisx + changeX) * Constants.RegionSize),
1406 (uint)(thisy * Constants.RegionSize));
1407 // x + 1
1408 }
1409 }
1410 else if (scene.TestBorderCross(attemptedPosition + SouthCross, Cardinals.S))
1411 {
1412 Border crossedBordery = scene.GetCrossedBorder(attemptedPosition + SouthCross, Cardinals.S);
1413 //(crossedBorderx.BorderLine.Z / (int)Constants.RegionSize)
1414
1415 if (crossedBordery.BorderLine.Z > 0)
1416 {
1417 pos.Y = ((pos.Y + crossedBordery.BorderLine.Z));
1418 changeY = (int)(crossedBordery.BorderLine.Z / (int)Constants.RegionSize);
1419 }
1420 else
1421 pos.Y = ((pos.Y + Constants.RegionSize));
1422
1423 newRegionHandle
1424 = Util.UIntsToLong((uint)(thisx * Constants.RegionSize), (uint)((thisy - changeY) * Constants.RegionSize));
1425 // y - 1
1426 }
1427 else if (scene.TestBorderCross(attemptedPosition + NorthCross, Cardinals.N))
1428 {
1429
1430 pos.Y = ((pos.Y - Constants.RegionSize));
1431 newRegionHandle
1432 = Util.UIntsToLong((uint)(thisx * Constants.RegionSize), (uint)((thisy + changeY) * Constants.RegionSize));
1433 // y + 1
1434 }
1435
1436 // Offset the positions for the new region across the border
1437 Vector3 oldGroupPosition = grp.RootPart.GroupPosition;
1438 grp.OffsetForNewRegion(pos);
1439
1440 // If we fail to cross the border, then reset the position of the scene object on that border.
1441 uint x = 0, y = 0;
1442 Utils.LongToUInts(newRegionHandle, out x, out y);
1443 GridRegion destination = scene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
1444 if (destination != null && !CrossPrimGroupIntoNewRegion(destination, grp, silent))
1445 {
1446 grp.OffsetForNewRegion(oldGroupPosition);
1447 grp.ScheduleGroupForFullUpdate();
1448 }
1449 }
1450
1451
1452 /// <summary>
1453 /// Move the given scene object into a new region
1454 /// </summary>
1455 /// <param name="newRegionHandle"></param>
1456 /// <param name="grp">Scene Object Group that we're crossing</param>
1457 /// <returns>
1458 /// true if the crossing itself was successful, false on failure
1459 /// FIMXE: we still return true if the crossing object was not successfully deleted from the originating region
1460 /// </returns>
1461 protected bool CrossPrimGroupIntoNewRegion(GridRegion destination, SceneObjectGroup grp, bool silent)
1462 {
1463 //m_log.Debug(" >>> CrossPrimGroupIntoNewRegion <<<");
1464
1465 bool successYN = false;
1466 grp.RootPart.UpdateFlag = 0;
1467 //int primcrossingXMLmethod = 0;
1468
1469 if (destination != null)
1470 {
1471 //string objectState = grp.GetStateSnapshot();
1472
1473 //successYN
1474 // = m_sceneGridService.PrimCrossToNeighboringRegion(
1475 // newRegionHandle, grp.UUID, m_serialiser.SaveGroupToXml2(grp), primcrossingXMLmethod);
1476 //if (successYN && (objectState != "") && m_allowScriptCrossings)
1477 //{
1478 // successYN = m_sceneGridService.PrimCrossToNeighboringRegion(
1479 // newRegionHandle, grp.UUID, objectState, 100);
1480 //}
1481
1482 //// And the new channel...
1483 //if (m_interregionCommsOut != null)
1484 // successYN = m_interregionCommsOut.SendCreateObject(newRegionHandle, grp, true);
1485 if (m_aScene.SimulationService != null)
1486 successYN = m_aScene.SimulationService.CreateObject(destination, grp, true);
1487
1488 if (successYN)
1489 {
1490 // We remove the object here
1491 try
1492 {
1493 grp.Scene.DeleteSceneObject(grp, silent);
1494 }
1495 catch (Exception e)
1496 {
1497 m_log.ErrorFormat(
1498 "[ENTITY TRANSFER MODULE]: Exception deleting the old object left behind on a border crossing for {0}, {1}",
1499 grp, e);
1500 }
1501 }
1502 else
1503 {
1504 if (!grp.IsDeleted)
1505 {
1506 if (grp.RootPart.PhysActor != null)
1507 {
1508 grp.RootPart.PhysActor.CrossingFailure();
1509 }
1510 }
1511
1512 m_log.ErrorFormat("[ENTITY TRANSFER MODULE]: Prim crossing failed for {0}", grp);
1513 }
1514 }
1515 else
1516 {
1517 m_log.Error("[ENTITY TRANSFER MODULE]: destination was unexpectedly null in Scene.CrossPrimGroupIntoNewRegion()");
1518 }
1519
1520 return successYN;
1521 }
1522
1523 protected bool CrossAttachmentsIntoNewRegion(GridRegion destination, ScenePresence sp, bool silent)
1524 {
1525 List<SceneObjectGroup> m_attachments = sp.Attachments;
1526 lock (m_attachments)
1527 {
1528 // Validate
1529 foreach (SceneObjectGroup gobj in m_attachments)
1530 {
1531 if (gobj == null || gobj.IsDeleted)
1532 return false;
1533 }
1534
1535 foreach (SceneObjectGroup gobj in m_attachments)
1536 {
1537 // If the prim group is null then something must have happened to it!
1538 if (gobj != null && gobj.RootPart != null)
1539 {
1540 // Set the parent localID to 0 so it transfers over properly.
1541 gobj.RootPart.SetParentLocalId(0);
1542 gobj.AbsolutePosition = gobj.RootPart.AttachedPos;
1543 gobj.RootPart.IsAttachment = false;
1544 //gobj.RootPart.LastOwnerID = gobj.GetFromAssetID();
1545 m_log.DebugFormat("[ENTITY TRANSFER MODULE]: Sending attachment {0} to region {1}", gobj.UUID, destination.RegionName);
1546 CrossPrimGroupIntoNewRegion(destination, gobj, silent);
1547 }
1548 }
1549 m_attachments.Clear();
1550
1551 return true;
1552 }
1553 }
1554
1555 #endregion
1556
1557 #region Misc
1558
1559 protected bool WaitForCallback(UUID id)
1560 {
1561 int count = 200;
1562 while (m_agentsInTransit.Contains(id) && count-- > 0)
1563 {
1564 //m_log.Debug(" >>> Waiting... " + count);
1565 Thread.Sleep(100);
1566 }
1567
1568 if (count > 0)
1569 return true;
1570 else
1571 return false;
1572 }
1573
1574 protected void SetInTransit(UUID id)
1575 {
1576 lock (m_agentsInTransit)
1577 {
1578 if (!m_agentsInTransit.Contains(id))
1579 m_agentsInTransit.Add(id);
1580 }
1581 }
1582
1583 protected bool ResetFromTransit(UUID id)
1584 {
1585 lock (m_agentsInTransit)
1586 {
1587 if (m_agentsInTransit.Contains(id))
1588 {
1589 m_agentsInTransit.Remove(id);
1590 return true;
1591 }
1592 }
1593 return false;
1594 }
1595
1596
1597 #endregion
1598
1599 }
1600}
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
new file mode 100644
index 0000000..28593fc
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
@@ -0,0 +1,273 @@
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
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31
32using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Services.Connectors.Hypergrid;
36using OpenSim.Services.Interfaces;
37using OpenSim.Server.Base;
38
39using GridRegion = OpenSim.Services.Interfaces.GridRegion;
40
41using OpenMetaverse;
42using log4net;
43using Nini.Config;
44
45namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
46{
47 public class HGEntityTransferModule : EntityTransferModule, ISharedRegionModule, IEntityTransferModule, IUserAgentVerificationModule
48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50
51 private bool m_Initialized = false;
52
53 private GatekeeperServiceConnector m_GatekeeperConnector;
54
55 #region ISharedRegionModule
56
57 public override string Name
58 {
59 get { return "HGEntityTransferModule"; }
60 }
61
62 public override void Initialise(IConfigSource source)
63 {
64 IConfig moduleConfig = source.Configs["Modules"];
65 if (moduleConfig != null)
66 {
67 string name = moduleConfig.GetString("EntityTransferModule", "");
68 if (name == Name)
69 {
70 m_agentsInTransit = new List<UUID>();
71
72 m_Enabled = true;
73 m_log.InfoFormat("[HG ENTITY TRANSFER MODULE]: {0} enabled.", Name);
74 }
75 }
76 }
77
78 public override void AddRegion(Scene scene)
79 {
80 base.AddRegion(scene);
81 if (m_Enabled)
82 {
83 scene.RegisterModuleInterface<IUserAgentVerificationModule>(this);
84 }
85 }
86
87 protected override void OnNewClient(IClientAPI client)
88 {
89 client.OnTeleportHomeRequest += TeleportHome;
90 client.OnConnectionClosed += new Action<IClientAPI>(OnConnectionClosed);
91 }
92
93
94 public override void RegionLoaded(Scene scene)
95 {
96 base.RegionLoaded(scene);
97 if (m_Enabled)
98 if (!m_Initialized)
99 {
100 m_GatekeeperConnector = new GatekeeperServiceConnector(scene.AssetService);
101 m_Initialized = true;
102 }
103
104 }
105 public override void RemoveRegion(Scene scene)
106 {
107 base.AddRegion(scene);
108 if (m_Enabled)
109 {
110 scene.UnregisterModuleInterface<IUserAgentVerificationModule>(this);
111 }
112 }
113
114
115 #endregion
116
117 #region HG overrides of IEntiryTransferModule
118
119 protected override GridRegion GetFinalDestination(GridRegion region)
120 {
121 int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, region.RegionID);
122 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: region {0} flags: {1}", region.RegionID, flags);
123 if ((flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
124 {
125 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Destination region {0} is hyperlink", region.RegionID);
126 return m_GatekeeperConnector.GetHyperlinkRegion(region, region.RegionID);
127 }
128 return region;
129 }
130
131 protected override bool NeedsClosing(uint oldRegionX, uint newRegionX, uint oldRegionY, uint newRegionY, GridRegion reg)
132 {
133 if (base.NeedsClosing(oldRegionX, newRegionX, oldRegionY, newRegionY, reg))
134 return true;
135
136 int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, reg.RegionID);
137 if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
138 return true;
139
140 return false;
141 }
142
143 protected override bool CreateAgent(ScenePresence sp, GridRegion reg, GridRegion finalDestination, AgentCircuitData agentCircuit, uint teleportFlags, out string reason)
144 {
145 reason = string.Empty;
146 int flags = m_aScene.GridService.GetRegionFlags(m_aScene.RegionInfo.ScopeID, reg.RegionID);
147 if (flags == -1 /* no region in DB */ || (flags & (int)OpenSim.Data.RegionFlags.Hyperlink) != 0)
148 {
149 // this user is going to another grid
150 if (agentCircuit.ServiceURLs.ContainsKey("HomeURI"))
151 {
152 string userAgentDriver = agentCircuit.ServiceURLs["HomeURI"].ToString();
153 IUserAgentService connector = new UserAgentServiceConnector(userAgentDriver);
154 bool success = connector.LoginAgentToGrid(agentCircuit, reg, finalDestination, out reason);
155 if (success)
156 // Log them out of this grid
157 m_aScene.PresenceService.LogoutAgent(agentCircuit.SessionID, sp.AbsolutePosition, sp.Lookat);
158
159 return success;
160 }
161 else
162 {
163 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent does not have a HomeURI address");
164 return false;
165 }
166 }
167
168 return m_aScene.SimulationService.CreateAgent(reg, agentCircuit, teleportFlags, out reason);
169 }
170
171 public override void TeleportHome(UUID id, IClientAPI client)
172 {
173 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Request to teleport {0} {1} home", client.FirstName, client.LastName);
174
175 // Let's find out if this is a foreign user or a local user
176 UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, id);
177 if (account != null)
178 {
179 // local grid user
180 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: User is local");
181 base.TeleportHome(id, client);
182 return;
183 }
184
185 // Foreign user wants to go home
186 //
187 AgentCircuitData aCircuit = ((Scene)(client.Scene)).AuthenticateHandler.GetAgentCircuitData(client.CircuitCode);
188 if (aCircuit == null || (aCircuit != null && !aCircuit.ServiceURLs.ContainsKey("HomeURI")))
189 {
190 client.SendTeleportFailed("Your information has been lost");
191 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Unable to locate agent's gateway information");
192 return;
193 }
194
195 IUserAgentService userAgentService = new UserAgentServiceConnector(aCircuit.ServiceURLs["HomeURI"].ToString());
196 Vector3 position = Vector3.UnitY, lookAt = Vector3.UnitY;
197 GridRegion finalDestination = userAgentService.GetHomeRegion(aCircuit.AgentID, out position, out lookAt);
198 if (finalDestination == null)
199 {
200 client.SendTeleportFailed("Your home region could not be found");
201 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent's home region not found");
202 return;
203 }
204
205 ScenePresence sp = ((Scene)(client.Scene)).GetScenePresence(client.AgentId);
206 if (sp == null)
207 {
208 client.SendTeleportFailed("Internal error");
209 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Agent not found in the scene where it is supposed to be");
210 return;
211 }
212
213 IEventQueue eq = sp.Scene.RequestModuleInterface<IEventQueue>();
214 GridRegion homeGatekeeper = MakeRegion(aCircuit);
215
216 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: teleporting user {0} {1} home to {2} via {3}:{4}:{5}",
217 aCircuit.firstname, aCircuit.lastname, finalDestination.RegionName, homeGatekeeper.ExternalHostName, homeGatekeeper.HttpPort, homeGatekeeper.RegionName);
218
219 DoTeleport(sp, homeGatekeeper, finalDestination, position, lookAt, (uint)(Constants.TeleportFlags.SetLastToTarget | Constants.TeleportFlags.ViaHome), eq);
220 }
221 #endregion
222
223 #region IUserAgentVerificationModule
224
225 public bool VerifyClient(AgentCircuitData aCircuit, string token)
226 {
227 if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
228 {
229 string url = aCircuit.ServiceURLs["HomeURI"].ToString();
230 IUserAgentService security = new UserAgentServiceConnector(url);
231 return security.VerifyClient(aCircuit.SessionID, token);
232 }
233
234 return false;
235 }
236
237 void OnConnectionClosed(IClientAPI obj)
238 {
239 if (obj.IsLoggingOut)
240 {
241 AgentCircuitData aCircuit = ((Scene)(obj.Scene)).AuthenticateHandler.GetAgentCircuitData(obj.CircuitCode);
242
243 if (aCircuit.ServiceURLs.ContainsKey("HomeURI"))
244 {
245 string url = aCircuit.ServiceURLs["HomeURI"].ToString();
246 IUserAgentService security = new UserAgentServiceConnector(url);
247 security.LogoutAgent(obj.AgentId, obj.SessionId);
248 //m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: Sent logout call to UserAgentService @ {0}", url);
249 }
250 else
251 m_log.DebugFormat("[HG ENTITY TRANSFER MODULE]: HomeURI not found for agent {0} logout", obj.AgentId);
252 }
253 }
254
255 #endregion
256
257 private GridRegion MakeRegion(AgentCircuitData aCircuit)
258 {
259 GridRegion region = new GridRegion();
260
261 Uri uri = null;
262 if (!aCircuit.ServiceURLs.ContainsKey("HomeURI") ||
263 (aCircuit.ServiceURLs.ContainsKey("HomeURI") && !Uri.TryCreate(aCircuit.ServiceURLs["HomeURI"].ToString(), UriKind.Absolute, out uri)))
264 return null;
265
266 region.ExternalHostName = uri.Host;
267 region.HttpPort = (uint)uri.Port;
268 region.RegionName = string.Empty;
269 region.InternalEndPoint = new System.Net.IPEndPoint(System.Net.IPAddress.Parse("0.0.0.0"), (int)0);
270 return region;
271 }
272 }
273}
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
new file mode 100644
index 0000000..e303a1f
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGAssetMapper.cs
@@ -0,0 +1,200 @@
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
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using System.Threading;
32using log4net;
33using OpenMetaverse;
34using OpenSim.Framework;
35
36using OpenSim.Region.Framework.Scenes;
37using OpenSim.Region.Framework.Scenes.Serialization;
38using OpenSim.Region.Framework.Interfaces;
39using OpenSim.Services.Interfaces;
40
41//using HyperGrid.Framework;
42//using OpenSim.Region.Communications.Hypergrid;
43
44namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
45{
46 public class HGAssetMapper
47 {
48 #region Fields
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50
51 // This maps between inventory server urls and inventory server clients
52// private Dictionary<string, InventoryClient> m_inventoryServers = new Dictionary<string, InventoryClient>();
53
54 private Scene m_scene;
55
56 #endregion
57
58 #region Constructor
59
60 public HGAssetMapper(Scene scene)
61 {
62 m_scene = scene;
63 }
64
65 #endregion
66
67 #region Internal functions
68
69 public AssetBase FetchAsset(string url, UUID assetID)
70 {
71 AssetBase asset = m_scene.AssetService.Get(url + "/" + assetID.ToString());
72
73 if (asset != null)
74 {
75 m_log.DebugFormat("[HG ASSET MAPPER]: Copied asset {0} from {1} to local asset server. ", asset.ID, url);
76 return asset;
77 }
78 return null;
79 }
80
81 public bool PostAsset(string url, AssetBase asset)
82 {
83 if (asset != null)
84 {
85 // See long comment in AssetCache.AddAsset
86 if (!asset.Temporary || asset.Local)
87 {
88 // We need to copy the asset into a new asset, because
89 // we need to set its ID to be URL+UUID, so that the
90 // HGAssetService dispatches it to the remote grid.
91 // It's not pretty, but the best that can be done while
92 // not having a global naming infrastructure
93 AssetBase asset1 = new AssetBase(asset.FullID, asset.Name, asset.Type);
94 Copy(asset, asset1);
95 try
96 {
97 asset1.ID = url + "/" + asset.ID;
98 }
99 catch
100 {
101 m_log.Warn("[HG ASSET MAPPER]: Oops.");
102 }
103
104 m_scene.AssetService.Store(asset1);
105 m_log.DebugFormat("[HG ASSET MAPPER]: Posted copy of asset {0} from local asset server to {1}", asset1.ID, url);
106 }
107 return true;
108 }
109 else
110 m_log.Warn("[HG ASSET MAPPER]: Tried to post asset to remote server, but asset not in local cache.");
111
112 return false;
113 }
114
115 private void Copy(AssetBase from, AssetBase to)
116 {
117 to.Data = from.Data;
118 to.Description = from.Description;
119 to.FullID = from.FullID;
120 to.ID = from.ID;
121 to.Local = from.Local;
122 to.Name = from.Name;
123 to.Temporary = from.Temporary;
124 to.Type = from.Type;
125
126 }
127
128 // TODO: unused
129 // private void Dump(Dictionary<UUID, bool> lst)
130 // {
131 // m_log.Debug("XXX -------- UUID DUMP ------- XXX");
132 // foreach (KeyValuePair<UUID, bool> kvp in lst)
133 // m_log.Debug(" >> " + kvp.Key + " (texture? " + kvp.Value + ")");
134 // m_log.Debug("XXX -------- UUID DUMP ------- XXX");
135 // }
136
137 #endregion
138
139
140 #region Public interface
141
142 public void Get(UUID assetID, UUID ownerID, string userAssetURL)
143 {
144 // Get the item from the remote asset server onto the local AssetCache
145 // and place an entry in m_assetMap
146
147 m_log.Debug("[HG ASSET MAPPER]: Fetching object " + assetID + " from asset server " + userAssetURL);
148 AssetBase asset = FetchAsset(userAssetURL, assetID);
149
150 if (asset != null)
151 {
152 // OK, now fetch the inside.
153 Dictionary<UUID, int> ids = new Dictionary<UUID, int>();
154 HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, m_scene.AssetService, userAssetURL);
155 uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids);
156 foreach (UUID uuid in ids.Keys)
157 FetchAsset(userAssetURL, uuid);
158
159 m_log.DebugFormat("[HG ASSET MAPPER]: Successfully fetched asset {0} from asset server {1}", asset.ID, userAssetURL);
160
161 }
162 else
163 m_log.Warn("[HG ASSET MAPPER]: Could not fetch asset from remote asset server " + userAssetURL);
164 }
165
166
167 public void Post(UUID assetID, UUID ownerID, string userAssetURL)
168 {
169 // Post the item from the local AssetCache onto the remote asset server
170 // and place an entry in m_assetMap
171
172 m_log.Debug("[HG ASSET MAPPER]: Posting object " + assetID + " to asset server " + userAssetURL);
173 AssetBase asset = m_scene.AssetService.Get(assetID.ToString());
174 if (asset != null)
175 {
176 Dictionary<UUID, int> ids = new Dictionary<UUID, int>();
177 HGUuidGatherer uuidGatherer = new HGUuidGatherer(this, m_scene.AssetService, string.Empty);
178 uuidGatherer.GatherAssetUuids(asset.FullID, (AssetType)asset.Type, ids);
179 foreach (UUID uuid in ids.Keys)
180 {
181 asset = m_scene.AssetService.Get(uuid.ToString());
182 if (asset == null)
183 m_log.DebugFormat("[HG ASSET MAPPER]: Could not find asset {0}", uuid);
184 else
185 PostAsset(userAssetURL, asset);
186 }
187
188 // maybe all pieces got there...
189 m_log.DebugFormat("[HG ASSET MAPPER]: Successfully posted item {0} to asset server {1}", assetID, userAssetURL);
190
191 }
192 else
193 m_log.DebugFormat("[HG ASSET MAPPER]: Something wrong with asset {0}, it could not be found", assetID);
194
195 }
196
197 #endregion
198
199 }
200}
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
new file mode 100644
index 0000000..09798aa
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -0,0 +1,207 @@
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
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31
32using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Services.Connectors.Hypergrid;
36using OpenSim.Services.Interfaces;
37using OpenSim.Server.Base;
38
39using GridRegion = OpenSim.Services.Interfaces.GridRegion;
40
41using OpenMetaverse;
42using log4net;
43using Nini.Config;
44
45namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
46{
47 public class HGInventoryAccessModule : InventoryAccessModule, INonSharedRegionModule, IInventoryAccessModule
48 {
49 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
50
51 private static HGAssetMapper m_assMapper;
52 public static HGAssetMapper AssetMapper
53 {
54 get { return m_assMapper; }
55 }
56
57 private bool m_Initialized = false;
58
59 #region INonSharedRegionModule
60
61 public override string Name
62 {
63 get { return "HGInventoryAccessModule"; }
64 }
65
66 public override void Initialise(IConfigSource source)
67 {
68 IConfig moduleConfig = source.Configs["Modules"];
69 if (moduleConfig != null)
70 {
71 string name = moduleConfig.GetString("InventoryAccessModule", "");
72 if (name == Name)
73 {
74 m_Enabled = true;
75 m_log.InfoFormat("[HG INVENTORY ACCESS MODULE]: {0} enabled.", Name);
76 }
77 }
78 }
79
80 public override void AddRegion(Scene scene)
81 {
82 if (!m_Enabled)
83 return;
84
85 base.AddRegion(scene);
86 m_assMapper = new HGAssetMapper(scene);
87 scene.EventManager.OnNewInventoryItemUploadComplete += UploadInventoryItem;
88
89 }
90
91 #endregion
92
93 #region Event handlers
94
95 public void UploadInventoryItem(UUID avatarID, UUID assetID, string name, int userlevel)
96 {
97 string userAssetServer = string.Empty;
98 if (IsForeignUser(avatarID, out userAssetServer))
99 {
100 m_assMapper.Post(assetID, avatarID, userAssetServer);
101 }
102 }
103
104 #endregion
105
106 #region Overrides of Basic Inventory Access methods
107 ///
108 /// CapsUpdateInventoryItemAsset
109 ///
110 public override UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data)
111 {
112 UUID newAssetID = base.CapsUpdateInventoryItemAsset(remoteClient, itemID, data);
113
114 UploadInventoryItem(remoteClient.AgentId, newAssetID, "", 0);
115
116 return newAssetID;
117 }
118
119 ///
120 /// DeleteToInventory
121 ///
122 public override UUID DeleteToInventory(DeRezAction action, UUID folderID, SceneObjectGroup objectGroup, IClientAPI remoteClient)
123 {
124 UUID assetID = base.DeleteToInventory(action, folderID, objectGroup, remoteClient);
125
126 if (!assetID.Equals(UUID.Zero))
127 {
128 UploadInventoryItem(remoteClient.AgentId, assetID, "", 0);
129 }
130 else
131 m_log.Debug("[HGScene]: Scene.Inventory did not create asset");
132
133 return assetID;
134 }
135
136 ///
137 /// RezObject
138 ///
139 public override SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
140 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
141 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
142 {
143 m_log.DebugFormat("[HGScene] RezObject itemID={0} fromTaskID={1}", itemID, fromTaskID);
144
145 //if (fromTaskID.Equals(UUID.Zero))
146 //{
147 InventoryItemBase item = new InventoryItemBase(itemID);
148 item.Owner = remoteClient.AgentId;
149 item = m_Scene.InventoryService.GetItem(item);
150 //if (item == null)
151 //{ // Fetch the item
152 // item = new InventoryItemBase();
153 // item.Owner = remoteClient.AgentId;
154 // item.ID = itemID;
155 // item = m_assMapper.Get(item, userInfo.RootFolder.ID, userInfo);
156 //}
157 string userAssetServer = string.Empty;
158 if (item != null && IsForeignUser(remoteClient.AgentId, out userAssetServer))
159 {
160 m_assMapper.Get(item.AssetID, remoteClient.AgentId, userAssetServer);
161
162 }
163 //}
164
165 // OK, we're done fetching. Pass it up to the default RezObject
166 return base.RezObject(remoteClient, itemID, RayEnd, RayStart, RayTargetID, BypassRayCast, RayEndIsIntersection,
167 RezSelected, RemoveItem, fromTaskID, attachment);
168
169 }
170
171 public override void TransferInventoryAssets(InventoryItemBase item, UUID sender, UUID receiver)
172 {
173 string userAssetServer = string.Empty;
174 if (IsForeignUser(sender, out userAssetServer))
175 m_assMapper.Get(item.AssetID, sender, userAssetServer);
176
177 if (IsForeignUser(receiver, out userAssetServer))
178 m_assMapper.Post(item.AssetID, receiver, userAssetServer);
179 }
180
181 #endregion
182
183 public bool IsForeignUser(UUID userID, out string assetServerURL)
184 {
185 assetServerURL = string.Empty;
186 UserAccount account = null;
187 if (m_Scene.UserAccountService != null)
188 account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, userID);
189
190 if (account == null) // foreign
191 {
192 ScenePresence sp = null;
193 if (m_Scene.TryGetAvatar(userID, out sp))
194 {
195 AgentCircuitData aCircuit = m_Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
196 if (aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
197 {
198 assetServerURL = aCircuit.ServiceURLs["AssetServerURI"].ToString();
199 assetServerURL = assetServerURL.Trim(new char[] { '/' }); return true;
200 }
201 }
202 }
203
204 return false;
205 }
206 }
207}
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs
new file mode 100644
index 0000000..fcb544f
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGUuidGatherer.cs
@@ -0,0 +1,57 @@
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
28using System;
29using System.Collections.Generic;
30
31using OpenSim.Framework;
32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Services.Interfaces;
34using OpenMetaverse;
35
36namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
37{
38 public class HGUuidGatherer : UuidGatherer
39 {
40 protected string m_assetServerURL;
41 protected HGAssetMapper m_assetMapper;
42
43 public HGUuidGatherer(HGAssetMapper assMap, IAssetService assetCache, string assetServerURL) : base(assetCache)
44 {
45 m_assetMapper = assMap;
46 m_assetServerURL = assetServerURL;
47 }
48
49 protected override AssetBase GetAsset(UUID uuid)
50 {
51 if (string.Empty == m_assetServerURL)
52 return m_assetCache.Get(uuid.ToString());
53 else
54 return m_assetMapper.FetchAsset(m_assetServerURL, uuid);
55 }
56 }
57}
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
new file mode 100644
index 0000000..d242a34
--- /dev/null
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -0,0 +1,654 @@
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
28using System;
29using System.Collections.Generic;
30using System.Net;
31using System.Reflection;
32using System.Threading;
33
34using OpenSim.Framework;
35using OpenSim.Framework.Capabilities;
36using OpenSim.Framework.Client;
37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Scenes.Serialization;
40using OpenSim.Services.Interfaces;
41
42using GridRegion = OpenSim.Services.Interfaces.GridRegion;
43
44using OpenMetaverse;
45using log4net;
46using Nini.Config;
47
48namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
49{
50 public class InventoryAccessModule : INonSharedRegionModule, IInventoryAccessModule
51 {
52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
53
54 protected bool m_Enabled = false;
55 protected Scene m_Scene;
56
57 #region INonSharedRegionModule
58
59 public Type ReplaceableInterface
60 {
61 get { return null; }
62 }
63
64 public virtual string Name
65 {
66 get { return "BasicInventoryAcessModule"; }
67 }
68
69 public virtual void Initialise(IConfigSource source)
70 {
71 IConfig moduleConfig = source.Configs["Modules"];
72 if (moduleConfig != null)
73 {
74 string name = moduleConfig.GetString("InventoryAccessModule", "");
75 if (name == Name)
76 {
77 m_Enabled = true;
78 m_log.InfoFormat("[INVENTORY ACCESS MODULE]: {0} enabled.", Name);
79 }
80 }
81 }
82
83 public virtual void PostInitialise()
84 {
85 }
86
87 public virtual void AddRegion(Scene scene)
88 {
89 if (!m_Enabled)
90 return;
91
92 m_Scene = scene;
93
94 scene.RegisterModuleInterface<IInventoryAccessModule>(this);
95 scene.EventManager.OnNewClient += OnNewClient;
96 }
97
98 protected virtual void OnNewClient(IClientAPI client)
99 {
100
101 }
102
103 public virtual void Close()
104 {
105 if (!m_Enabled)
106 return;
107 }
108
109
110 public virtual void RemoveRegion(Scene scene)
111 {
112 if (!m_Enabled)
113 return;
114 m_Scene = null;
115 }
116
117 public virtual void RegionLoaded(Scene scene)
118 {
119 if (!m_Enabled)
120 return;
121
122 }
123
124 #endregion
125
126 #region Inventory Access
127
128 /// <summary>
129 /// Capability originating call to update the asset of an item in an agent's inventory
130 /// </summary>
131 /// <param name="remoteClient"></param>
132 /// <param name="itemID"></param>
133 /// <param name="data"></param>
134 /// <returns></returns>
135 public virtual UUID CapsUpdateInventoryItemAsset(IClientAPI remoteClient, UUID itemID, byte[] data)
136 {
137 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
138 item = m_Scene.InventoryService.GetItem(item);
139
140 if (item != null)
141 {
142 if ((InventoryType)item.InvType == InventoryType.Notecard)
143 {
144 if (!m_Scene.Permissions.CanEditNotecard(itemID, UUID.Zero, remoteClient.AgentId))
145 {
146 remoteClient.SendAgentAlertMessage("Insufficient permissions to edit notecard", false);
147 return UUID.Zero;
148 }
149
150 remoteClient.SendAgentAlertMessage("Notecard saved", false);
151 }
152 else if ((InventoryType)item.InvType == InventoryType.LSL)
153 {
154 if (!m_Scene.Permissions.CanEditScript(itemID, UUID.Zero, remoteClient.AgentId))
155 {
156 remoteClient.SendAgentAlertMessage("Insufficient permissions to edit script", false);
157 return UUID.Zero;
158 }
159
160 remoteClient.SendAgentAlertMessage("Script saved", false);
161 }
162
163 AssetBase asset =
164 CreateAsset(item.Name, item.Description, (sbyte)item.AssetType, data);
165 item.AssetID = asset.FullID;
166 m_Scene.AssetService.Store(asset);
167
168 m_Scene.InventoryService.UpdateItem(item);
169
170 // remoteClient.SendInventoryItemCreateUpdate(item);
171 return (asset.FullID);
172 }
173 else
174 {
175 m_log.ErrorFormat(
176 "[AGENT INVENTORY]: Could not find item {0} for caps inventory update",
177 itemID);
178 }
179
180 return UUID.Zero;
181 }
182
183 /// <summary>
184 /// Delete a scene object from a scene and place in the given avatar's inventory.
185 /// Returns the UUID of the newly created asset.
186 /// </summary>
187 /// <param name="action"></param>
188 /// <param name="folderID"></param>
189 /// <param name="objectGroup"></param>
190 /// <param name="remoteClient"> </param>
191 public virtual UUID DeleteToInventory(DeRezAction action, UUID folderID,
192 SceneObjectGroup objectGroup, IClientAPI remoteClient)
193 {
194 UUID assetID = UUID.Zero;
195
196 Vector3 inventoryStoredPosition = new Vector3
197 (((objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
198 ? 250
199 : objectGroup.AbsolutePosition.X)
200 ,
201 (objectGroup.AbsolutePosition.X > (int)Constants.RegionSize)
202 ? 250
203 : objectGroup.AbsolutePosition.X,
204 objectGroup.AbsolutePosition.Z);
205
206 Vector3 originalPosition = objectGroup.AbsolutePosition;
207
208 objectGroup.AbsolutePosition = inventoryStoredPosition;
209
210 string sceneObjectXml = SceneObjectSerializer.ToOriginalXmlFormat(objectGroup);
211
212 objectGroup.AbsolutePosition = originalPosition;
213
214 // Get the user info of the item destination
215 //
216 UUID userID = UUID.Zero;
217
218 if (action == DeRezAction.Take || action == DeRezAction.TakeCopy ||
219 action == DeRezAction.SaveToExistingUserInventoryItem)
220 {
221 // Take or take copy require a taker
222 // Saving changes requires a local user
223 //
224 if (remoteClient == null)
225 return UUID.Zero;
226
227 userID = remoteClient.AgentId;
228 }
229 else
230 {
231 // All returns / deletes go to the object owner
232 //
233
234 userID = objectGroup.RootPart.OwnerID;
235 }
236
237 if (userID == UUID.Zero) // Can't proceed
238 {
239 return UUID.Zero;
240 }
241
242 // If we're returning someone's item, it goes back to the
243 // owner's Lost And Found folder.
244 // Delete is treated like return in this case
245 // Deleting your own items makes them go to trash
246 //
247
248 InventoryFolderBase folder = null;
249 InventoryItemBase item = null;
250
251 if (DeRezAction.SaveToExistingUserInventoryItem == action)
252 {
253 item = new InventoryItemBase(objectGroup.RootPart.FromUserInventoryItemID, userID);
254 item = m_Scene.InventoryService.GetItem(item);
255
256 //item = userInfo.RootFolder.FindItem(
257 // objectGroup.RootPart.FromUserInventoryItemID);
258
259 if (null == item)
260 {
261 m_log.DebugFormat(
262 "[AGENT INVENTORY]: Object {0} {1} scheduled for save to inventory has already been deleted.",
263 objectGroup.Name, objectGroup.UUID);
264 return UUID.Zero;
265 }
266 }
267 else
268 {
269 // Folder magic
270 //
271 if (action == DeRezAction.Delete)
272 {
273 // Deleting someone else's item
274 //
275
276
277 if (remoteClient == null ||
278 objectGroup.OwnerID != remoteClient.AgentId)
279 {
280 // Folder skeleton may not be loaded and we
281 // have to wait for the inventory to find
282 // the destination folder
283 //
284 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
285 }
286 else
287 {
288 // Assume inventory skeleton was loaded during login
289 // and all folders can be found
290 //
291 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
292 }
293 }
294 else if (action == DeRezAction.Return)
295 {
296
297 // Dump to lost + found unconditionally
298 //
299 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
300 }
301
302 if (folderID == UUID.Zero && folder == null)
303 {
304 if (action == DeRezAction.Delete)
305 {
306 // Deletes go to trash by default
307 //
308 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.TrashFolder);
309 }
310 else
311 {
312 // Catch all. Use lost & found
313 //
314
315 folder = m_Scene.InventoryService.GetFolderForType(userID, AssetType.LostAndFoundFolder);
316 }
317 }
318
319 if (folder == null) // None of the above
320 {
321 //folder = userInfo.RootFolder.FindFolder(folderID);
322 folder = new InventoryFolderBase(folderID);
323
324 if (folder == null) // Nowhere to put it
325 {
326 return UUID.Zero;
327 }
328 }
329
330 item = new InventoryItemBase();
331 item.CreatorId = objectGroup.RootPart.CreatorID.ToString();
332 item.ID = UUID.Random();
333 item.InvType = (int)InventoryType.Object;
334 item.Folder = folder.ID;
335 item.Owner = userID;
336 }
337
338 AssetBase asset = CreateAsset(
339 objectGroup.GetPartName(objectGroup.RootPart.LocalId),
340 objectGroup.GetPartDescription(objectGroup.RootPart.LocalId),
341 (sbyte)AssetType.Object,
342 Utils.StringToBytes(sceneObjectXml));
343 m_Scene.AssetService.Store(asset);
344 assetID = asset.FullID;
345
346 if (DeRezAction.SaveToExistingUserInventoryItem == action)
347 {
348 item.AssetID = asset.FullID;
349 m_Scene.InventoryService.UpdateItem(item);
350 }
351 else
352 {
353 item.AssetID = asset.FullID;
354
355 if (remoteClient != null && (remoteClient.AgentId != objectGroup.RootPart.OwnerID) && m_Scene.Permissions.PropagatePermissions())
356 {
357 uint perms = objectGroup.GetEffectivePermissions();
358 uint nextPerms = (perms & 7) << 13;
359 if ((nextPerms & (uint)PermissionMask.Copy) == 0)
360 perms &= ~(uint)PermissionMask.Copy;
361 if ((nextPerms & (uint)PermissionMask.Transfer) == 0)
362 perms &= ~(uint)PermissionMask.Transfer;
363 if ((nextPerms & (uint)PermissionMask.Modify) == 0)
364 perms &= ~(uint)PermissionMask.Modify;
365
366 item.BasePermissions = perms & objectGroup.RootPart.NextOwnerMask;
367 item.CurrentPermissions = item.BasePermissions;
368 item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
369 item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask & objectGroup.RootPart.NextOwnerMask;
370 item.GroupPermissions = objectGroup.RootPart.GroupMask & objectGroup.RootPart.NextOwnerMask;
371 item.CurrentPermissions |= 8; // Slam!
372 }
373 else
374 {
375 item.BasePermissions = objectGroup.GetEffectivePermissions();
376 item.CurrentPermissions = objectGroup.GetEffectivePermissions();
377 item.NextPermissions = objectGroup.RootPart.NextOwnerMask;
378 item.EveryOnePermissions = objectGroup.RootPart.EveryoneMask;
379 item.GroupPermissions = objectGroup.RootPart.GroupMask;
380
381 item.CurrentPermissions |= 8; // Slam!
382 }
383
384 // TODO: add the new fields (Flags, Sale info, etc)
385 item.CreationDate = Util.UnixTimeSinceEpoch();
386 item.Description = asset.Description;
387 item.Name = asset.Name;
388 item.AssetType = asset.Type;
389
390 m_Scene.InventoryService.AddItem(item);
391
392 if (remoteClient != null && item.Owner == remoteClient.AgentId)
393 {
394 remoteClient.SendInventoryItemCreateUpdate(item, 0);
395 }
396 else
397 {
398 ScenePresence notifyUser = m_Scene.GetScenePresence(item.Owner);
399 if (notifyUser != null)
400 {
401 notifyUser.ControllingClient.SendInventoryItemCreateUpdate(item, 0);
402 }
403 }
404 }
405
406 return assetID;
407 }
408
409
410 /// <summary>
411 /// Rez an object into the scene from the user's inventory
412 /// </summary>
413 /// <param name="remoteClient"></param>
414 /// <param name="itemID"></param>
415 /// <param name="RayEnd"></param>
416 /// <param name="RayStart"></param>
417 /// <param name="RayTargetID"></param>
418 /// <param name="BypassRayCast"></param>
419 /// <param name="RayEndIsIntersection"></param>
420 /// <param name="RezSelected"></param>
421 /// <param name="RemoveItem"></param>
422 /// <param name="fromTaskID"></param>
423 /// <param name="attachment"></param>
424 /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns>
425 public virtual SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
426 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
427 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
428 {
429 // Work out position details
430 byte bRayEndIsIntersection = (byte)0;
431
432 if (RayEndIsIntersection)
433 {
434 bRayEndIsIntersection = (byte)1;
435 }
436 else
437 {
438 bRayEndIsIntersection = (byte)0;
439 }
440
441 Vector3 scale = new Vector3(0.5f, 0.5f, 0.5f);
442
443
444 Vector3 pos = m_Scene.GetNewRezLocation(
445 RayStart, RayEnd, RayTargetID, Quaternion.Identity,
446 BypassRayCast, bRayEndIsIntersection, true, scale, false);
447
448 // Rez object
449 InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId);
450 item = m_Scene.InventoryService.GetItem(item);
451
452 if (item != null)
453 {
454 AssetBase rezAsset = m_Scene.AssetService.Get(item.AssetID.ToString());
455
456 if (rezAsset != null)
457 {
458 UUID itemId = UUID.Zero;
459
460 // If we have permission to copy then link the rezzed object back to the user inventory
461 // item that it came from. This allows us to enable 'save object to inventory'
462 if (!m_Scene.Permissions.BypassPermissions())
463 {
464 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == (uint)PermissionMask.Copy)
465 {
466 itemId = item.ID;
467 }
468 }
469 else
470 {
471 // Brave new fullperm world
472 //
473 itemId = item.ID;
474 }
475
476 string xmlData = Utils.BytesToString(rezAsset.Data);
477 SceneObjectGroup group
478 = SceneObjectSerializer.FromOriginalXmlFormat(itemId, xmlData);
479
480 if (!m_Scene.Permissions.CanRezObject(
481 group.Children.Count, remoteClient.AgentId, pos)
482 && !attachment)
483 {
484 // The client operates in no fail mode. It will
485 // have already removed the item from the folder
486 // if it's no copy.
487 // Put it back if it's not an attachment
488 //
489 if (((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0) && (!attachment))
490 remoteClient.SendBulkUpdateInventory(item);
491 return null;
492 }
493
494 group.ResetIDs();
495
496 if (attachment)
497 {
498 group.RootPart.ObjectFlags |= (uint)PrimFlags.Phantom;
499 group.RootPart.IsAttachment = true;
500 }
501
502 m_Scene.AddNewSceneObject(group, true);
503
504 // m_log.InfoFormat("ray end point for inventory rezz is {0} {1} {2} ", RayEnd.X, RayEnd.Y, RayEnd.Z);
505 // if attachment we set it's asset id so object updates can reflect that
506 // if not, we set it's position in world.
507 if (!attachment)
508 {
509 float offsetHeight = 0;
510 pos = m_Scene.GetNewRezLocation(
511 RayStart, RayEnd, RayTargetID, Quaternion.Identity,
512 BypassRayCast, bRayEndIsIntersection, true, group.GetAxisAlignedBoundingBox(out offsetHeight), false);
513 pos.Z += offsetHeight;
514 group.AbsolutePosition = pos;
515 // m_log.InfoFormat("rezx point for inventory rezz is {0} {1} {2} and offsetheight was {3}", pos.X, pos.Y, pos.Z, offsetHeight);
516
517 }
518 else
519 {
520 group.SetFromItemID(itemID);
521 }
522
523 SceneObjectPart rootPart = null;
524 try
525 {
526 rootPart = group.GetChildPart(group.UUID);
527 }
528 catch (NullReferenceException)
529 {
530 string isAttachment = "";
531
532 if (attachment)
533 isAttachment = " Object was an attachment";
534
535 m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment);
536 }
537
538 // Since renaming the item in the inventory does not affect the name stored
539 // in the serialization, transfer the correct name from the inventory to the
540 // object itself before we rez.
541 rootPart.Name = item.Name;
542 rootPart.Description = item.Description;
543
544 List<SceneObjectPart> partList = new List<SceneObjectPart>(group.Children.Values);
545
546 group.SetGroup(remoteClient.ActiveGroupId, remoteClient);
547 if (rootPart.OwnerID != item.Owner)
548 {
549 //Need to kill the for sale here
550 rootPart.ObjectSaleType = 0;
551 rootPart.SalePrice = 10;
552
553 if (m_Scene.Permissions.PropagatePermissions())
554 {
555 if ((item.CurrentPermissions & 8) != 0)
556 {
557 foreach (SceneObjectPart part in partList)
558 {
559 part.EveryoneMask = item.EveryOnePermissions;
560 part.NextOwnerMask = item.NextPermissions;
561 part.GroupMask = 0; // DO NOT propagate here
562 }
563 }
564 group.ApplyNextOwnerPermissions();
565 }
566 }
567
568 foreach (SceneObjectPart part in partList)
569 {
570 if (part.OwnerID != item.Owner)
571 {
572 part.LastOwnerID = part.OwnerID;
573 part.OwnerID = item.Owner;
574 part.Inventory.ChangeInventoryOwner(item.Owner);
575 }
576 else if (((item.CurrentPermissions & 8) != 0) && (!attachment)) // Slam!
577 {
578 part.EveryoneMask = item.EveryOnePermissions;
579 part.NextOwnerMask = item.NextPermissions;
580
581 part.GroupMask = 0; // DO NOT propagate here
582 }
583 }
584
585 rootPart.TrimPermissions();
586
587 if (!attachment)
588 {
589 if (group.RootPart.Shape.PCode == (byte)PCode.Prim)
590 {
591 group.ClearPartAttachmentData();
592 }
593 }
594
595 if (!attachment)
596 {
597 // Fire on_rez
598 group.CreateScriptInstances(0, true, m_Scene.DefaultScriptEngine, 0);
599
600 rootPart.ScheduleFullUpdate();
601 }
602
603 if (!m_Scene.Permissions.BypassPermissions())
604 {
605 if ((item.CurrentPermissions & (uint)PermissionMask.Copy) == 0)
606 {
607 // If this is done on attachments, no
608 // copy ones will be lost, so avoid it
609 //
610 if (!attachment)
611 {
612 List<UUID> uuids = new List<UUID>();
613 uuids.Add(item.ID);
614 m_Scene.InventoryService.DeleteItems(item.Owner, uuids);
615 }
616 }
617 }
618
619 return rootPart.ParentGroup;
620 }
621 }
622
623 return null;
624 }
625
626 public virtual void TransferInventoryAssets(InventoryItemBase item, UUID sender, UUID receiver)
627 {
628 }
629
630 #endregion
631
632 #region Misc
633
634 /// <summary>
635 /// Create a new asset data structure.
636 /// </summary>
637 /// <param name="name"></param>
638 /// <param name="description"></param>
639 /// <param name="invType"></param>
640 /// <param name="assetType"></param>
641 /// <param name="data"></param>
642 /// <returns></returns>
643 private AssetBase CreateAsset(string name, string description, sbyte assetType, byte[] data)
644 {
645 AssetBase asset = new AssetBase(UUID.Random(), name, assetType);
646 asset.Description = description;
647 asset.Data = (data == null) ? new byte[1] : data;
648
649 return asset;
650 }
651
652 #endregion
653 }
654}
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
index 13f58bd..e37da9f 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LibraryModule.cs
@@ -31,12 +31,13 @@ using System.Reflection;
31 31
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Framework.Communications; 33using OpenSim.Framework.Communications;
34using OpenSim.Framework.Communications.Cache; 34
35using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver; 35using OpenSim.Region.CoreModules.Avatar.Inventory.Archiver;
36using OpenSim.Region.Framework; 36using OpenSim.Region.Framework;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Services.Interfaces; 39using OpenSim.Services.Interfaces;
40using OpenSim.Server.Base;
40 41
41using OpenMetaverse; 42using OpenMetaverse;
42using log4net; 43using log4net;
@@ -53,6 +54,8 @@ namespace OpenSim.Region.CoreModules.Framework.Library
53 private string m_LibraryName = "OpenSim Library"; 54 private string m_LibraryName = "OpenSim Library";
54 private Scene m_Scene; 55 private Scene m_Scene;
55 56
57 private ILibraryService m_Library;
58
56 #region ISharedRegionModule 59 #region ISharedRegionModule
57 60
58 public void Initialise(IConfigSource config) 61 public void Initialise(IConfigSource config)
@@ -60,9 +63,22 @@ namespace OpenSim.Region.CoreModules.Framework.Library
60 m_Enabled = config.Configs["Modules"].GetBoolean("LibraryModule", m_Enabled); 63 m_Enabled = config.Configs["Modules"].GetBoolean("LibraryModule", m_Enabled);
61 if (m_Enabled) 64 if (m_Enabled)
62 { 65 {
63 IConfig libConfig = config.Configs["LibraryModule"]; 66 IConfig libConfig = config.Configs["LibraryService"];
64 if (libConfig != null) 67 if (libConfig != null)
65 m_LibraryName = libConfig.GetString("LibraryName", m_LibraryName); 68 {
69 string dllName = libConfig.GetString("LocalServiceModule", string.Empty);
70 m_log.Debug("[LIBRARY MODULE]: Library service dll is " + dllName);
71 if (dllName != string.Empty)
72 {
73 Object[] args = new Object[] { config };
74 m_Library = ServerUtils.LoadPlugin<ILibraryService>(dllName, args);
75 }
76 }
77 }
78 if (m_Library == null)
79 {
80 m_log.Warn("[LIBRARY MODULE]: No local library service. Module will be disabled.");
81 m_Enabled = false;
66 } 82 }
67 } 83 }
68 84
@@ -91,10 +107,15 @@ namespace OpenSim.Region.CoreModules.Framework.Library
91 { 107 {
92 m_Scene = scene; 108 m_Scene = scene;
93 } 109 }
110 scene.RegisterModuleInterface<ILibraryService>(m_Library);
94 } 111 }
95 112
96 public void RemoveRegion(Scene scene) 113 public void RemoveRegion(Scene scene)
97 { 114 {
115 if (!m_Enabled)
116 return;
117
118 scene.UnregisterModuleInterface<ILibraryService>(m_Library);
98 } 119 }
99 120
100 public void RegionLoaded(Scene scene) 121 public void RegionLoaded(Scene scene)
@@ -127,27 +148,23 @@ namespace OpenSim.Region.CoreModules.Framework.Library
127 148
128 protected void LoadLibrariesFromArchives() 149 protected void LoadLibrariesFromArchives()
129 { 150 {
130 InventoryFolderImpl lib = m_Scene.CommsManager.UserProfileCacheService.LibraryRoot; 151 InventoryFolderImpl lib = m_Library.LibraryRootFolder;
131 if (lib == null) 152 if (lib == null)
132 { 153 {
133 m_log.Debug("[LIBRARY MODULE]: No library. Ignoring Library Module"); 154 m_log.Debug("[LIBRARY MODULE]: No library. Ignoring Library Module");
134 return; 155 return;
135 } 156 }
136 157
137 lib.Name = m_LibraryName;
138
139 RegionInfo regInfo = new RegionInfo(); 158 RegionInfo regInfo = new RegionInfo();
140 Scene m_MockScene = new Scene(regInfo); 159 Scene m_MockScene = new Scene(regInfo);
141 m_MockScene.CommsManager = m_Scene.CommsManager; 160 LocalInventoryService invService = new LocalInventoryService(lib);
142 LocalInventoryService invService = new LocalInventoryService((LibraryRootFolder)lib);
143 m_MockScene.RegisterModuleInterface<IInventoryService>(invService); 161 m_MockScene.RegisterModuleInterface<IInventoryService>(invService);
144 m_MockScene.RegisterModuleInterface<IAssetService>(m_Scene.AssetService); 162 m_MockScene.RegisterModuleInterface<IAssetService>(m_Scene.AssetService);
145 163
146 UserProfileData profile = new UserProfileData(); 164 UserAccount uinfo = new UserAccount(lib.Owner);
147 profile.FirstName = "OpenSim"; 165 uinfo.FirstName = "OpenSim";
148 profile.ID = lib.Owner; 166 uinfo.LastName = "Library";
149 profile.SurName = "Library"; 167 uinfo.ServiceURLs = new Dictionary<string, object>();
150 CachedUserInfo uinfo = new CachedUserInfo(invService, profile);
151 168
152 foreach (string iarFileName in Directory.GetFiles(pathToLibraries, "*.iar")) 169 foreach (string iarFileName in Directory.GetFiles(pathToLibraries, "*.iar"))
153 { 170 {
@@ -175,6 +192,15 @@ namespace OpenSim.Region.CoreModules.Framework.Library
175 m_log.DebugFormat("[LIBRARY MODULE]: Exception when processing archive {0}: {1}", iarFileName, e.Message); 192 m_log.DebugFormat("[LIBRARY MODULE]: Exception when processing archive {0}: {1}", iarFileName, e.Message);
176 } 193 }
177 } 194 }
195
196 }
197
198 private void DumpLibrary()
199 {
200 InventoryFolderImpl lib = m_Library.LibraryRootFolder;
201
202 m_log.DebugFormat(" - folder {0}", lib.Name);
203 DumpFolder(lib);
178 } 204 }
179// 205//
180// private void DumpLibrary() 206// private void DumpLibrary()
diff --git a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
index 2c95b5a..49589fd 100644
--- a/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
+++ b/OpenSim/Region/CoreModules/Framework/Library/LocalInventoryService.cs
@@ -29,7 +29,7 @@ using System.Collections.Generic;
29using System.Reflection; 29using System.Reflection;
30 30
31using OpenSim.Framework; 31using OpenSim.Framework;
32using OpenSim.Framework.Communications.Cache; 32
33using OpenSim.Services.Interfaces; 33using OpenSim.Services.Interfaces;
34 34
35using OpenMetaverse; 35using OpenMetaverse;
@@ -41,9 +41,9 @@ namespace OpenSim.Region.CoreModules.Framework.Library
41 { 41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43 43
44 private LibraryRootFolder m_Library; 44 private InventoryFolderImpl m_Library;
45 45
46 public LocalInventoryService(LibraryRootFolder lib) 46 public LocalInventoryService(InventoryFolderImpl lib)
47 { 47 {
48 m_Library = lib; 48 m_Library = lib;
49 } 49 }
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
deleted file mode 100644
index 0b54746..0000000
--- a/OpenSim/Region/CoreModules/Hypergrid/HGStandaloneLoginModule.cs
+++ /dev/null
@@ -1,311 +0,0 @@
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
28using System;
29using System.Collections;
30using System.Collections.Generic;
31using System.Net;
32using System.Reflection;
33using System.Text.RegularExpressions;
34using log4net;
35using Nini.Config;
36using OpenMetaverse;
37using Nwc.XmlRpc;
38using OpenSim.Framework;
39using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Services;
41using OpenSim.Framework.Communications.Cache;
42using OpenSim.Framework.Capabilities;
43using OpenSim.Framework.Servers.HttpServer;
44using OpenSim.Region.Framework.Scenes;
45using OpenSim.Region.Framework.Interfaces;
46
47namespace OpenSim.Region.CoreModules.Hypergrid
48{
49 public class HGStandaloneLoginModule : IRegionModule, ILoginServiceToRegionsConnector
50 {
51 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
52
53 protected List<Scene> m_scenes = new List<Scene>();
54 protected Scene m_firstScene;
55
56 protected bool m_enabled = false; // Module is only enabled if running in standalone mode
57
58 protected HGLoginAuthService m_loginService;
59
60 #region IRegionModule Members
61
62 public void Initialise(Scene scene, IConfigSource source)
63 {
64 if (m_firstScene == null)
65 {
66 m_firstScene = scene;
67
68 IConfig startupConfig = source.Configs["Startup"];
69 if (startupConfig != null)
70 {
71 m_enabled = !startupConfig.GetBoolean("gridmode", false);
72 }
73
74 if (m_enabled)
75 {
76 m_log.Debug("[HGLogin]: HGlogin module enabled");
77 bool authenticate = true;
78 string welcomeMessage = "Welcome to OpenSim";
79 IConfig standaloneConfig = source.Configs["StandAlone"];
80 if (standaloneConfig != null)
81 {
82 authenticate = standaloneConfig.GetBoolean("accounts_authenticate", true);
83 welcomeMessage = standaloneConfig.GetString("welcome_message");
84 }
85
86 //TODO: fix casting.
87 LibraryRootFolder rootFolder = m_firstScene.CommsManager.UserProfileCacheService.LibraryRoot as LibraryRootFolder;
88
89 IHttpServer httpServer = MainServer.Instance;
90
91 //TODO: fix the casting of the user service, maybe by registering the userManagerBase with scenes, or refactoring so we just need a IUserService reference
92 m_loginService
93 = new HGLoginAuthService(
94 (UserManagerBase)m_firstScene.CommsManager.UserAdminService,
95 welcomeMessage,
96 m_firstScene.CommsManager.InterServiceInventoryService,
97 m_firstScene.CommsManager.NetworkServersInfo,
98 authenticate,
99 rootFolder,
100 this);
101
102 httpServer.AddXmlRPCHandler("hg_login", m_loginService.XmlRpcLoginMethod);
103 httpServer.AddXmlRPCHandler("check_auth_session", m_loginService.XmlRPCCheckAuthSession, false);
104 httpServer.AddXmlRPCHandler("get_avatar_appearance", XmlRPCGetAvatarAppearance);
105 httpServer.AddXmlRPCHandler("update_avatar_appearance", XmlRPCUpdateAvatarAppearance);
106
107 }
108 }
109
110 if (m_enabled)
111 {
112 AddScene(scene);
113 }
114 }
115
116 public void PostInitialise()
117 {
118
119 }
120
121 public void Close()
122 {
123
124 }
125
126 public string Name
127 {
128 get { return "HGStandaloneLoginModule"; }
129 }
130
131 public bool IsSharedModule
132 {
133 get { return true; }
134 }
135
136 #endregion
137
138 protected void AddScene(Scene scene)
139 {
140 lock (m_scenes)
141 {
142 if (!m_scenes.Contains(scene))
143 {
144 m_scenes.Add(scene);
145 }
146 }
147 }
148
149 public bool NewUserConnection(ulong regionHandle, AgentCircuitData agent, out string reason)
150 {
151 reason = String.Empty;
152 return true;
153 }
154
155 public void LogOffUserFromGrid(ulong regionHandle, UUID AvatarID, UUID RegionSecret, string message)
156 {
157 Scene scene;
158 if (TryGetRegion(regionHandle, out scene))
159 {
160 scene.HandleLogOffUserFromGrid(AvatarID, RegionSecret, message);
161 }
162 }
163
164 public RegionInfo RequestNeighbourInfo(ulong regionhandle)
165 {
166 Scene scene;
167 if (TryGetRegion(regionhandle, out scene))
168 {
169 return scene.RegionInfo;
170 }
171 return null;
172 }
173
174 public RegionInfo RequestClosestRegion(string region)
175 {
176 Scene scene;
177 if (TryGetRegion(region, out scene))
178 {
179 return scene.RegionInfo;
180 }
181 else if (m_scenes.Count > 0)
182 {
183 return m_scenes[0].RegionInfo;
184 }
185 return null;
186 }
187
188 public RegionInfo RequestNeighbourInfo(UUID regionID)
189 {
190 Scene scene;
191 if (TryGetRegion(regionID, out scene))
192 {
193 return scene.RegionInfo;
194 }
195 return null;
196 }
197
198 protected bool TryGetRegion(ulong regionHandle, out Scene scene)
199 {
200 lock (m_scenes)
201 {
202 foreach (Scene nextScene in m_scenes)
203 {
204 if (nextScene.RegionInfo.RegionHandle == regionHandle)
205 {
206 scene = nextScene;
207 return true;
208 }
209 }
210 }
211
212 scene = null;
213 return false;
214 }
215
216 protected bool TryGetRegion(UUID regionID, out Scene scene)
217 {
218 lock (m_scenes)
219 {
220 foreach (Scene nextScene in m_scenes)
221 {
222 if (nextScene.RegionInfo.RegionID == regionID)
223 {
224 scene = nextScene;
225 return true;
226 }
227 }
228 }
229
230 scene = null;
231 return false;
232 }
233
234 protected bool TryGetRegion(string regionName, out Scene scene)
235 {
236 lock (m_scenes)
237 {
238 foreach (Scene nextScene in m_scenes)
239 {
240 if (nextScene.RegionInfo.RegionName.Equals(regionName, StringComparison.InvariantCultureIgnoreCase))
241 {
242 scene = nextScene;
243 return true;
244 }
245 }
246 }
247
248 scene = null;
249 return false;
250 }
251
252 public XmlRpcResponse XmlRPCGetAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient)
253 {
254 XmlRpcResponse response = new XmlRpcResponse();
255 Hashtable requestData = (Hashtable)request.Params[0];
256 AvatarAppearance appearance;
257 Hashtable responseData;
258 if (requestData.Contains("owner"))
259 {
260 appearance = m_firstScene.CommsManager.AvatarService.GetUserAppearance(new UUID((string)requestData["owner"]));
261 if (appearance == null)
262 {
263 responseData = new Hashtable();
264 responseData["error_type"] = "no appearance";
265 responseData["error_desc"] = "There was no appearance found for this avatar";
266 }
267 else
268 {
269 responseData = appearance.ToHashTable();
270 }
271 }
272 else
273 {
274 responseData = new Hashtable();
275 responseData["error_type"] = "unknown_avatar";
276 responseData["error_desc"] = "The avatar appearance requested is not in the database";
277 }
278
279 response.Value = responseData;
280 return response;
281 }
282
283 public XmlRpcResponse XmlRPCUpdateAvatarAppearance(XmlRpcRequest request, IPEndPoint remoteClient)
284 {
285 XmlRpcResponse response = new XmlRpcResponse();
286 Hashtable requestData = (Hashtable)request.Params[0];
287 Hashtable responseData;
288 if (requestData.Contains("owner"))
289 {
290 AvatarAppearance appearance = new AvatarAppearance(requestData);
291
292 // TODO: Sometime in the future we may have a database layer that is capable of updating appearance when
293 // the TextureEntry is null. When that happens, this check can be removed
294 if (appearance.Texture != null)
295 m_firstScene.CommsManager.AvatarService.UpdateUserAppearance(new UUID((string)requestData["owner"]), appearance);
296
297 responseData = new Hashtable();
298 responseData["returnString"] = "TRUE";
299 }
300 else
301 {
302 responseData = new Hashtable();
303 responseData["error_type"] = "unknown_avatar";
304 responseData["error_desc"] = "The avatar appearance requested is not in the database";
305 }
306 response.Value = responseData;
307 return response;
308 }
309 }
310
311}
diff --git a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
index 0f2ba32..b7d3904 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OGSRadmin.cs
@@ -46,7 +46,6 @@ namespace OpenSim.Region.CoreModules.InterGrid
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 private readonly List<Scene> m_scenes = new List<Scene>(); 48 private readonly List<Scene> m_scenes = new List<Scene>();
49 private CommunicationsManager m_com;
50 private IConfigSource m_settings; 49 private IConfigSource m_settings;
51 50
52 #region Implementation of IRegionModuleBase 51 #region Implementation of IRegionModuleBase
@@ -88,7 +87,6 @@ namespace OpenSim.Region.CoreModules.InterGrid
88 { 87 {
89 if (m_settings.Configs["Startup"].GetBoolean("gridmode", false)) 88 if (m_settings.Configs["Startup"].GetBoolean("gridmode", false))
90 { 89 {
91 m_com = m_scenes[0].CommsManager;
92 MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage); 90 MainServer.Instance.AddXmlRPCHandler("grid_message", GridWideMessage);
93 } 91 }
94 } 92 }
@@ -119,14 +117,15 @@ namespace OpenSim.Region.CoreModules.InterGrid
119 117
120 Hashtable requestData = (Hashtable)req.Params[0]; 118 Hashtable requestData = (Hashtable)req.Params[0];
121 119
122 if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey)) 120 // REFACTORING PROBLEM. This authorization needs to be replaced with some other
123 { 121 //if ((!requestData.Contains("password") || (string)requestData["password"] != m_com.NetworkServersInfo.GridRecvKey))
124 responseData["accepted"] = false; 122 //{
125 responseData["success"] = false; 123 // responseData["accepted"] = false;
126 responseData["error"] = "Invalid Key"; 124 // responseData["success"] = false;
127 response.Value = responseData; 125 // responseData["error"] = "Invalid Key";
128 return response; 126 // response.Value = responseData;
129 } 127 // return response;
128 //}
130 129
131 string message = (string)requestData["message"]; 130 string message = (string)requestData["message"];
132 string user = (string)requestData["user"]; 131 string user = (string)requestData["user"];
diff --git a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
index 10a3232..8cf4619 100644
--- a/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
+++ b/OpenSim/Region/CoreModules/InterGrid/OpenGridProtocolModule.cs
@@ -528,32 +528,34 @@ namespace OpenSim.Region.CoreModules.InterGrid
528 userProfile.PasswordHash = "$1$"; 528 userProfile.PasswordHash = "$1$";
529 userProfile.PasswordSalt = ""; 529 userProfile.PasswordSalt = "";
530 userProfile.SurName = agentData.lastname; 530 userProfile.SurName = agentData.lastname;
531 userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL; 531 //userProfile.UserAssetURI = homeScene.CommsManager.NetworkServersInfo.AssetURL;
532 userProfile.UserFlags = 0; 532 userProfile.UserFlags = 0;
533 userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL; 533 //userProfile.UserInventoryURI = homeScene.CommsManager.NetworkServersInfo.InventoryURL;
534 userProfile.WantDoMask = 0; 534 userProfile.WantDoMask = 0;
535 userProfile.WebLoginKey = UUID.Random(); 535 userProfile.WebLoginKey = UUID.Random();
536 536
537 // Do caps registration 537 // !!! REFACTORING PROBLEM. This needs to be changed for 0.7
538 // get seed capagentData.firstname = FirstName;agentData.lastname = LastName; 538 //
539 if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode) 539 //// Do caps registration
540 { 540 //// get seed capagentData.firstname = FirstName;agentData.lastname = LastName;
541 homeScene.CommsManager.UserAdminService.AddUser( 541 //if (homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID) == null && !GridMode)
542 agentData.firstname, agentData.lastname, CreateRandomStr(7), "", 542 //{
543 homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID); 543 // homeScene.CommsManager.UserAdminService.AddUser(
544 // agentData.firstname, agentData.lastname, CreateRandomStr(7), "",
545 // homeScene.RegionInfo.RegionLocX, homeScene.RegionInfo.RegionLocY, agentData.AgentID);
544 546
545 UserProfileData userProfile2 = homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID); 547 // UserProfileData userProfile2 = homeScene.CommsManager.UserService.GetUserProfile(agentData.AgentID);
546 if (userProfile2 != null) 548 // if (userProfile2 != null)
547 { 549 // {
548 userProfile = userProfile2; 550 // userProfile = userProfile2;
549 userProfile.AboutText = "OGP USER"; 551 // userProfile.AboutText = "OGP USER";
550 userProfile.FirstLifeAboutText = "OGP USER"; 552 // userProfile.FirstLifeAboutText = "OGP USER";
551 homeScene.CommsManager.UserService.UpdateUserProfile(userProfile); 553 // homeScene.CommsManager.UserService.UpdateUserProfile(userProfile);
552 } 554 // }
553 } 555 //}
554 556
555 // Stick our data in the cache so the region will know something about us 557 //// Stick our data in the cache so the region will know something about us
556 homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(userProfile); 558 //homeScene.CommsManager.UserProfileCacheService.PreloadUserCache(userProfile);
557 559
558 // Call 'new user' event handler 560 // Call 'new user' event handler
559 string reason; 561 string reason;
diff --git a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
index ebc7f59..bdacc10 100644
--- a/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
+++ b/OpenSim/Region/CoreModules/Resources/CoreModulePlugin.addin.xml
@@ -8,6 +8,10 @@
8 </Dependencies> 8 </Dependencies>
9 9
10 <Extension path = "/OpenSim/RegionModules"> 10 <Extension path = "/OpenSim/RegionModules">
11 <RegionModule id="EntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.EntityTransferModule" />
12 <RegionModule id="HGEntityTransferModule" type="OpenSim.Region.CoreModules.Framework.EntityTransfer.HGEntityTransferModule" />
13 <RegionModule id="InventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.InventoryAccessModule" />
14 <RegionModule id="HGInventoryAccessModule" type="OpenSim.Region.CoreModules.Framework.InventoryAccess.HGInventoryAccessModule" />
11 <RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" /> 15 <RegionModule id="LandManagementModule" type="OpenSim.Region.CoreModules.World.Land.LandManagementModule" />
12 <RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" /> 16 <RegionModule id="ExportSerialisationModule" type="OpenSim.Region.CoreModules.World.Serialiser.SerialiserModule" />
13 <RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" /> 17 <RegionModule id="ArchiverModule" type="OpenSim.Region.CoreModules.World.Archiver.ArchiverModule" />
@@ -17,15 +21,25 @@
17 <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" /> 21 <RegionModule id="HGWorldMapModule" type="OpenSim.Region.CoreModules.Hypergrid.HGWorldMapModule" />
18 <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" /> 22 <RegionModule id="UrlModule" type="OpenSim.Region.CoreModules.Scripting.LSLHttp.UrlModule" />
19 <RegionModule id="Chat" type="OpenSim.Region.CoreModules.Avatar.Chat.ChatModule" /> 23 <RegionModule id="Chat" type="OpenSim.Region.CoreModules.Avatar.Chat.ChatModule" />
24 <RegionModule id="FriendsModule" type="OpenSim.Region.CoreModules.Avatar.Friends.FriendsModule" />
25 <RegionModule id="PresenceModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.PresenceModule" />
26 <RegionModule id="MuteListModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.MuteListModule" />
27 <RegionModule id="OfflineMessageModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.OfflineMessageModule" />
28 <RegionModule id="InstantMessageModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.InstantMessageModule" />
29 <RegionModule id="MessageTransferModule" type="OpenSim.Region.CoreModules.Avatar.InstantMessage.MessageTransferModule" />
30 <RegionModule id="LureModule" type="OpenSim.Region.CoreModules.Avatar.Lure.LureModule" />
31 <RegionModule id="InventoryTransferModule" type="OpenSim.Region.CoreModules.Avatar.Inventory.Transfer.InventoryTransferModule" />
20 <RegionModule id="CoreAssetCache" type="OpenSim.Region.CoreModules.Asset.CoreAssetCache" /> 32 <RegionModule id="CoreAssetCache" type="OpenSim.Region.CoreModules.Asset.CoreAssetCache" />
21 <RegionModule id="GlynnTuckerAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" /> 33 <RegionModule id="GlynnTuckerAssetCache" type="OpenSim.Region.CoreModules.Asset.GlynnTuckerAssetCache" />
22 <RegionModule id="CenomeMemoryAssetCache" type="OpenSim.Region.CoreModules.Asset.CenomeMemoryAssetCache"/> 34 <RegionModule id="CenomeMemoryAssetCache" type="OpenSim.Region.CoreModules.Asset.CenomeMemoryAssetCache"/>
23 <RegionModule id="LibraryModule" type="OpenSim.Region.CoreModules.Framework.Library.LibraryModule"/> 35 <RegionModule id="LibraryModule" type="OpenSim.Region.CoreModules.Framework.Library.LibraryModule"/>
24 <!-- Service connectors OUT modules --> 36 <!-- Service connectors OUT modules -->
25 <RegionModule id="LocalUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.User.LocalUserServicesConnector" />
26 <RegionModule id="RemoteUserServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.User.RemoteUserServicesConnector" />
27 <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" /> 37 <RegionModule id="LocalAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.LocalAssetServicesConnector" />
28 <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" /> 38 <RegionModule id="RemoteAssetServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.RemoteAssetServicesConnector" />
39 <RegionModule id="LocalAvatarServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar.LocalAvatarServicesConnector" />
40 <RegionModule id="RemoteAvatarServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar.RemoteAvatarServicesConnector" />
41 <RegionModule id="LocalAuthenticationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication.LocalAuthenticationServicesConnector" />
42 <RegionModule id="RemoteAuthenticationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication.RemoteAuthenticationServicesConnector" />
29 <RegionModule id="LocalAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.LocalAuthorizationServicesConnector" /> 43 <RegionModule id="LocalAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.LocalAuthorizationServicesConnector" />
30 <RegionModule id="RemoteAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.RemoteAuthorizationServicesConnector" /> 44 <RegionModule id="RemoteAuthorizationServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization.RemoteAuthorizationServicesConnector" />
31 <RegionModule id="HGAssetBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.HGAssetBroker" /> 45 <RegionModule id="HGAssetBroker" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.HGAssetBroker" />
@@ -36,17 +50,24 @@
36 <RegionModule id="RemoteNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.RemoteNeighbourServicesConnector" /> 50 <RegionModule id="RemoteNeighbourServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Neighbour.RemoteNeighbourServicesConnector" />
37 <RegionModule id="LocalLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.LocalLandServicesConnector" /> 51 <RegionModule id="LocalLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.LocalLandServicesConnector" />
38 <RegionModule id="RemoteLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" /> 52 <RegionModule id="RemoteLandServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Land.RemoteLandServicesConnector" />
39 <RegionModule id="LocalInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.LocalInterregionComms" />
40 <RegionModule id="RESTInterregionComms" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion.RESTInterregionComms" />
41 <RegionModule id="LocalGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.LocalGridServicesConnector" /> 53 <RegionModule id="LocalGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.LocalGridServicesConnector" />
42 <RegionModule id="RemoteGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RemoteGridServicesConnector" /> 54 <RegionModule id="RemoteGridServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.RemoteGridServicesConnector" />
43 <RegionModule id="HGGridConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid.HGGridConnector" /> 55 <RegionModule id="LocalPresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.LocalPresenceServicesConnector" />
56 <RegionModule id="RemotePresenceServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.RemotePresenceServicesConnector" />
57 <RegionModule id="LocalUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.LocalUserAccountServicesConnector" />
58 <RegionModule id="RemoteUserAccountServicesConnector" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts.RemoteUserAccountServicesConnector" />
59 <RegionModule id="LocalSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.LocalSimulationConnectorModule" />
60 <RegionModule id="RemoteSimulationConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation.RemoteSimulationConnectorModule" />
44 <!-- Service connectors IN modules --> 61 <!-- Service connectors IN modules -->
45 <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" /> 62 <RegionModule id="AssetServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset.AssetServiceInConnectorModule" />
46 <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" /> 63 <RegionModule id="InventoryServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory.InventoryServiceInConnectorModule" />
47 <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" /> 64 <RegionModule id="LandServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Land.LandServiceInConnectorModule" />
48 <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \ 65 <RegionModule id="NeighbourServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Neighbour.NeighbourServiceInConnectorModule" /> \
49 <RegionModule id="HypergridServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.HypergridServiceInConnectorModule" /> \ 66 <RegionModule id="HypergridServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid.HypergridServiceInConnectorModule" /> \
67 <RegionModule id="LLLoginServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Login.LLLoginServiceInConnectorModule" /> \
68 <RegionModule id="SimulationServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation.SimulationServiceInConnectorModule" /> \
69 <RegionModule id="GridInfoServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid.GridInfoServiceInConnectorModule" /> \
70 <RegionModule id="AuthenticationServiceInConnectorModule" type="OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication.AuthenticationServiceInConnectorModule" />
50 <RegionModule id="AccessModule" type="OpenSim.Region.CoreModules.World.AccessModule" /> \ 71 <RegionModule id="AccessModule" type="OpenSim.Region.CoreModules.World.AccessModule" /> \
51 72
52 </Extension> 73 </Extension>
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
index 879cc70..2324380 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Asset/AssetServiceInConnectorModule.cs
@@ -51,11 +51,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Asset
51 51
52 public void Initialise(IConfigSource config) 52 public void Initialise(IConfigSource config)
53 { 53 {
54 //// This module is only on for standalones in hypergrid mode
55 //enabled = ((!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
56 // config.Configs["Startup"].GetBoolean("hypergrid", true)) ||
57 // ((config.Configs["MXP"] != null) && config.Configs["MXP"].GetBoolean("Enabled", true));
58 //m_log.DebugFormat("[RegionAssetService]: enabled? {0}", enabled);
59 m_Config = config; 54 m_Config = config;
60 IConfig moduleConfig = config.Configs["Modules"]; 55 IConfig moduleConfig = config.Configs["Modules"];
61 if (moduleConfig != null) 56 if (moduleConfig != null)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
new file mode 100644
index 0000000..02acddc
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Authentication/AuthenticationServiceInConnectorModule.cs
@@ -0,0 +1,119 @@
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
28using System;
29using System.Reflection;
30using System.Collections.Generic;
31using log4net;
32using Nini.Config;
33using OpenSim.Framework;
34using OpenSim.Framework.Servers.HttpServer;
35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Server.Base;
38using OpenSim.Server.Handlers.Base;
39using OpenSim.Server.Handlers.Authentication;
40using OpenSim.Services.Interfaces;
41
42namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Authentication
43{
44 public class AuthenticationServiceInConnectorModule : ISharedRegionModule
45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 private static bool m_Enabled = false;
48
49 private IConfigSource m_Config;
50 bool m_Registered = false;
51
52 #region IRegionModule interface
53
54 public void Initialise(IConfigSource config)
55 {
56 m_Config = config;
57 IConfig moduleConfig = config.Configs["Modules"];
58 if (moduleConfig != null)
59 {
60 m_Enabled = moduleConfig.GetBoolean("AuthenticationServiceInConnector", false);
61 if (m_Enabled)
62 {
63 m_log.Info("[AUTHENTICATION IN CONNECTOR]: Authentication Service In Connector enabled");
64 }
65
66 }
67
68 }
69
70 public void PostInitialise()
71 {
72 }
73
74 public void Close()
75 {
76 }
77
78 public Type ReplaceableInterface
79 {
80 get { return null; }
81 }
82
83 public string Name
84 {
85 get { return "AuthenticationServiceInConnectorModule"; }
86 }
87
88 public void AddRegion(Scene scene)
89 {
90 if (!m_Enabled)
91 return;
92 }
93
94 public void RemoveRegion(Scene scene)
95 {
96 if (!m_Enabled)
97 return;
98 }
99
100 public void RegionLoaded(Scene scene)
101 {
102 if (!m_Enabled)
103 return;
104
105 if (!m_Registered)
106 {
107 m_Registered = true;
108
109 m_log.Info("[AUTHENTICATION IN CONNECTOR]: Starting...");
110
111 new AuthenticationServiceConnector(m_Config, MainServer.Instance, "AuthenticationService");
112 }
113
114 }
115
116 #endregion
117
118 }
119}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
new file mode 100644
index 0000000..6d975af
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/GridInfoServiceInConnectorModule.cs
@@ -0,0 +1,119 @@
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
28using System;
29using System.Reflection;
30using System.Collections.Generic;
31using log4net;
32using Nini.Config;
33using OpenSim.Framework;
34using OpenSim.Framework.Servers.HttpServer;
35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Server.Base;
38using OpenSim.Server.Handlers.Base;
39using OpenSim.Server.Handlers.Grid;
40using OpenSim.Services.Interfaces;
41
42namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
43{
44 public class GridInfoServiceInConnectorModule : ISharedRegionModule
45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 private static bool m_Enabled = false;
48
49 private IConfigSource m_Config;
50 bool m_Registered = false;
51
52 #region IRegionModule interface
53
54 public void Initialise(IConfigSource config)
55 {
56 m_Config = config;
57 IConfig moduleConfig = config.Configs["Modules"];
58 if (moduleConfig != null)
59 {
60 m_Enabled = moduleConfig.GetBoolean("GridInfoServiceInConnector", false);
61 if (m_Enabled)
62 {
63 m_log.Info("[GRIDINFO IN CONNECTOR]: GridInfo Service In Connector enabled");
64 }
65
66 }
67
68 }
69
70 public void PostInitialise()
71 {
72 }
73
74 public void Close()
75 {
76 }
77
78 public Type ReplaceableInterface
79 {
80 get { return null; }
81 }
82
83 public string Name
84 {
85 get { return "GridInfoService"; }
86 }
87
88 public void AddRegion(Scene scene)
89 {
90 if (!m_Enabled)
91 return;
92 }
93
94 public void RemoveRegion(Scene scene)
95 {
96 if (!m_Enabled)
97 return;
98 }
99
100 public void RegionLoaded(Scene scene)
101 {
102 if (!m_Enabled)
103 return;
104
105 if (!m_Registered)
106 {
107 m_Registered = true;
108
109 m_log.Info("[GridInfo]: Starting...");
110
111 new GridInfoServerInConnector(m_Config, MainServer.Instance, "GridInfoService");
112 }
113
114 }
115
116 #endregion
117
118 }
119}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
index b12d778..c6848bb 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Grid/HypergridServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Hypergrid/HypergridServiceInConnectorModule.cs
@@ -36,11 +36,11 @@ using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Server.Base; 37using OpenSim.Server.Base;
38using OpenSim.Server.Handlers.Base; 38using OpenSim.Server.Handlers.Base;
39using OpenSim.Server.Handlers.Grid; 39using OpenSim.Server.Handlers.Hypergrid;
40using OpenSim.Services.Interfaces; 40using OpenSim.Services.Interfaces;
41using GridRegion = OpenSim.Services.Interfaces.GridRegion; 41using GridRegion = OpenSim.Services.Interfaces.GridRegion;
42 42
43namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid 43namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Hypergrid
44{ 44{
45 public class HypergridServiceInConnectorModule : ISharedRegionModule 45 public class HypergridServiceInConnectorModule : ISharedRegionModule
46 { 46 {
@@ -49,16 +49,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
49 49
50 private IConfigSource m_Config; 50 private IConfigSource m_Config;
51 bool m_Registered = false; 51 bool m_Registered = false;
52 HypergridServiceInConnector m_HypergridHandler; 52 GatekeeperServiceInConnector m_HypergridHandler;
53 53
54 #region IRegionModule interface 54 #region IRegionModule interface
55 55
56 public void Initialise(IConfigSource config) 56 public void Initialise(IConfigSource config)
57 { 57 {
58 //// This module is only on for standalones in hypergrid mode
59 //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
60 // config.Configs["Startup"].GetBoolean("hypergrid", true);
61 //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
62 m_Config = config; 58 m_Config = config;
63 IConfig moduleConfig = config.Configs["Modules"]; 59 IConfig moduleConfig = config.Configs["Modules"];
64 if (moduleConfig != null) 60 if (moduleConfig != null)
@@ -102,9 +98,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
102 { 98 {
103 if (!m_Enabled) 99 if (!m_Enabled)
104 return; 100 return;
105
106 GridRegion rinfo = new GridRegion(scene.RegionInfo);
107 m_HypergridHandler.RemoveRegion(rinfo);
108 } 101 }
109 102
110 public void RegionLoaded(Scene scene) 103 public void RegionLoaded(Scene scene)
@@ -118,14 +111,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Grid
118 111
119 m_log.Info("[HypergridService]: Starting..."); 112 m_log.Info("[HypergridService]: Starting...");
120 113
121// Object[] args = new Object[] { m_Config, MainServer.Instance }; 114 ISimulationService simService = scene.RequestModuleInterface<ISimulationService>();
115 m_HypergridHandler = new GatekeeperServiceInConnector(m_Config, MainServer.Instance, simService);
116 scene.RegisterModuleInterface<IGatekeeperService>(m_HypergridHandler.GateKeeper);
122 117
123 m_HypergridHandler = new HypergridServiceInConnector(m_Config, MainServer.Instance, scene.RequestModuleInterface<IHyperlinkService>()); 118 new UserAgentServerConnector(m_Config, MainServer.Instance);
124 //ServerUtils.LoadPlugin<HypergridServiceInConnector>("OpenSim.Server.Handlers.dll:HypergridServiceInConnector", args);
125 } 119 }
126
127 GridRegion rinfo = new GridRegion(scene.RegionInfo);
128 m_HypergridHandler.AddRegion(rinfo);
129 } 120 }
130 121
131 #endregion 122 #endregion
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
index 54c6d89..ae03cdf 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Inventory/InventoryServiceInConnectorModule.cs
@@ -51,10 +51,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
51 51
52 public void Initialise(IConfigSource config) 52 public void Initialise(IConfigSource config)
53 { 53 {
54 //// This module is only on for standalones in hypergrid mode
55 //enabled = (!config.Configs["Startup"].GetBoolean("gridmode", true)) &&
56 // config.Configs["Startup"].GetBoolean("hypergrid", true);
57 //m_log.DebugFormat("[RegionInventoryService]: enabled? {0}", enabled);
58 m_Config = config; 54 m_Config = config;
59 IConfig moduleConfig = config.Configs["Modules"]; 55 IConfig moduleConfig = config.Configs["Modules"];
60 if (moduleConfig != null) 56 if (moduleConfig != null)
@@ -98,9 +94,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Inventory
98 94
99 m_log.Info("[RegionInventoryService]: Starting..."); 95 m_log.Info("[RegionInventoryService]: Starting...");
100 96
101 Object[] args = new Object[] { m_Config, MainServer.Instance, String.Empty }; 97 Object[] args = new Object[] { m_Config, MainServer.Instance, "HGInventoryService" };
102 98
103 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:InventoryServiceInConnector", args); 99 ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:HGInventoryServiceInConnector", args);
104 } 100 }
105 } 101 }
106 102
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
new file mode 100644
index 0000000..2a9366c
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Login/LLLoginServiceInConnectorModule.cs
@@ -0,0 +1,128 @@
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
28using System;
29using System.Reflection;
30using System.Collections.Generic;
31using log4net;
32using Nini.Config;
33using OpenSim.Framework;
34using OpenSim.Framework.Servers.HttpServer;
35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Server.Base;
38using OpenSim.Server.Handlers.Base;
39using OpenSim.Server.Handlers.Login;
40using OpenSim.Services.Interfaces;
41
42
43namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Login
44{
45 public class LLLoginServiceInConnectorModule : ISharedRegionModule
46 {
47 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
48 private static bool m_Enabled = false;
49 private static bool m_Registered = false;
50
51 private IConfigSource m_Config;
52 private List<Scene> m_Scenes = new List<Scene>();
53
54 #region IRegionModule interface
55
56 public void Initialise(IConfigSource config)
57 {
58 m_Config = config;
59
60 IConfig moduleConfig = config.Configs["Modules"];
61 if (moduleConfig != null)
62 {
63 m_Enabled = moduleConfig.GetBoolean("LLLoginServiceInConnector", false);
64 if (m_Enabled)
65 {
66 m_log.Info("[LLLOGIN IN CONNECTOR]: LLLoginerviceInConnector enabled");
67 }
68
69 }
70
71 }
72
73 public void PostInitialise()
74 {
75 if (!m_Enabled)
76 return;
77
78 m_log.Info("[LLLOGIN IN CONNECTOR]: Starting...");
79 }
80
81 public void Close()
82 {
83 }
84
85 public Type ReplaceableInterface
86 {
87 get { return null; }
88 }
89
90 public string Name
91 {
92 get { return "LLLoginServiceInConnectorModule"; }
93 }
94
95 public void AddRegion(Scene scene)
96 {
97 if (!m_Enabled)
98 return;
99
100 m_Scenes.Add(scene);
101
102 }
103
104 public void RemoveRegion(Scene scene)
105 {
106 if (m_Enabled && m_Scenes.Contains(scene))
107 m_Scenes.Remove(scene);
108 }
109
110 public void RegionLoaded(Scene scene)
111 {
112 if (!m_Enabled)
113 return;
114
115 if (!m_Registered)
116 {
117 m_Registered = true;
118 new LLLoginServiceInConnector(m_Config, MainServer.Instance, scene);
119 //Object[] args = new Object[] { m_Config, MainServer.Instance, this, scene };
120 //ServerUtils.LoadPlugin<IServiceConnector>("OpenSim.Server.Handlers.dll:LLLoginServiceInConnector", args);
121 }
122
123 }
124
125 #endregion
126
127 }
128}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
index f28a318..5ee1c97 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/Simulation/SimulationServiceInConnectorModule.cs
@@ -58,11 +58,10 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
58 IConfig moduleConfig = config.Configs["Modules"]; 58 IConfig moduleConfig = config.Configs["Modules"];
59 if (moduleConfig != null) 59 if (moduleConfig != null)
60 { 60 {
61 string name = moduleConfig.GetString("SimulationService", ""); 61 m_Enabled = moduleConfig.GetBoolean("SimulationServiceInConnector", false);
62 if (name == Name) 62 if (m_Enabled)
63 { 63 {
64 m_Enabled = true; 64 m_log.Info("[SIM SERVICE]: SimulationService IN connector enabled");
65 m_log.Info("[SIM SERVICE]: SimulationService enabled");
66 65
67 } 66 }
68 } 67 }
@@ -84,7 +83,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
84 83
85 public string Name 84 public string Name
86 { 85 {
87 get { return "SimulationService"; } 86 get { return "SimulationServiceInConnectorModule"; }
88 } 87 }
89 88
90 public void AddRegion(Scene scene) 89 public void AddRegion(Scene scene)
@@ -92,6 +91,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
92 if (!m_Enabled) 91 if (!m_Enabled)
93 return; 92 return;
94 93
94 }
95
96 public void RemoveRegion(Scene scene)
97 {
98 }
99
100 public void RegionLoaded(Scene scene)
101 {
102 if (!m_Enabled)
103 return;
104
95 if (!m_Registered) 105 if (!m_Registered)
96 { 106 {
97 m_Registered = true; 107 m_Registered = true;
@@ -104,14 +114,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsIn.Simulation
104 } 114 }
105 } 115 }
106 116
107 public void RemoveRegion(Scene scene)
108 {
109 }
110
111 public void RegionLoaded(Scene scene)
112 {
113 }
114
115 #endregion 117 #endregion
116 118
117 } 119 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
index 0aa753d..af2f3d6 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/HGAssetBroker.cs
@@ -31,7 +31,7 @@ using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Reflection; 32using System.Reflection;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34
35using OpenSim.Server.Base; 35using OpenSim.Server.Base;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
@@ -366,18 +366,12 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
366 366
367 public string GetUserAssetServer(UUID userID) 367 public string GetUserAssetServer(UUID userID)
368 { 368 {
369 CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID); 369 UserAccount account = m_aScene.UserAccountService.GetUserAccount(m_aScene.RegionInfo.ScopeID, userID);
370 if ((uinfo != null) && (uinfo.UserProfile != null)) 370
371 { 371 if (account != null && account.ServiceURLs.ContainsKey("AssetServerURI") && account.ServiceURLs["AssetServerURI"] != null)
372 if ((uinfo.UserProfile.UserAssetURI == string.Empty) || (uinfo.UserProfile.UserAssetURI == "")) 372 return account.ServiceURLs["AssetServerURI"].ToString();
373 return m_LocalAssetServiceURI; 373
374 return uinfo.UserProfile.UserAssetURI.Trim('/'); 374 return string.Empty;
375 }
376 else
377 {
378 // we don't know anyting about this user
379 return string.Empty;
380 }
381 } 375 }
382 376
383 public string GetSimAssetServer() 377 public string GetSimAssetServer()
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
new file mode 100644
index 0000000..acc362b
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/LocalAuthenticationServiceConnector.cs
@@ -0,0 +1,164 @@
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
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using log4net;
32using Nini.Config;
33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Server.Base;
36using OpenSim.Services.Interfaces;
37
38using OpenMetaverse;
39
40namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
41{
42 public class LocalAuthenticationServicesConnector : ISharedRegionModule, IAuthenticationService
43 {
44 private static readonly ILog m_log =
45 LogManager.GetLogger(
46 MethodBase.GetCurrentMethod().DeclaringType);
47
48 private IAuthenticationService m_AuthenticationService;
49
50 private bool m_Enabled = false;
51
52 #region ISharedRegionModule
53
54 public Type ReplaceableInterface
55 {
56 get { return null; }
57 }
58
59 public string Name
60 {
61 get { return "LocalAuthenticationServicesConnector"; }
62 }
63
64 public void Initialise(IConfigSource source)
65 {
66 IConfig moduleConfig = source.Configs["Modules"];
67 if (moduleConfig != null)
68 {
69 string name = moduleConfig.GetString("AuthenticationServices", "");
70 if (name == Name)
71 {
72 IConfig userConfig = source.Configs["AuthenticationService"];
73 if (userConfig == null)
74 {
75 m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
76 return;
77 }
78
79 string serviceDll = userConfig.GetString("LocalServiceModule",
80 String.Empty);
81
82 if (serviceDll == String.Empty)
83 {
84 m_log.Error("[AUTH CONNECTOR]: No LocalServiceModule named in section AuthenticationService");
85 return;
86 }
87
88 Object[] args = new Object[] { source };
89 m_AuthenticationService =
90 ServerUtils.LoadPlugin<IAuthenticationService>(serviceDll,
91 args);
92
93 if (m_AuthenticationService == null)
94 {
95 m_log.Error("[AUTH CONNECTOR]: Can't load Authentication service");
96 return;
97 }
98 m_Enabled = true;
99 m_log.Info("[AUTH CONNECTOR]: Local Authentication connector enabled");
100 }
101 }
102 }
103
104 public void PostInitialise()
105 {
106 if (!m_Enabled)
107 return;
108 }
109
110 public void Close()
111 {
112 if (!m_Enabled)
113 return;
114 }
115
116 public void AddRegion(Scene scene)
117 {
118 if (!m_Enabled)
119 return;
120
121 scene.RegisterModuleInterface<IAuthenticationService>(m_AuthenticationService);
122 }
123
124 public void RemoveRegion(Scene scene)
125 {
126 if (!m_Enabled)
127 return;
128 }
129
130 public void RegionLoaded(Scene scene)
131 {
132 if (!m_Enabled)
133 return;
134 }
135
136 #endregion
137
138 #region IAuthenticationService
139
140 public string Authenticate(UUID principalID, string password, int lifetime)
141 {
142 // Not implemented at the regions
143 return string.Empty;
144 }
145
146 public bool Verify(UUID principalID, string token, int lifetime)
147 {
148 return m_AuthenticationService.Verify(principalID, token, lifetime);
149 }
150
151 public bool Release(UUID principalID, string token)
152 {
153 return m_AuthenticationService.Release(principalID, token);
154 }
155
156 public bool SetPassword(UUID principalID, string passwd)
157 {
158 return m_AuthenticationService.SetPassword(principalID, passwd);
159 }
160
161 #endregion
162
163 }
164}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
index cca5bb4..a053bc2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/LocalUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authentication/RemoteAuthenticationServiceConnector.cs
@@ -26,24 +26,23 @@
26 */ 26 */
27 27
28using System; 28using System;
29using System.Reflection;
30using log4net;
31using Nini.Config; 29using Nini.Config;
30using log4net;
31using System.Reflection;
32using OpenSim.Region.Framework.Interfaces; 32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes; 33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Server.Base;
35using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
35using OpenSim.Services.Connectors;
36 36
37namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User 37namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authentication
38{ 38{
39 public class LocalUserServicesConnector : ISharedRegionModule 39 public class RemoteAuthenticationServicesConnector : AuthenticationServicesConnector,
40 ISharedRegionModule, IAuthenticationService
40 { 41 {
41 private static readonly ILog m_log = 42 private static readonly ILog m_log =
42 LogManager.GetLogger( 43 LogManager.GetLogger(
43 MethodBase.GetCurrentMethod().DeclaringType); 44 MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 private IUserAccountService m_UserService;
46
47 private bool m_Enabled = false; 46 private bool m_Enabled = false;
48 47
49 public Type ReplaceableInterface 48 public Type ReplaceableInterface
@@ -53,45 +52,29 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
53 52
54 public string Name 53 public string Name
55 { 54 {
56 get { return "LocalUserServicesConnector"; } 55 get { return "RemoteAuthenticationServicesConnector"; }
57 } 56 }
58 57
59 public void Initialise(IConfigSource source) 58 public override void Initialise(IConfigSource source)
60 { 59 {
61 IConfig moduleConfig = source.Configs["Modules"]; 60 IConfig moduleConfig = source.Configs["Modules"];
62 if (moduleConfig != null) 61 if (moduleConfig != null)
63 { 62 {
64 string name = moduleConfig.GetString("UserServices", ""); 63 string name = moduleConfig.GetString("AuthenticationServices", "");
65 if (name == Name) 64 if (name == Name)
66 { 65 {
67 IConfig userConfig = source.Configs["UserService"]; 66 IConfig userConfig = source.Configs["AuthenticationService"];
68 if (userConfig == null) 67 if (userConfig == null)
69 { 68 {
70 m_log.Error("[USER CONNECTOR]: UserService missing from OpenSim.ini"); 69 m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
71 return; 70 return;
72 } 71 }
73 72
74 string serviceDll = userConfig.GetString("LocalServiceModule", 73 m_Enabled = true;
75 String.Empty);
76
77 if (serviceDll == String.Empty)
78 {
79 m_log.Error("[USER CONNECTOR]: No LocalServiceModule named in section UserService");
80 return;
81 }
82 74
83 Object[] args = new Object[] { source }; 75 base.Initialise(source);
84 m_UserService =
85 ServerUtils.LoadPlugin<IUserAccountService>(serviceDll,
86 args);
87 76
88 if (m_UserService == null) 77 m_log.Info("[AUTH CONNECTOR]: Remote Authentication enabled");
89 {
90 m_log.Error("[USER CONNECTOR]: Can't load user service");
91 return;
92 }
93 m_Enabled = true;
94 m_log.Info("[USER CONNECTOR]: Local user connector enabled");
95 } 78 }
96 } 79 }
97 } 80 }
@@ -113,7 +96,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
113 if (!m_Enabled) 96 if (!m_Enabled)
114 return; 97 return;
115 98
116 scene.RegisterModuleInterface<IUserAccountService>(m_UserService); 99 scene.RegisterModuleInterface<IAuthenticationService>(this);
117 } 100 }
118 101
119 public void RemoveRegion(Scene scene) 102 public void RemoveRegion(Scene scene)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
index 68499f3..01a2615 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Authorization/RemoteAuthorizationServiceConnector.cs
@@ -139,9 +139,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Authorization
139 139
140 if (scene != null) 140 if (scene != null)
141 { 141 {
142 UserProfileData profile = scene.CommsManager.UserService.GetUserProfile(new UUID(userID)); 142 UserAccount account = scene.UserAccountService.GetUserAccount(UUID.Zero, userID);
143 isAuthorized = IsAuthorizedForRegion(userID, profile.FirstName, profile.SurName, 143 isAuthorized = IsAuthorizedForRegion(userID, account.FirstName, account.LastName,
144 profile.Email, scene.RegionInfo.RegionName, regionID, out message); 144 account.Email, scene.RegionInfo.RegionName, regionID, out message);
145 } 145 }
146 else 146 else
147 { 147 {
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
new file mode 100644
index 0000000..47f19a3
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/LocalAvatarServiceConnector.cs
@@ -0,0 +1,168 @@
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
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using log4net;
32using Nini.Config;
33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Server.Base;
36using OpenSim.Services.Interfaces;
37
38using OpenMetaverse;
39
40namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
41{
42 public class LocalAvatarServicesConnector : ISharedRegionModule, IAvatarService
43 {
44 private static readonly ILog m_log =
45 LogManager.GetLogger(
46 MethodBase.GetCurrentMethod().DeclaringType);
47
48 private IAvatarService m_AvatarService;
49
50 private bool m_Enabled = false;
51
52 #region ISharedRegionModule
53
54 public Type ReplaceableInterface
55 {
56 get { return null; }
57 }
58
59 public string Name
60 {
61 get { return "LocalAvatarServicesConnector"; }
62 }
63
64 public void Initialise(IConfigSource source)
65 {
66 IConfig moduleConfig = source.Configs["Modules"];
67 if (moduleConfig != null)
68 {
69 string name = moduleConfig.GetString("AvatarServices", "");
70 if (name == Name)
71 {
72 IConfig userConfig = source.Configs["AvatarService"];
73 if (userConfig == null)
74 {
75 m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
76 return;
77 }
78
79 string serviceDll = userConfig.GetString("LocalServiceModule",
80 String.Empty);
81
82 if (serviceDll == String.Empty)
83 {
84 m_log.Error("[AVATAR CONNECTOR]: No LocalServiceModule named in section AvatarService");
85 return;
86 }
87
88 Object[] args = new Object[] { source };
89 m_AvatarService =
90 ServerUtils.LoadPlugin<IAvatarService>(serviceDll,
91 args);
92
93 if (m_AvatarService == null)
94 {
95 m_log.Error("[AVATAR CONNECTOR]: Can't load user account service");
96 return;
97 }
98 m_Enabled = true;
99 m_log.Info("[AVATAR CONNECTOR]: Local avatar connector enabled");
100 }
101 }
102 }
103
104 public void PostInitialise()
105 {
106 if (!m_Enabled)
107 return;
108 }
109
110 public void Close()
111 {
112 if (!m_Enabled)
113 return;
114 }
115
116 public void AddRegion(Scene scene)
117 {
118 if (!m_Enabled)
119 return;
120
121 scene.RegisterModuleInterface<IAvatarService>(this);
122 }
123
124 public void RemoveRegion(Scene scene)
125 {
126 if (!m_Enabled)
127 return;
128 }
129
130 public void RegionLoaded(Scene scene)
131 {
132 if (!m_Enabled)
133 return;
134 }
135
136 #endregion
137
138 #region IAvatarService
139
140 public AvatarData GetAvatar(UUID userID)
141 {
142 return m_AvatarService.GetAvatar(userID);
143 }
144
145 public bool SetAvatar(UUID userID, AvatarData avatar)
146 {
147 return m_AvatarService.SetAvatar(userID, avatar);
148 }
149
150 public bool ResetAvatar(UUID userID)
151 {
152 return m_AvatarService.ResetAvatar(userID);
153 }
154
155 public bool SetItems(UUID userID, string[] names, string[] values)
156 {
157 return m_AvatarService.SetItems(userID, names, values);
158 }
159
160 public bool RemoveItems(UUID userID, string[] names)
161 {
162 return m_AvatarService.RemoveItems(userID, names);
163 }
164
165 #endregion
166
167 }
168}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
index cef9129..48759b5 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/User/RemoteUserServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Avatar/RemoteAvatarServiceConnector.cs
@@ -34,10 +34,10 @@ using OpenSim.Region.Framework.Scenes;
34using OpenSim.Services.Interfaces; 34using OpenSim.Services.Interfaces;
35using OpenSim.Services.Connectors; 35using OpenSim.Services.Connectors;
36 36
37namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User 37namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
38{ 38{
39 public class RemoteUserServicesConnector : UserServicesConnector, 39 public class RemoteAvatarServicesConnector : AvatarServicesConnector,
40 ISharedRegionModule, IUserAccountService 40 ISharedRegionModule, IAvatarService
41 { 41 {
42 private static readonly ILog m_log = 42 private static readonly ILog m_log =
43 LogManager.GetLogger( 43 LogManager.GetLogger(
@@ -52,7 +52,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
52 52
53 public string Name 53 public string Name
54 { 54 {
55 get { return "RemoteUserServicesConnector"; } 55 get { return "RemoteAvatarServicesConnector"; }
56 } 56 }
57 57
58 public override void Initialise(IConfigSource source) 58 public override void Initialise(IConfigSource source)
@@ -60,13 +60,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
60 IConfig moduleConfig = source.Configs["Modules"]; 60 IConfig moduleConfig = source.Configs["Modules"];
61 if (moduleConfig != null) 61 if (moduleConfig != null)
62 { 62 {
63 string name = moduleConfig.GetString("UserServices", ""); 63 string name = moduleConfig.GetString("AvatarServices", "");
64 if (name == Name) 64 if (name == Name)
65 { 65 {
66 IConfig userConfig = source.Configs["UserService"]; 66 IConfig userConfig = source.Configs["AvatarService"];
67 if (userConfig == null) 67 if (userConfig == null)
68 { 68 {
69 m_log.Error("[USER CONNECTOR]: UserService missing from OpanSim.ini"); 69 m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpanSim.ini");
70 return; 70 return;
71 } 71 }
72 72
@@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
74 74
75 base.Initialise(source); 75 base.Initialise(source);
76 76
77 m_log.Info("[USER CONNECTOR]: Remote users enabled"); 77 m_log.Info("[AVATAR CONNECTOR]: Remote avatars enabled");
78 } 78 }
79 } 79 }
80 } 80 }
@@ -96,7 +96,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.User
96 if (!m_Enabled) 96 if (!m_Enabled)
97 return; 97 return;
98 98
99 scene.RegisterModuleInterface<IUserAccountService>(this); 99 scene.RegisterModuleInterface<IAvatarService>(this);
100 } 100 }
101 101
102 public void RemoveRegion(Scene scene) 102 public void RemoveRegion(Scene scene)
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
deleted file mode 100644
index 0974372..0000000
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGCommands.cs
+++ /dev/null
@@ -1,303 +0,0 @@
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
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using System.Xml;
32using log4net;
33using Nini.Config;
34using OpenSim.Framework;
35//using OpenSim.Framework.Communications;
36using OpenSim.Framework.Console;
37using OpenSim.Region.Framework;
38using OpenSim.Region.Framework.Scenes;
39using OpenSim.Region.Framework.Scenes.Hypergrid;
40using GridRegion = OpenSim.Services.Interfaces.GridRegion;
41
42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
43{
44 public class HGCommands
45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47 private HGGridConnector m_HGGridConnector;
48 private Scene m_scene;
49
50 private static uint m_autoMappingX = 0;
51 private static uint m_autoMappingY = 0;
52 private static bool m_enableAutoMapping = false;
53
54 public HGCommands(HGGridConnector hgConnector, Scene scene)
55 {
56 m_HGGridConnector = hgConnector;
57 m_scene = scene;
58 }
59
60 //public static Scene CreateScene(RegionInfo regionInfo, AgentCircuitManager circuitManager, CommunicationsManager m_commsManager,
61 // StorageManager storageManager, ModuleLoader m_moduleLoader, ConfigSettings m_configSettings, OpenSimConfigSource m_config, string m_version)
62 //{
63 // HGSceneCommunicationService sceneGridService = new HGSceneCommunicationService(m_commsManager, HGServices);
64
65 // return
66 // new HGScene(
67 // regionInfo, circuitManager, m_commsManager, sceneGridService, storageManager,
68 // m_moduleLoader, false, m_configSettings.PhysicalPrim,
69 // m_configSettings.See_into_region_from_neighbor, m_config.Source, m_version);
70 //}
71
72 public void RunCommand(string module, string[] cmdparams)
73 {
74 List<string> args = new List<string>(cmdparams);
75 if (args.Count < 1)
76 return;
77
78 string command = args[0];
79 args.RemoveAt(0);
80
81 cmdparams = args.ToArray();
82
83 RunHGCommand(command, cmdparams);
84
85 }
86
87 private void RunHGCommand(string command, string[] cmdparams)
88 {
89 if (command.Equals("link-mapping"))
90 {
91 if (cmdparams.Length == 2)
92 {
93 try
94 {
95 m_autoMappingX = Convert.ToUInt32(cmdparams[0]);
96 m_autoMappingY = Convert.ToUInt32(cmdparams[1]);
97 m_enableAutoMapping = true;
98 }
99 catch (Exception)
100 {
101 m_autoMappingX = 0;
102 m_autoMappingY = 0;
103 m_enableAutoMapping = false;
104 }
105 }
106 }
107 else if (command.Equals("link-region"))
108 {
109 if (cmdparams.Length < 3)
110 {
111 if ((cmdparams.Length == 1) || (cmdparams.Length == 2))
112 {
113 LoadXmlLinkFile(cmdparams);
114 }
115 else
116 {
117 LinkRegionCmdUsage();
118 }
119 return;
120 }
121
122 if (cmdparams[2].Contains(":"))
123 {
124 // New format
125 int xloc, yloc;
126 string mapName;
127 try
128 {
129 xloc = Convert.ToInt32(cmdparams[0]);
130 yloc = Convert.ToInt32(cmdparams[1]);
131 mapName = cmdparams[2];
132 if (cmdparams.Length > 3)
133 for (int i = 3; i < cmdparams.Length; i++)
134 mapName += " " + cmdparams[i];
135
136 m_log.Info(">> MapName: " + mapName);
137 //internalPort = Convert.ToUInt32(cmdparams[4]);
138 //remotingPort = Convert.ToUInt32(cmdparams[5]);
139 }
140 catch (Exception e)
141 {
142 m_log.Warn("[HGrid] Wrong format for link-region command: " + e.Message);
143 LinkRegionCmdUsage();
144 return;
145 }
146
147 // Convert cell coordinates given by the user to meters
148 xloc = xloc * (int)Constants.RegionSize;
149 yloc = yloc * (int)Constants.RegionSize;
150 m_HGGridConnector.TryLinkRegionToCoords(m_scene, null, mapName, xloc, yloc);
151 }
152 else
153 {
154 // old format
155 GridRegion regInfo;
156 int xloc, yloc;
157 uint externalPort;
158 string externalHostName;
159 try
160 {
161 xloc = Convert.ToInt32(cmdparams[0]);
162 yloc = Convert.ToInt32(cmdparams[1]);
163 externalPort = Convert.ToUInt32(cmdparams[3]);
164 externalHostName = cmdparams[2];
165 //internalPort = Convert.ToUInt32(cmdparams[4]);
166 //remotingPort = Convert.ToUInt32(cmdparams[5]);
167 }
168 catch (Exception e)
169 {
170 m_log.Warn("[HGrid] Wrong format for link-region command: " + e.Message);
171 LinkRegionCmdUsage();
172 return;
173 }
174
175 // Convert cell coordinates given by the user to meters
176 xloc = xloc * (int)Constants.RegionSize;
177 yloc = yloc * (int)Constants.RegionSize;
178 if (m_HGGridConnector.TryCreateLink(m_scene, null, xloc, yloc, "", externalPort, externalHostName, out regInfo))
179 {
180 if (cmdparams.Length >= 5)
181 {
182 regInfo.RegionName = "";
183 for (int i = 4; i < cmdparams.Length; i++)
184 regInfo.RegionName += cmdparams[i] + " ";
185 }
186 }
187 }
188 return;
189 }
190 else if (command.Equals("unlink-region"))
191 {
192 if (cmdparams.Length < 1)
193 {
194 UnlinkRegionCmdUsage();
195 return;
196 }
197 if (m_HGGridConnector.TryUnlinkRegion(m_scene, cmdparams[0]))
198 m_log.InfoFormat("[HGrid]: Successfully unlinked {0}", cmdparams[0]);
199 else
200 m_log.InfoFormat("[HGrid]: Unable to unlink {0}, region not found", cmdparams[0]);
201 }
202 }
203
204 private void LoadXmlLinkFile(string[] cmdparams)
205 {
206 //use http://www.hgurl.com/hypergrid.xml for test
207 try
208 {
209 XmlReader r = XmlReader.Create(cmdparams[0]);
210 XmlConfigSource cs = new XmlConfigSource(r);
211 string[] excludeSections = null;
212
213 if (cmdparams.Length == 2)
214 {
215 if (cmdparams[1].ToLower().StartsWith("excludelist:"))
216 {
217 string excludeString = cmdparams[1].ToLower();
218 excludeString = excludeString.Remove(0, 12);
219 char[] splitter = { ';' };
220
221 excludeSections = excludeString.Split(splitter);
222 }
223 }
224
225 for (int i = 0; i < cs.Configs.Count; i++)
226 {
227 bool skip = false;
228 if ((excludeSections != null) && (excludeSections.Length > 0))
229 {
230 for (int n = 0; n < excludeSections.Length; n++)
231 {
232 if (excludeSections[n] == cs.Configs[i].Name.ToLower())
233 {
234 skip = true;
235 break;
236 }
237 }
238 }
239 if (!skip)
240 {
241 ReadLinkFromConfig(cs.Configs[i]);
242 }
243 }
244 }
245 catch (Exception e)
246 {
247 m_log.Error(e.ToString());
248 }
249 }
250
251
252 private void ReadLinkFromConfig(IConfig config)
253 {
254 GridRegion regInfo;
255 int xloc, yloc;
256 uint externalPort;
257 string externalHostName;
258 uint realXLoc, realYLoc;
259
260 xloc = Convert.ToInt32(config.GetString("xloc", "0"));
261 yloc = Convert.ToInt32(config.GetString("yloc", "0"));
262 externalPort = Convert.ToUInt32(config.GetString("externalPort", "0"));
263 externalHostName = config.GetString("externalHostName", "");
264 realXLoc = Convert.ToUInt32(config.GetString("real-xloc", "0"));
265 realYLoc = Convert.ToUInt32(config.GetString("real-yloc", "0"));
266
267 if (m_enableAutoMapping)
268 {
269 xloc = (int)((xloc % 100) + m_autoMappingX);
270 yloc = (int)((yloc % 100) + m_autoMappingY);
271 }
272
273 if (((realXLoc == 0) && (realYLoc == 0)) ||
274 (((realXLoc - xloc < 3896) || (xloc - realXLoc < 3896)) &&
275 ((realYLoc - yloc < 3896) || (yloc - realYLoc < 3896))))
276 {
277 xloc = xloc * (int)Constants.RegionSize;
278 yloc = yloc * (int)Constants.RegionSize;
279 if (
280 m_HGGridConnector.TryCreateLink(m_scene, null, xloc, yloc, "", externalPort,
281 externalHostName, out regInfo))
282 {
283 regInfo.RegionName = config.GetString("localName", "");
284 }
285 }
286 }
287
288
289 private void LinkRegionCmdUsage()
290 {
291 m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>]");
292 m_log.Info("Usage: link-region <Xloc> <Yloc> <HostName> <HttpPort> [<LocalName>]");
293 m_log.Info("Usage: link-region <URI_of_xml> [<exclude>]");
294 }
295
296 private void UnlinkRegionCmdUsage()
297 {
298 m_log.Info("Usage: unlink-region <HostName>:<HttpPort>");
299 m_log.Info("Usage: unlink-region <LocalName>");
300 }
301
302 }
303}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
deleted file mode 100644
index 131febd..0000000
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/HGGridConnector.cs
+++ /dev/null
@@ -1,811 +0,0 @@
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
28using System;
29using System.Collections.Generic;
30using System.Net;
31using System.Reflection;
32using System.Xml;
33
34using OpenSim.Framework.Communications.Cache;
35using OpenSim.Framework;
36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Region.Framework.Scenes.Hypergrid;
39using OpenSim.Services.Interfaces;
40using GridRegion = OpenSim.Services.Interfaces.GridRegion;
41using OpenSim.Server.Base;
42using OpenSim.Services.Connectors.Grid;
43using OpenSim.Framework.Console;
44
45using OpenMetaverse;
46using log4net;
47using Nini.Config;
48
49namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
50{
51 public class HGGridConnector : ISharedRegionModule, IGridService, IHyperlinkService
52 {
53 private static readonly ILog m_log =
54 LogManager.GetLogger(
55 MethodBase.GetCurrentMethod().DeclaringType);
56 private static string LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI;
57
58 private bool m_Enabled = false;
59 private bool m_Initialized = false;
60
61 private Scene m_aScene;
62 private Dictionary<ulong, Scene> m_LocalScenes = new Dictionary<ulong, Scene>();
63
64 private IGridService m_GridServiceConnector;
65 private HypergridServiceConnector m_HypergridServiceConnector;
66
67 // Hyperlink regions are hyperlinks on the map
68 protected Dictionary<UUID, GridRegion> m_HyperlinkRegions = new Dictionary<UUID, GridRegion>();
69
70 // Known regions are home regions of visiting foreign users.
71 // They are not on the map as static hyperlinks. They are dynamic hyperlinks, they go away when
72 // the visitor goes away. They are mapped to X=0 on the map.
73 // This is key-ed on agent ID
74 protected Dictionary<UUID, GridRegion> m_knownRegions = new Dictionary<UUID, GridRegion>();
75
76 protected Dictionary<UUID, ulong> m_HyperlinkHandles = new Dictionary<UUID, ulong>();
77
78 #region ISharedRegionModule
79
80 public Type ReplaceableInterface
81 {
82 get { return null; }
83 }
84
85 public string Name
86 {
87 get { return "HGGridServicesConnector"; }
88 }
89
90 public void Initialise(IConfigSource source)
91 {
92 IConfig moduleConfig = source.Configs["Modules"];
93 if (moduleConfig != null)
94 {
95 string name = moduleConfig.GetString("GridServices", "");
96 if (name == Name)
97 {
98 IConfig gridConfig = source.Configs["GridService"];
99 if (gridConfig == null)
100 {
101 m_log.Error("[HGGRID CONNECTOR]: GridService missing from OpenSim.ini");
102 return;
103 }
104
105
106 InitialiseConnectorModule(source);
107
108 m_Enabled = true;
109 m_log.Info("[HGGRID CONNECTOR]: HG grid enabled");
110 }
111 }
112 }
113
114 private void InitialiseConnectorModule(IConfigSource source)
115 {
116 IConfig gridConfig = source.Configs["GridService"];
117 if (gridConfig == null)
118 {
119 m_log.Error("[HGGRID CONNECTOR]: GridService missing from OpenSim.ini");
120 throw new Exception("Grid connector init error");
121 }
122
123 string module = gridConfig.GetString("GridServiceConnectorModule", String.Empty);
124 if (module == String.Empty)
125 {
126 m_log.Error("[HGGRID CONNECTOR]: No GridServiceConnectorModule named in section GridService");
127 //return;
128 throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
129 }
130
131 Object[] args = new Object[] { source };
132 m_GridServiceConnector = ServerUtils.LoadPlugin<IGridService>(module, args);
133
134 }
135
136 public void PostInitialise()
137 {
138 if (m_Enabled)
139 ((ISharedRegionModule)m_GridServiceConnector).PostInitialise();
140 }
141
142 public void Close()
143 {
144 }
145
146 public void AddRegion(Scene scene)
147 {
148 if (!m_Enabled)
149 return;
150
151 m_LocalScenes[scene.RegionInfo.RegionHandle] = scene;
152 scene.RegisterModuleInterface<IGridService>(this);
153 scene.RegisterModuleInterface<IHyperlinkService>(this);
154
155 ((ISharedRegionModule)m_GridServiceConnector).AddRegion(scene);
156
157 // Yikes!! Remove this as soon as user services get refactored
158 LocalAssetServerURI = scene.CommsManager.NetworkServersInfo.AssetURL;
159 LocalInventoryServerURI = scene.CommsManager.NetworkServersInfo.InventoryURL;
160 LocalUserServerURI = scene.CommsManager.NetworkServersInfo.UserURL;
161 HGNetworkServersInfo.Init(LocalAssetServerURI, LocalInventoryServerURI, LocalUserServerURI);
162
163 }
164
165 public void RemoveRegion(Scene scene)
166 {
167 if (m_Enabled)
168 {
169 m_LocalScenes.Remove(scene.RegionInfo.RegionHandle);
170 ((ISharedRegionModule)m_GridServiceConnector).RemoveRegion(scene);
171 }
172 }
173
174 public void RegionLoaded(Scene scene)
175 {
176 if (!m_Enabled)
177 return;
178
179 if (!m_Initialized)
180 {
181 m_aScene = scene;
182
183 m_HypergridServiceConnector = new HypergridServiceConnector(scene.AssetService);
184
185 HGCommands hgCommands = new HGCommands(this, scene);
186 MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-region",
187 "link-region <Xloc> <Yloc> <HostName>:<HttpPort>[:<RemoteRegionName>] <cr>",
188 "Link a hypergrid region", hgCommands.RunCommand);
189 MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "unlink-region",
190 "unlink-region <local name> or <HostName>:<HttpPort> <cr>",
191 "Unlink a hypergrid region", hgCommands.RunCommand);
192 MainConsole.Instance.Commands.AddCommand("HGGridServicesConnector", false, "link-mapping", "link-mapping [<x> <y>] <cr>",
193 "Set local coordinate to map HG regions to", hgCommands.RunCommand);
194
195 m_Initialized = true;
196 }
197 }
198
199 #endregion
200
201 #region IGridService
202
203 public string RegisterRegion(UUID scopeID, GridRegion regionInfo)
204 {
205 // Region doesn't exist here. Trying to link remote region
206 if (regionInfo.RegionID.Equals(UUID.Zero))
207 {
208 m_log.Info("[HGrid]: Linking remote region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort);
209 ulong regionHandle = 0;
210 regionInfo.RegionID = m_HypergridServiceConnector.LinkRegion(regionInfo, out regionHandle);
211 if (!regionInfo.RegionID.Equals(UUID.Zero))
212 {
213 AddHyperlinkRegion(regionInfo, regionHandle);
214 m_log.Info("[HGrid]: Successfully linked to region_uuid " + regionInfo.RegionID);
215
216 // Try get the map image
217 m_HypergridServiceConnector.GetMapImage(regionInfo);
218 return String.Empty;
219 }
220 else
221 {
222 m_log.Info("[HGrid]: No such region " + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "(" + regionInfo.InternalEndPoint.Port + ")");
223 return "No such region";
224 }
225 // Note that these remote regions aren't registered in localBackend, so return null, no local listeners
226 }
227 else // normal grid
228 return m_GridServiceConnector.RegisterRegion(scopeID, regionInfo);
229 }
230
231 public bool DeregisterRegion(UUID regionID)
232 {
233 // Try the hyperlink collection
234 if (m_HyperlinkRegions.ContainsKey(regionID))
235 {
236 RemoveHyperlinkRegion(regionID);
237 return true;
238 }
239 // Try the foreign users home collection
240
241 foreach (GridRegion r in m_knownRegions.Values)
242 if (r.RegionID == regionID)
243 {
244 RemoveHyperlinkHomeRegion(regionID);
245 return true;
246 }
247
248 // Finally, try the normal route
249 return m_GridServiceConnector.DeregisterRegion(regionID);
250 }
251
252 public List<GridRegion> GetNeighbours(UUID scopeID, UUID regionID)
253 {
254 // No serving neighbours on hyperliked regions.
255 // Just the regular regions.
256 return m_GridServiceConnector.GetNeighbours(scopeID, regionID);
257 }
258
259 public GridRegion GetRegionByUUID(UUID scopeID, UUID regionID)
260 {
261 // Try the hyperlink collection
262 if (m_HyperlinkRegions.ContainsKey(regionID))
263 return m_HyperlinkRegions[regionID];
264
265 // Try the foreign users home collection
266 foreach (GridRegion r in m_knownRegions.Values)
267 if (r.RegionID == regionID)
268 return r;
269
270 // Finally, try the normal route
271 return m_GridServiceConnector.GetRegionByUUID(scopeID, regionID);
272 }
273
274 public GridRegion GetRegionByPosition(UUID scopeID, int x, int y)
275 {
276 int snapX = (int) (x / Constants.RegionSize) * (int)Constants.RegionSize;
277 int snapY = (int) (y / Constants.RegionSize) * (int)Constants.RegionSize;
278 // Try the hyperlink collection
279 foreach (GridRegion r in m_HyperlinkRegions.Values)
280 {
281 if ((r.RegionLocX == snapX) && (r.RegionLocY == snapY))
282 return r;
283 }
284
285 // Try the foreign users home collection
286 foreach (GridRegion r in m_knownRegions.Values)
287 {
288 if ((r.RegionLocX == snapX) && (r.RegionLocY == snapY))
289 {
290 return r;
291 }
292 }
293
294 // Finally, try the normal route
295 return m_GridServiceConnector.GetRegionByPosition(scopeID, x, y);
296 }
297
298 public GridRegion GetRegionByName(UUID scopeID, string regionName)
299 {
300 // Try normal grid first
301 GridRegion region = m_GridServiceConnector.GetRegionByName(scopeID, regionName);
302 if (region != null)
303 return region;
304
305 // Try the hyperlink collection
306 foreach (GridRegion r in m_HyperlinkRegions.Values)
307 {
308 if (r.RegionName == regionName)
309 return r;
310 }
311
312 // Try the foreign users home collection
313 foreach (GridRegion r in m_knownRegions.Values)
314 {
315 if (r.RegionName == regionName)
316 return r;
317 }
318 return null;
319 }
320
321 public List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
322 {
323 List<GridRegion> rinfos = new List<GridRegion>();
324
325 if (name == string.Empty)
326 return rinfos;
327
328 foreach (GridRegion r in m_HyperlinkRegions.Values)
329 if ((r.RegionName != null) && r.RegionName.ToLower().StartsWith(name.ToLower()))
330 rinfos.Add(r);
331
332 rinfos.AddRange(m_GridServiceConnector.GetRegionsByName(scopeID, name, maxNumber));
333 return rinfos;
334 }
335
336 public List<GridRegion> GetRegionRange(UUID scopeID, int xmin, int xmax, int ymin, int ymax)
337 {
338 int snapXmin = (int)(xmin / Constants.RegionSize) * (int)Constants.RegionSize;
339// int snapXmax = (int)(xmax / Constants.RegionSize) * (int)Constants.RegionSize;
340 int snapYmin = (int)(ymin / Constants.RegionSize) * (int)Constants.RegionSize;
341 int snapYmax = (int)(ymax / Constants.RegionSize) * (int)Constants.RegionSize;
342
343 List<GridRegion> rinfos = new List<GridRegion>();
344 foreach (GridRegion r in m_HyperlinkRegions.Values)
345 if ((r.RegionLocX > snapXmin) && (r.RegionLocX < snapYmax) &&
346 (r.RegionLocY > snapYmin) && (r.RegionLocY < snapYmax))
347 rinfos.Add(r);
348
349 rinfos.AddRange(m_GridServiceConnector.GetRegionRange(scopeID, xmin, xmax, ymin, ymax));
350
351 return rinfos;
352 }
353
354 #endregion
355
356 #region Auxiliary
357
358 private void AddHyperlinkRegion(GridRegion regionInfo, ulong regionHandle)
359 {
360 m_HyperlinkRegions[regionInfo.RegionID] = regionInfo;
361 m_HyperlinkHandles[regionInfo.RegionID] = regionHandle;
362 }
363
364 private void RemoveHyperlinkRegion(UUID regionID)
365 {
366 m_HyperlinkRegions.Remove(regionID);
367 m_HyperlinkHandles.Remove(regionID);
368 }
369
370 private void AddHyperlinkHomeRegion(UUID userID, GridRegion regionInfo, ulong regionHandle)
371 {
372 m_knownRegions[userID] = regionInfo;
373 m_HyperlinkHandles[regionInfo.RegionID] = regionHandle;
374 }
375
376 private void RemoveHyperlinkHomeRegion(UUID regionID)
377 {
378 foreach (KeyValuePair<UUID, GridRegion> kvp in m_knownRegions)
379 {
380 if (kvp.Value.RegionID == regionID)
381 {
382 m_knownRegions.Remove(kvp.Key);
383 }
384 }
385 m_HyperlinkHandles.Remove(regionID);
386 }
387 #endregion
388
389 #region IHyperlinkService
390
391 private static Random random = new Random();
392
393
394 public GridRegion TryLinkRegionToCoords(Scene m_scene, IClientAPI client, string mapName, int xloc, int yloc)
395 {
396 string host = "127.0.0.1";
397 string portstr;
398 string regionName = "";
399 uint port = 9000;
400 string[] parts = mapName.Split(new char[] { ':' });
401 if (parts.Length >= 1)
402 {
403 host = parts[0];
404 }
405 if (parts.Length >= 2)
406 {
407 portstr = parts[1];
408 //m_log.Debug("-- port = " + portstr);
409 if (!UInt32.TryParse(portstr, out port))
410 regionName = parts[1];
411 }
412 // always take the last one
413 if (parts.Length >= 3)
414 {
415 regionName = parts[2];
416 }
417
418 // Sanity check. Don't ever link to this sim.
419 IPAddress ipaddr = null;
420 try
421 {
422 ipaddr = Util.GetHostFromDNS(host);
423 }
424 catch { }
425
426 if ((ipaddr != null) &&
427 !((m_scene.RegionInfo.ExternalEndPoint.Address.Equals(ipaddr)) && (m_scene.RegionInfo.HttpPort == port)))
428 {
429 GridRegion regInfo;
430 bool success = TryCreateLink(m_scene, client, xloc, yloc, regionName, port, host, out regInfo);
431 if (success)
432 {
433 regInfo.RegionName = mapName;
434 return regInfo;
435 }
436 }
437
438 return null;
439 }
440
441
442 // From the map search and secondlife://blah
443 public GridRegion TryLinkRegion(Scene m_scene, IClientAPI client, string mapName)
444 {
445 int xloc = random.Next(0, Int16.MaxValue) * (int) Constants.RegionSize;
446 return TryLinkRegionToCoords(m_scene, client, mapName, xloc, 0);
447 }
448
449 public bool TryCreateLink(Scene m_scene, IClientAPI client, int xloc, int yloc,
450 string externalRegionName, uint externalPort, string externalHostName, out GridRegion regInfo)
451 {
452 m_log.DebugFormat("[HGrid]: Link to {0}:{1}, in {2}-{3}", externalHostName, externalPort, xloc, yloc);
453
454 regInfo = new GridRegion();
455 regInfo.RegionName = externalRegionName;
456 regInfo.HttpPort = externalPort;
457 regInfo.ExternalHostName = externalHostName;
458 regInfo.RegionLocX = xloc;
459 regInfo.RegionLocY = yloc;
460
461 try
462 {
463 regInfo.InternalEndPoint = new IPEndPoint(IPAddress.Parse("0.0.0.0"), (int)0);
464 }
465 catch (Exception e)
466 {
467 m_log.Warn("[HGrid]: Wrong format for link-region: " + e.Message);
468 return false;
469 }
470
471 // Finally, link it
472 if (RegisterRegion(UUID.Zero, regInfo) != String.Empty)
473 {
474 m_log.Warn("[HGrid]: Unable to link region");
475 return false;
476 }
477
478 int x, y;
479 if (!Check4096(m_scene, regInfo, out x, out y))
480 {
481 DeregisterRegion(regInfo.RegionID);
482 if (client != null)
483 client.SendAlertMessage("Region is too far (" + x + ", " + y + ")");
484 m_log.Info("[HGrid]: Unable to link, region is too far (" + x + ", " + y + ")");
485 return false;
486 }
487
488 if (!CheckCoords(m_scene.RegionInfo.RegionLocX, m_scene.RegionInfo.RegionLocY, x, y))
489 {
490 DeregisterRegion(regInfo.RegionID);
491 if (client != null)
492 client.SendAlertMessage("Region has incompatible coordinates (" + x + ", " + y + ")");
493 m_log.Info("[HGrid]: Unable to link, region has incompatible coordinates (" + x + ", " + y + ")");
494 return false;
495 }
496
497 m_log.Debug("[HGrid]: link region succeeded");
498 return true;
499 }
500
501 public bool TryUnlinkRegion(Scene m_scene, string mapName)
502 {
503 GridRegion regInfo = null;
504 if (mapName.Contains(":"))
505 {
506 string host = "127.0.0.1";
507 //string portstr;
508 //string regionName = "";
509 uint port = 9000;
510 string[] parts = mapName.Split(new char[] { ':' });
511 if (parts.Length >= 1)
512 {
513 host = parts[0];
514 }
515 // if (parts.Length >= 2)
516 // {
517 // portstr = parts[1];
518 // if (!UInt32.TryParse(portstr, out port))
519 // regionName = parts[1];
520 // }
521 // always take the last one
522 // if (parts.Length >= 3)
523 // {
524 // regionName = parts[2];
525 // }
526 foreach (GridRegion r in m_HyperlinkRegions.Values)
527 if (host.Equals(r.ExternalHostName) && (port == r.HttpPort))
528 regInfo = r;
529 }
530 else
531 {
532 foreach (GridRegion r in m_HyperlinkRegions.Values)
533 if (r.RegionName.Equals(mapName))
534 regInfo = r;
535 }
536 if (regInfo != null)
537 {
538 return DeregisterRegion(regInfo.RegionID);
539 }
540 else
541 {
542 m_log.InfoFormat("[HGrid]: Region {0} not found", mapName);
543 return false;
544 }
545 }
546
547 /// <summary>
548 /// Cope with this viewer limitation.
549 /// </summary>
550 /// <param name="regInfo"></param>
551 /// <returns></returns>
552 public bool Check4096(Scene m_scene, GridRegion regInfo, out int x, out int y)
553 {
554 ulong realHandle = m_HyperlinkHandles[regInfo.RegionID];
555 uint ux = 0, uy = 0;
556 Utils.LongToUInts(realHandle, out ux, out uy);
557 x = (int)(ux / Constants.RegionSize);
558 y = (int)(uy / Constants.RegionSize);
559
560 if ((Math.Abs((int)m_scene.RegionInfo.RegionLocX - x) >= 4096) ||
561 (Math.Abs((int)m_scene.RegionInfo.RegionLocY - y) >= 4096))
562 {
563 return false;
564 }
565 return true;
566 }
567
568 public bool CheckCoords(uint thisx, uint thisy, int x, int y)
569 {
570 if ((thisx == x) && (thisy == y))
571 return false;
572 return true;
573 }
574
575 public GridRegion TryLinkRegion(IClientAPI client, string regionDescriptor)
576 {
577 return TryLinkRegion((Scene)client.Scene, client, regionDescriptor);
578 }
579
580 public GridRegion GetHyperlinkRegion(ulong handle)
581 {
582 foreach (GridRegion r in m_HyperlinkRegions.Values)
583 if (r.RegionHandle == handle)
584 return r;
585 foreach (GridRegion r in m_knownRegions.Values)
586 if (r.RegionHandle == handle)
587 return r;
588 return null;
589 }
590
591 public ulong FindRegionHandle(ulong handle)
592 {
593 foreach (GridRegion r in m_HyperlinkRegions.Values)
594 if ((r.RegionHandle == handle) && (m_HyperlinkHandles.ContainsKey(r.RegionID)))
595 return m_HyperlinkHandles[r.RegionID];
596
597 foreach (GridRegion r in m_knownRegions.Values)
598 if ((r.RegionHandle == handle) && (m_HyperlinkHandles.ContainsKey(r.RegionID)))
599 return m_HyperlinkHandles[r.RegionID];
600
601 return handle;
602 }
603
604 public bool SendUserInformation(GridRegion regInfo, AgentCircuitData agentData)
605 {
606 CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID);
607
608 if (uinfo == null)
609 return false;
610
611 if ((IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null)) ||
612 (!IsLocalUser(uinfo) && !IsGoingHome(uinfo, regInfo)))
613 {
614 m_log.Info("[HGrid]: Local user is going to foreign region or foreign user is going elsewhere");
615
616 // Set the position of the region on the remote grid
617// ulong realHandle = FindRegionHandle(regInfo.RegionHandle);
618 uint x = 0, y = 0;
619 Utils.LongToUInts(regInfo.RegionHandle, out x, out y);
620 GridRegion clonedRegion = new GridRegion(regInfo);
621 clonedRegion.RegionLocX = (int)x;
622 clonedRegion.RegionLocY = (int)y;
623
624 // Get the user's home region information and adapt the region handle
625 GridRegion home = GetRegionByUUID(m_aScene.RegionInfo.ScopeID, uinfo.UserProfile.HomeRegionID);
626 if (m_HyperlinkHandles.ContainsKey(uinfo.UserProfile.HomeRegionID))
627 {
628 ulong realHandle = m_HyperlinkHandles[uinfo.UserProfile.HomeRegionID];
629 Utils.LongToUInts(realHandle, out x, out y);
630 m_log.DebugFormat("[HGrid]: Foreign user is going elsewhere. Adjusting home handle from {0}-{1} to {2}-{3}", home.RegionLocX, home.RegionLocY, x, y);
631 home.RegionLocX = (int)x;
632 home.RegionLocY = (int)y;
633 }
634
635 // Get the user's service URLs
636 string serverURI = "";
637 if (uinfo.UserProfile is ForeignUserProfileData)
638 serverURI = Util.ServerURI(((ForeignUserProfileData)uinfo.UserProfile).UserServerURI);
639 string userServer = (serverURI == "") || (serverURI == null) ? LocalUserServerURI : serverURI;
640
641 string assetServer = Util.ServerURI(uinfo.UserProfile.UserAssetURI);
642 if ((assetServer == null) || (assetServer == ""))
643 assetServer = LocalAssetServerURI;
644
645 string inventoryServer = Util.ServerURI(uinfo.UserProfile.UserInventoryURI);
646 if ((inventoryServer == null) || (inventoryServer == ""))
647 inventoryServer = LocalInventoryServerURI;
648
649 if (!m_HypergridServiceConnector.InformRegionOfUser(clonedRegion, agentData, home, userServer, assetServer, inventoryServer))
650 {
651 m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
652 return false;
653 }
654 }
655 //if ((uinfo == null) || !IsGoingHome(uinfo, regInfo))
656 //{
657 // m_log.Info("[HGrid]: User seems to be going to foreign region.");
658 // if (!InformRegionOfUser(regInfo, agentData))
659 // {
660 // m_log.Warn("[HGrid]: Could not inform remote region of transferring user.");
661 // return false;
662 // }
663 //}
664 //else
665 // m_log.Info("[HGrid]: User seems to be going home " + uinfo.UserProfile.FirstName + " " + uinfo.UserProfile.SurName);
666
667 // May need to change agent's name
668 if (IsLocalUser(uinfo) && (GetHyperlinkRegion(regInfo.RegionHandle) != null))
669 {
670 agentData.firstname = agentData.firstname + "." + agentData.lastname;
671 agentData.lastname = "@" + LocalUserServerURI.Replace("http://", ""); ; //HGNetworkServersInfo.Singleton.LocalUserServerURI;
672 }
673
674 return true;
675 }
676
677 public void AdjustUserInformation(AgentCircuitData agentData)
678 {
679 CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(agentData.AgentID);
680 if ((uinfo != null) && (uinfo.UserProfile != null) &&
681 (IsLocalUser(uinfo) || !(uinfo.UserProfile is ForeignUserProfileData)))
682 {
683 //m_log.Debug("---------------> Local User!");
684 string[] parts = agentData.firstname.Split(new char[] { '.' });
685 if (parts.Length == 2)
686 {
687 agentData.firstname = parts[0];
688 agentData.lastname = parts[1];
689 }
690 }
691 //else
692 // m_log.Debug("---------------> Foreign User!");
693 }
694
695 // Check if a local user exists with the same UUID as the incoming foreign user
696 public bool CheckUserAtEntry(UUID userID, UUID sessionID, out bool comingHome)
697 {
698 comingHome = false;
699
700 CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
701 if (uinfo != null)
702 {
703 // uh-oh we have a potential intruder
704 if (uinfo.SessionID != sessionID)
705 // can't have a foreigner with a local UUID
706 return false;
707 else
708 // oh, so it's you! welcome back
709 comingHome = true;
710 }
711
712 // OK, user can come in
713 return true;
714 }
715
716 public void AcceptUser(ForeignUserProfileData user, GridRegion home)
717 {
718 m_aScene.CommsManager.UserProfileCacheService.PreloadUserCache(user);
719 ulong realHandle = home.RegionHandle;
720 // Change the local coordinates
721 // X=0 on the map
722 home.RegionLocX = 0;
723 home.RegionLocY = random.Next(0, 10000) * (int)Constants.RegionSize;
724
725 AddHyperlinkHomeRegion(user.ID, home, realHandle);
726
727 DumpUserData(user);
728 DumpRegionData(home);
729
730 }
731
732 public bool IsLocalUser(UUID userID)
733 {
734 CachedUserInfo uinfo = m_aScene.CommsManager.UserProfileCacheService.GetUserDetails(userID);
735 return IsLocalUser(uinfo);
736 }
737
738 #endregion
739
740 #region IHyperlink Misc
741
742 protected bool IsComingHome(ForeignUserProfileData userData)
743 {
744 return (userData.UserServerURI == LocalUserServerURI);
745 }
746
747 // Is the user going back to the home region or the home grid?
748 protected bool IsGoingHome(CachedUserInfo uinfo, GridRegion rinfo)
749 {
750 if (uinfo == null)
751 return false;
752
753 if (uinfo.UserProfile == null)
754 return false;
755
756 if (!(uinfo.UserProfile is ForeignUserProfileData))
757 // it's a home user, can't be outside to return home
758 return false;
759
760 // OK, it's a foreign user with a ForeignUserProfileData
761 // and is going back to exactly the home region.
762 // We can't check if it's going back to a non-home region
763 // of the home grid. That will be dealt with in the
764 // receiving end
765 return (uinfo.UserProfile.HomeRegionID == rinfo.RegionID);
766 }
767
768 protected bool IsLocalUser(CachedUserInfo uinfo)
769 {
770 if (uinfo == null)
771 return false;
772
773 return !(uinfo.UserProfile is ForeignUserProfileData);
774
775 }
776
777
778 protected bool IsLocalRegion(ulong handle)
779 {
780 return m_LocalScenes.ContainsKey(handle);
781 }
782
783 private void DumpUserData(ForeignUserProfileData userData)
784 {
785 m_log.Info(" ------------ User Data Dump ----------");
786 m_log.Info(" >> Name: " + userData.FirstName + " " + userData.SurName);
787 m_log.Info(" >> HomeID: " + userData.HomeRegionID);
788 m_log.Info(" >> UserServer: " + userData.UserServerURI);
789 m_log.Info(" >> InvServer: " + userData.UserInventoryURI);
790 m_log.Info(" >> AssetServer: " + userData.UserAssetURI);
791 m_log.Info(" ------------ -------------- ----------");
792 }
793
794 private void DumpRegionData(GridRegion rinfo)
795 {
796 m_log.Info(" ------------ Region Data Dump ----------");
797 m_log.Info(" >> handle: " + rinfo.RegionHandle);
798 m_log.Info(" >> coords: " + rinfo.RegionLocX + ", " + rinfo.RegionLocY);
799 m_log.Info(" >> external host name: " + rinfo.ExternalHostName);
800 m_log.Info(" >> http port: " + rinfo.HttpPort);
801 m_log.Info(" >> external EP address: " + rinfo.ExternalEndPoint.Address);
802 m_log.Info(" >> external EP port: " + rinfo.ExternalEndPoint.Port);
803 m_log.Info(" ------------ -------------- ----------");
804 }
805
806
807 #endregion
808
809
810 }
811}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
index 144b5a4..1b00c8a 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/LocalGridServiceConnector.cs
@@ -238,6 +238,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
238 return m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax); 238 return m_GridService.GetRegionRange(scopeID, xmin, xmax, ymin, ymax);
239 } 239 }
240 240
241 public List<GridRegion> GetDefaultRegions(UUID scopeID)
242 {
243 return m_GridService.GetDefaultRegions(scopeID);
244 }
245
246 public List<GridRegion> GetFallbackRegions(UUID scopeID, int x, int y)
247 {
248 return m_GridService.GetFallbackRegions(scopeID, x, y);
249 }
250
251 public int GetRegionFlags(UUID scopeID, UUID regionID)
252 {
253 return m_GridService.GetRegionFlags(scopeID, regionID);
254 }
255
241 #endregion 256 #endregion
242 257
243 public void NeighboursCommand(string module, string[] cmdparams) 258 public void NeighboursCommand(string module, string[] cmdparams)
@@ -250,5 +265,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
250 m_log.InfoFormat(" {0} @ {1}={2}", r.RegionName, r.RegionLocX / Constants.RegionSize, r.RegionLocY / Constants.RegionSize); 265 m_log.InfoFormat(" {0} @ {1}={2}", r.RegionName, r.RegionLocX / Constants.RegionSize, r.RegionLocY / Constants.RegionSize);
251 } 266 }
252 } 267 }
268
253 } 269 }
254} 270}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
index 391e7c8..2c234d2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Grid/RemoteGridServiceConnector.cs
@@ -188,9 +188,26 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Grid
188 return rinfo; 188 return rinfo;
189 } 189 }
190 190
191 // Let's not override GetRegionsByName -- let's get them all from the grid server 191 public override List<GridRegion> GetRegionsByName(UUID scopeID, string name, int maxNumber)
192 {
193 List<GridRegion> rinfo = m_LocalGridService.GetRegionsByName(scopeID, name, maxNumber);
194 List<GridRegion> grinfo = base.GetRegionsByName(scopeID, name, maxNumber);
195
196 if (grinfo != null)
197 rinfo.AddRange(grinfo);
198 return rinfo;
199 }
200
192 // Let's not override GetRegionRange -- let's get them all from the grid server 201 // Let's not override GetRegionRange -- let's get them all from the grid server
193 202
203 public override int GetRegionFlags(UUID scopeID, UUID regionID)
204 {
205 int flags = m_LocalGridService.GetRegionFlags(scopeID, regionID);
206 if (flags == -1)
207 flags = base.GetRegionFlags(scopeID, regionID);
208
209 return flags;
210 }
194 #endregion 211 #endregion
195 } 212 }
196} 213}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
deleted file mode 100644
index fa3681a..0000000
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/RESTInterregionComms.cs
+++ /dev/null
@@ -1,843 +0,0 @@
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
28using System;
29using System.Collections;
30using System.IO;
31using System.Net;
32using System.Reflection;
33using System.Text;
34using log4net;
35using Nini.Config;
36using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using OpenSim.Framework;
39using OpenSim.Framework.Communications;
40using OpenSim.Framework.Communications.Clients;
41using OpenSim.Region.Framework.Interfaces;
42using OpenSim.Region.Framework.Scenes;
43using OpenSim.Region.Framework.Scenes.Hypergrid;
44using OpenSim.Region.Framework.Scenes.Serialization;
45using OpenSim.Services.Interfaces;
46using GridRegion = OpenSim.Services.Interfaces.GridRegion;
47
48namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
49{
50 public class RESTInterregionComms : ISharedRegionModule, IInterregionCommsOut
51 {
52 private bool initialized = false;
53 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
54
55 protected bool m_enabled = false;
56 protected Scene m_aScene;
57 // RESTInterregionComms does not care about local regions; it delegates that to the Local module
58 protected LocalInterregionComms m_localBackend;
59
60 protected CommunicationsManager m_commsManager;
61
62 protected RegionToRegionClient m_regionClient;
63
64 protected IHyperlinkService m_hyperlinkService;
65
66 protected bool m_safemode;
67 protected IPAddress m_thisIP;
68
69 #region IRegionModule
70
71 public virtual void Initialise(IConfigSource config)
72 {
73 IConfig startupConfig = config.Configs["Communications"];
74
75 if ((startupConfig == null) || ((startupConfig != null)
76 && (startupConfig.GetString("InterregionComms", "RESTComms") == "RESTComms")))
77 {
78 m_log.Info("[REST COMMS]: Enabling InterregionComms RESTComms module");
79 m_enabled = true;
80 if (config.Configs["Hypergrid"] != null)
81 m_safemode = config.Configs["Hypergrid"].GetBoolean("safemode", false);
82 }
83 }
84
85 public virtual void PostInitialise()
86 {
87 }
88
89 public virtual void Close()
90 {
91 }
92
93 public void AddRegion(Scene scene)
94 {
95 }
96
97 public void RemoveRegion(Scene scene)
98 {
99 if (m_enabled)
100 {
101 m_localBackend.RemoveScene(scene);
102 scene.UnregisterModuleInterface<IInterregionCommsOut>(this);
103 }
104 }
105
106 public void RegionLoaded(Scene scene)
107 {
108 if (m_enabled)
109 {
110 if (!initialized)
111 {
112 InitOnce(scene);
113 initialized = true;
114 AddHTTPHandlers();
115 }
116 InitEach(scene);
117 }
118 }
119
120 public Type ReplaceableInterface
121 {
122 get { return null; }
123 }
124
125 public virtual string Name
126 {
127 get { return "RESTInterregionCommsModule"; }
128 }
129
130 protected virtual void InitEach(Scene scene)
131 {
132 m_localBackend.Init(scene);
133 scene.RegisterModuleInterface<IInterregionCommsOut>(this);
134 }
135
136 protected virtual void InitOnce(Scene scene)
137 {
138 m_localBackend = new LocalInterregionComms();
139 m_commsManager = scene.CommsManager;
140 m_aScene = scene;
141 m_hyperlinkService = m_aScene.RequestModuleInterface<IHyperlinkService>();
142 m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService);
143 m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName);
144 }
145
146 protected virtual void AddHTTPHandlers()
147 {
148 MainServer.Instance.AddHTTPHandler("/agent/", AgentHandler);
149 MainServer.Instance.AddHTTPHandler("/object/", ObjectHandler);
150 }
151
152 #endregion /* IRegionModule */
153
154 #region IInterregionComms
155
156 /**
157 * Agent-related communications
158 */
159
160 public bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
161 {
162 // Try local first
163 if (m_localBackend.SendCreateChildAgent(regionHandle, aCircuit, teleportFlags, out reason))
164 return true;
165
166 // else do the remote thing
167 if (!m_localBackend.IsLocalRegion(regionHandle))
168 {
169 uint x = 0, y = 0;
170 Utils.LongToUInts(regionHandle, out x, out y);
171 GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
172 if (regInfo != null)
173 {
174 m_regionClient.SendUserInformation(regInfo, aCircuit);
175
176 return m_regionClient.DoCreateChildAgentCall(regInfo, aCircuit, "None", teleportFlags, out reason);
177 }
178 //else
179 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
180 }
181 return false;
182 }
183
184 public bool SendChildAgentUpdate(ulong regionHandle, AgentData cAgentData)
185 {
186 // Try local first
187 if (m_localBackend.SendChildAgentUpdate(regionHandle, cAgentData))
188 return true;
189
190 // else do the remote thing
191 if (!m_localBackend.IsLocalRegion(regionHandle))
192 {
193 uint x = 0, y = 0;
194 Utils.LongToUInts(regionHandle, out x, out y);
195 GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
196 if (regInfo != null)
197 {
198 return m_regionClient.DoChildAgentUpdateCall(regInfo, cAgentData);
199 }
200 //else
201 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
202 }
203 return false;
204
205 }
206
207 public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData)
208 {
209 // Try local first
210 if (m_localBackend.SendChildAgentUpdate(regionHandle, cAgentData))
211 return true;
212
213 // else do the remote thing
214 if (!m_localBackend.IsLocalRegion(regionHandle))
215 {
216 uint x = 0, y = 0;
217 Utils.LongToUInts(regionHandle, out x, out y);
218 GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
219 if (regInfo != null)
220 {
221 return m_regionClient.DoChildAgentUpdateCall(regInfo, cAgentData);
222 }
223 //else
224 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
225 }
226 return false;
227
228 }
229
230 public bool SendRetrieveRootAgent(ulong regionHandle, UUID id, out IAgentData agent)
231 {
232 // Try local first
233 if (m_localBackend.SendRetrieveRootAgent(regionHandle, id, out agent))
234 return true;
235
236 // else do the remote thing
237 if (!m_localBackend.IsLocalRegion(regionHandle))
238 {
239 uint x = 0, y = 0;
240 Utils.LongToUInts(regionHandle, out x, out y);
241 GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
242 if (regInfo != null)
243 {
244 return m_regionClient.DoRetrieveRootAgentCall(regInfo, id, out agent);
245 }
246 //else
247 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
248 }
249 return false;
250
251 }
252
253 public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri)
254 {
255 // Try local first
256 if (m_localBackend.SendReleaseAgent(regionHandle, id, uri))
257 return true;
258
259 // else do the remote thing
260 return m_regionClient.DoReleaseAgentCall(regionHandle, id, uri);
261 }
262
263
264 public bool SendCloseAgent(ulong regionHandle, UUID id)
265 {
266 // Try local first
267 if (m_localBackend.SendCloseAgent(regionHandle, id))
268 return true;
269
270 // else do the remote thing
271 if (!m_localBackend.IsLocalRegion(regionHandle))
272 {
273 uint x = 0, y = 0;
274 Utils.LongToUInts(regionHandle, out x, out y);
275 GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
276 if (regInfo != null)
277 {
278 return m_regionClient.DoCloseAgentCall(regInfo, id);
279 }
280 //else
281 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
282 }
283 return false;
284 }
285
286 /**
287 * Object-related communications
288 */
289
290 public bool SendCreateObject(ulong regionHandle, SceneObjectGroup sog, bool isLocalCall)
291 {
292 // Try local first
293 if (m_localBackend.SendCreateObject(regionHandle, sog, true))
294 {
295 //m_log.Debug("[REST COMMS]: LocalBackEnd SendCreateObject succeeded");
296 return true;
297 }
298
299 // else do the remote thing
300 if (!m_localBackend.IsLocalRegion(regionHandle))
301 {
302 uint x = 0, y = 0;
303 Utils.LongToUInts(regionHandle, out x, out y);
304 GridRegion regInfo = m_aScene.GridService.GetRegionByPosition(UUID.Zero, (int)x, (int)y);
305 if (regInfo != null)
306 {
307 return m_regionClient.DoCreateObjectCall(
308 regInfo, sog, SceneObjectSerializer.ToXml2Format(sog), m_aScene.m_allowScriptCrossings);
309 }
310 //else
311 // m_log.Warn("[REST COMMS]: Region not found " + regionHandle);
312 }
313 return false;
314 }
315
316 public bool SendCreateObject(ulong regionHandle, UUID userID, UUID itemID)
317 {
318 // Not Implemented
319 return false;
320 }
321
322 #endregion /* IInterregionComms */
323
324 #region Incoming calls from remote instances
325
326 /**
327 * Agent-related incoming calls
328 */
329
330 public Hashtable AgentHandler(Hashtable request)
331 {
332 //m_log.Debug("[CONNECTION DEBUGGING]: AgentHandler Called");
333
334 m_log.Debug("---------------------------");
335 m_log.Debug(" >> uri=" + request["uri"]);
336 m_log.Debug(" >> content-type=" + request["content-type"]);
337 m_log.Debug(" >> http-method=" + request["http-method"]);
338 m_log.Debug("---------------------------\n");
339
340 Hashtable responsedata = new Hashtable();
341 responsedata["content_type"] = "text/html";
342 responsedata["keepalive"] = false;
343
344
345 UUID agentID;
346 string action;
347 ulong regionHandle;
348 if (!GetParams((string)request["uri"], out agentID, out regionHandle, out action))
349 {
350 m_log.InfoFormat("[REST COMMS]: Invalid parameters for agent message {0}", request["uri"]);
351 responsedata["int_response_code"] = 404;
352 responsedata["str_response_string"] = "false";
353
354 return responsedata;
355 }
356
357 // Next, let's parse the verb
358 string method = (string)request["http-method"];
359 if (method.Equals("PUT"))
360 {
361 DoAgentPut(request, responsedata);
362 return responsedata;
363 }
364 else if (method.Equals("POST"))
365 {
366 DoAgentPost(request, responsedata, agentID);
367 return responsedata;
368 }
369 else if (method.Equals("GET"))
370 {
371 DoAgentGet(request, responsedata, agentID, regionHandle);
372 return responsedata;
373 }
374 else if (method.Equals("DELETE"))
375 {
376 DoAgentDelete(request, responsedata, agentID, action, regionHandle);
377 return responsedata;
378 }
379 else
380 {
381 m_log.InfoFormat("[REST COMMS]: method {0} not supported in agent message", method);
382 responsedata["int_response_code"] = 404;
383 responsedata["str_response_string"] = "false";
384
385 return responsedata;
386 }
387
388 }
389
390 protected virtual void DoAgentPost(Hashtable request, Hashtable responsedata, UUID id)
391 {
392 if (m_safemode)
393 {
394 // Authentication
395 string authority = string.Empty;
396 string authToken = string.Empty;
397 if (!GetAuthentication(request, out authority, out authToken))
398 {
399 m_log.InfoFormat("[REST COMMS]: Authentication failed for agent message {0}", request["uri"]);
400 responsedata["int_response_code"] = 403;
401 responsedata["str_response_string"] = "Forbidden";
402 return ;
403 }
404 if (!VerifyKey(id, authority, authToken))
405 {
406 m_log.InfoFormat("[REST COMMS]: Authentication failed for agent message {0}", request["uri"]);
407 responsedata["int_response_code"] = 403;
408 responsedata["str_response_string"] = "Forbidden";
409 return ;
410 }
411 m_log.DebugFormat("[REST COMMS]: Authentication succeeded for {0}", id);
412 }
413
414 OSDMap args = RegionClient.GetOSDMap((string)request["body"]);
415 if (args == null)
416 {
417 responsedata["int_response_code"] = 400;
418 responsedata["str_response_string"] = "false";
419 return;
420 }
421
422 // retrieve the regionhandle
423 ulong regionhandle = 0;
424 if (args["destination_handle"] != null)
425 UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle);
426
427 AgentCircuitData aCircuit = new AgentCircuitData();
428 try
429 {
430 aCircuit.UnpackAgentCircuitData(args);
431 }
432 catch (Exception ex)
433 {
434 m_log.InfoFormat("[REST COMMS]: exception on unpacking ChildCreate message {0}", ex.Message);
435 return;
436 }
437
438 OSDMap resp = new OSDMap(2);
439 string reason = String.Empty;
440 uint teleportFlags = 0;
441 if (args.ContainsKey("teleport_flags"))
442 {
443 teleportFlags = args["teleport_flags"].AsUInteger();
444 }
445
446 // This is the meaning of POST agent
447 m_regionClient.AdjustUserInformation(aCircuit);
448 bool result = m_localBackend.SendCreateChildAgent(regionhandle, aCircuit, teleportFlags, out reason);
449
450 resp["reason"] = OSD.FromString(reason);
451 resp["success"] = OSD.FromBoolean(result);
452
453 // TODO: add reason if not String.Empty?
454 responsedata["int_response_code"] = 200;
455 responsedata["str_response_string"] = OSDParser.SerializeJsonString(resp);
456 }
457
458 protected virtual void DoAgentPut(Hashtable request, Hashtable responsedata)
459 {
460 OSDMap args = RegionClient.GetOSDMap((string)request["body"]);
461 if (args == null)
462 {
463 responsedata["int_response_code"] = 400;
464 responsedata["str_response_string"] = "false";
465 return;
466 }
467
468 // retrieve the regionhandle
469 ulong regionhandle = 0;
470 if (args["destination_handle"] != null)
471 UInt64.TryParse(args["destination_handle"].AsString(), out regionhandle);
472
473 string messageType;
474 if (args["message_type"] != null)
475 messageType = args["message_type"].AsString();
476 else
477 {
478 m_log.Warn("[REST COMMS]: Agent Put Message Type not found. ");
479 messageType = "AgentData";
480 }
481
482 bool result = true;
483 if ("AgentData".Equals(messageType))
484 {
485 AgentData agent = new AgentData();
486 try
487 {
488 agent.Unpack(args);
489 }
490 catch (Exception ex)
491 {
492 m_log.InfoFormat("[REST COMMS]: exception on unpacking ChildAgentUpdate message {0}", ex.Message);
493 return;
494 }
495
496 //agent.Dump();
497 // This is one of the meanings of PUT agent
498 result = m_localBackend.SendChildAgentUpdate(regionhandle, agent);
499
500 }
501 else if ("AgentPosition".Equals(messageType))
502 {
503 AgentPosition agent = new AgentPosition();
504 try
505 {
506 agent.Unpack(args);
507 }
508 catch (Exception ex)
509 {
510 m_log.InfoFormat("[REST COMMS]: exception on unpacking ChildAgentUpdate message {0}", ex.Message);
511 return;
512 }
513 //agent.Dump();
514 // This is one of the meanings of PUT agent
515 result = m_localBackend.SendChildAgentUpdate(regionhandle, agent);
516
517 }
518
519 responsedata["int_response_code"] = 200;
520 responsedata["str_response_string"] = result.ToString();
521 }
522
523 protected virtual void DoAgentGet(Hashtable request, Hashtable responsedata, UUID id, ulong regionHandle)
524 {
525 IAgentData agent = null;
526 bool result = m_localBackend.SendRetrieveRootAgent(regionHandle, id, out agent);
527 OSDMap map = null;
528 if (result)
529 {
530 if (agent != null) // just to make sure
531 {
532 map = agent.Pack();
533 string strBuffer = "";
534 try
535 {
536 strBuffer = OSDParser.SerializeJsonString(map);
537 }
538 catch (Exception e)
539 {
540 m_log.WarnFormat("[REST COMMS]: Exception thrown on serialization of CreateObject: {0}", e.Message);
541 // ignore. buffer will be empty, caller should check.
542 }
543
544 responsedata["content_type"] = "application/json";
545 responsedata["int_response_code"] = 200;
546 responsedata["str_response_string"] = strBuffer;
547 }
548 else
549 {
550 responsedata["int_response_code"] = 500;
551 responsedata["str_response_string"] = "Internal error";
552 }
553 }
554 else
555 {
556 responsedata["int_response_code"] = 404;
557 responsedata["str_response_string"] = "Not Found";
558 }
559 }
560
561 protected virtual void DoAgentDelete(Hashtable request, Hashtable responsedata, UUID id, string action, ulong regionHandle)
562 {
563 //m_log.Debug(" >>> DoDelete action:" + action + "; regionHandle:" + regionHandle);
564
565 if (action.Equals("release"))
566 m_localBackend.SendReleaseAgent(regionHandle, id, "");
567 else
568 m_localBackend.SendCloseAgent(regionHandle, id);
569
570 responsedata["int_response_code"] = 200;
571 responsedata["str_response_string"] = "OpenSim agent " + id.ToString();
572
573 m_log.Debug("[REST COMMS]: Agent Deleted.");
574 }
575
576 /**
577 * Object-related incoming calls
578 */
579
580 public Hashtable ObjectHandler(Hashtable request)
581 {
582 m_log.Debug("[CONNECTION DEBUGGING]: ObjectHandler Called");
583
584 m_log.Debug("---------------------------");
585 m_log.Debug(" >> uri=" + request["uri"]);
586 m_log.Debug(" >> content-type=" + request["content-type"]);
587 m_log.Debug(" >> http-method=" + request["http-method"]);
588 m_log.Debug("---------------------------\n");
589
590 Hashtable responsedata = new Hashtable();
591 responsedata["content_type"] = "text/html";
592
593 UUID objectID;
594 string action;
595 ulong regionHandle;
596 if (!GetParams((string)request["uri"], out objectID, out regionHandle, out action))
597 {
598 m_log.InfoFormat("[REST COMMS]: Invalid parameters for object message {0}", request["uri"]);
599 responsedata["int_response_code"] = 404;
600 responsedata["str_response_string"] = "false";
601
602 return responsedata;
603 }
604
605 // Next, let's parse the verb
606 string method = (string)request["http-method"];
607 if (method.Equals("POST"))
608 {
609 DoObjectPost(request, responsedata, regionHandle);
610 return responsedata;
611 }
612 else if (method.Equals("PUT"))
613 {
614 DoObjectPut(request, responsedata, regionHandle);
615 return responsedata;
616 }
617 //else if (method.Equals("DELETE"))
618 //{
619 // DoObjectDelete(request, responsedata, agentID, action, regionHandle);
620 // return responsedata;
621 //}
622 else
623 {
624 m_log.InfoFormat("[REST COMMS]: method {0} not supported in object message", method);
625 responsedata["int_response_code"] = 404;
626 responsedata["str_response_string"] = "false";
627
628 return responsedata;
629 }
630
631 }
632
633 protected virtual void DoObjectPost(Hashtable request, Hashtable responsedata, ulong regionhandle)
634 {
635 OSDMap args = RegionClient.GetOSDMap((string)request["body"]);
636 if (args == null)
637 {
638 responsedata["int_response_code"] = 400;
639 responsedata["str_response_string"] = "false";
640 return;
641 }
642
643 string sogXmlStr = "", extraStr = "", stateXmlStr = "";
644 if (args["sog"] != null)
645 sogXmlStr = args["sog"].AsString();
646 if (args["extra"] != null)
647 extraStr = args["extra"].AsString();
648
649 IScene s = m_localBackend.GetScene(regionhandle);
650 SceneObjectGroup sog = null;
651 try
652 {
653 sog = SceneObjectSerializer.FromXml2Format(sogXmlStr);
654 sog.ExtraFromXmlString(extraStr);
655 }
656 catch (Exception ex)
657 {
658 m_log.InfoFormat("[REST COMMS]: exception on deserializing scene object {0}", ex.Message);
659 responsedata["int_response_code"] = 400;
660 responsedata["str_response_string"] = "false";
661 return;
662 }
663
664 if ((args["state"] != null) && m_aScene.m_allowScriptCrossings)
665 {
666 stateXmlStr = args["state"].AsString();
667 if (stateXmlStr != "")
668 {
669 try
670 {
671 sog.SetState(stateXmlStr, s);
672 }
673 catch (Exception ex)
674 {
675 m_log.InfoFormat("[REST COMMS]: exception on setting state for scene object {0}", ex.Message);
676
677 }
678 }
679 }
680 // This is the meaning of POST object
681 bool result = m_localBackend.SendCreateObject(regionhandle, sog, false);
682
683 responsedata["int_response_code"] = 200;
684 responsedata["str_response_string"] = result.ToString();
685 }
686
687 protected virtual void DoObjectPut(Hashtable request, Hashtable responsedata, ulong regionhandle)
688 {
689 OSDMap args = RegionClient.GetOSDMap((string)request["body"]);
690 if (args == null)
691 {
692 responsedata["int_response_code"] = 400;
693 responsedata["str_response_string"] = "false";
694 return;
695 }
696
697 UUID userID = UUID.Zero, itemID = UUID.Zero;
698 if (args["userid"] != null)
699 userID = args["userid"].AsUUID();
700 if (args["itemid"] != null)
701 itemID = args["itemid"].AsUUID();
702
703 // This is the meaning of PUT object
704 bool result = m_localBackend.SendCreateObject(regionhandle, userID, itemID);
705
706 responsedata["int_response_code"] = 200;
707 responsedata["str_response_string"] = result.ToString();
708 }
709
710 #endregion
711
712 #region Misc
713
714
715 /// <summary>
716 /// Extract the param from an uri.
717 /// </summary>
718 /// <param name="uri">Something like this: /agent/uuid/ or /agent/uuid/handle/release</param>
719 /// <param name="uri">uuid on uuid field</param>
720 /// <param name="action">optional action</param>
721 public static bool GetParams(string uri, out UUID uuid, out ulong regionHandle, out string action)
722 {
723 uuid = UUID.Zero;
724 action = "";
725 regionHandle = 0;
726
727 uri = uri.Trim(new char[] { '/' });
728 string[] parts = uri.Split('/');
729 if (parts.Length <= 1)
730 {
731 return false;
732 }
733 else
734 {
735 if (!UUID.TryParse(parts[1], out uuid))
736 return false;
737
738 if (parts.Length >= 3)
739 UInt64.TryParse(parts[2], out regionHandle);
740 if (parts.Length >= 4)
741 action = parts[3];
742
743 return true;
744 }
745 }
746
747 public static bool GetAuthentication(Hashtable request, out string authority, out string authKey)
748 {
749 authority = string.Empty;
750 authKey = string.Empty;
751
752 Uri authUri;
753 Hashtable headers = (Hashtable)request["headers"];
754
755 // Authorization keys look like this:
756 // http://orgrid.org:8002/<uuid>
757 if (headers.ContainsKey("authorization") && (string)headers["authorization"] != "None")
758 {
759 if (Uri.TryCreate((string)headers["authorization"], UriKind.Absolute, out authUri))
760 {
761 authority = authUri.Authority;
762 authKey = authUri.PathAndQuery.Trim('/');
763 m_log.DebugFormat("[REST COMMS]: Got authority {0} and key {1}", authority, authKey);
764 return true;
765 }
766 else
767 m_log.Debug("[REST COMMS]: Wrong format for Authorization header: " + (string)headers["authorization"]);
768 }
769 else
770 m_log.Debug("[REST COMMS]: Authorization header not found");
771
772 return false;
773 }
774
775 bool VerifyKey(UUID userID, string authority, string key)
776 {
777 string[] parts = authority.Split(':');
778 IPAddress ipaddr = IPAddress.None;
779 uint port = 0;
780 if (parts.Length <= 2)
781 ipaddr = Util.GetHostFromDNS(parts[0]);
782 if (parts.Length == 2)
783 UInt32.TryParse(parts[1], out port);
784
785 // local authority (standalone), local call
786 if (m_thisIP.Equals(ipaddr) && (m_aScene.RegionInfo.HttpPort == port))
787 return ((IAuthentication)m_aScene.CommsManager.UserAdminService).VerifyKey(userID, key);
788 // remote call
789 else
790 return AuthClient.VerifyKey("http://" + authority, userID, key);
791 }
792
793
794 #endregion Misc
795
796 protected class RegionToRegionClient : RegionClient
797 {
798 Scene m_aScene = null;
799 IHyperlinkService m_hyperlinkService;
800
801 public RegionToRegionClient(Scene s, IHyperlinkService hyperService)
802 {
803 m_aScene = s;
804 m_hyperlinkService = hyperService;
805 }
806
807 public override ulong GetRegionHandle(ulong handle)
808 {
809 if (m_aScene.SceneGridService is HGSceneCommunicationService)
810 {
811 if (m_hyperlinkService != null)
812 return m_hyperlinkService.FindRegionHandle(handle);
813 }
814
815 return handle;
816 }
817
818 public override bool IsHyperlink(ulong handle)
819 {
820 if (m_aScene.SceneGridService is HGSceneCommunicationService)
821 {
822 if ((m_hyperlinkService != null) && (m_hyperlinkService.GetHyperlinkRegion(handle) != null))
823 return true;
824 }
825 return false;
826 }
827
828 public override void SendUserInformation(GridRegion regInfo, AgentCircuitData aCircuit)
829 {
830 if (m_hyperlinkService != null)
831 m_hyperlinkService.SendUserInformation(regInfo, aCircuit);
832
833 }
834
835 public override void AdjustUserInformation(AgentCircuitData aCircuit)
836 {
837 if (m_hyperlinkService != null)
838 m_hyperlinkService.AdjustUserInformation(aCircuit);
839 }
840 }
841
842 }
843}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
index 811569f..1e51187 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/BaseInventoryConnector.cs
@@ -40,12 +40,17 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
40{ 40{
41 public abstract class BaseInventoryConnector : IInventoryService 41 public abstract class BaseInventoryConnector : IInventoryService
42 { 42 {
43 protected InventoryCache m_cache; 43 protected static InventoryCache m_cache;
44 private static bool m_Initialized;
44 45
45 protected virtual void Init(IConfigSource source) 46 protected virtual void Init(IConfigSource source)
46 { 47 {
47 m_cache = new InventoryCache(); 48 if (!m_Initialized)
48 m_cache.Init(source, this); 49 {
50 m_cache = new InventoryCache();
51 m_cache.Init(source, this);
52 m_Initialized = true;
53 }
49 } 54 }
50 55
51 /// <summary> 56 /// <summary>
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
index 1fdf1ef..c6312e0 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/HGInventoryBroker.cs
@@ -31,7 +31,7 @@ using System;
31using System.Collections.Generic; 31using System.Collections.Generic;
32using System.Reflection; 32using System.Reflection;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Communications.Cache; 34
35using OpenSim.Server.Base; 35using OpenSim.Server.Base;
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
@@ -41,31 +41,20 @@ using OpenMetaverse;
41 41
42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory 42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
43{ 43{
44 public class HGInventoryBroker : BaseInventoryConnector, ISharedRegionModule, IInventoryService 44 public class HGInventoryBroker : BaseInventoryConnector, INonSharedRegionModule, IInventoryService
45 { 45 {
46 private static readonly ILog m_log = 46 private static readonly ILog m_log =
47 LogManager.GetLogger( 47 LogManager.GetLogger(
48 MethodBase.GetCurrentMethod().DeclaringType); 48 MethodBase.GetCurrentMethod().DeclaringType);
49 49
50 private bool m_Enabled = false; 50 private static bool m_Initialized = false;
51 private bool m_Initialized = false; 51 private static bool m_Enabled = false;
52 private Scene m_Scene;
53 private UserProfileCacheService m_UserProfileService; // This should change to IUserProfileService
54
55 private IInventoryService m_GridService;
56 private ISessionAuthInventoryService m_HGService;
57 52
58 private string m_LocalGridInventoryURI = string.Empty; 53 private static IInventoryService m_GridService;
54 private static ISessionAuthInventoryService m_HGService;
59 55
60 private string LocalGridInventory 56 private Scene m_Scene;
61 { 57 private IUserAccountService m_UserAccountService;
62 get
63 {
64 if (m_LocalGridInventoryURI == null || m_LocalGridInventoryURI == "")
65 m_LocalGridInventoryURI = m_Scene.CommsManager.NetworkServersInfo.InventoryURL;
66 return m_LocalGridInventoryURI;
67 }
68 }
69 58
70 public Type ReplaceableInterface 59 public Type ReplaceableInterface
71 { 60 {
@@ -79,65 +68,67 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
79 68
80 public void Initialise(IConfigSource source) 69 public void Initialise(IConfigSource source)
81 { 70 {
82 IConfig moduleConfig = source.Configs["Modules"]; 71 if (!m_Initialized)
83 if (moduleConfig != null)
84 { 72 {
85 string name = moduleConfig.GetString("InventoryServices", ""); 73 IConfig moduleConfig = source.Configs["Modules"];
86 if (name == Name) 74 if (moduleConfig != null)
87 { 75 {
88 IConfig inventoryConfig = source.Configs["InventoryService"]; 76 string name = moduleConfig.GetString("InventoryServices", "");
89 if (inventoryConfig == null) 77 if (name == Name)
90 {
91 m_log.Error("[HG INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
92 return;
93 }
94
95 string localDll = inventoryConfig.GetString("LocalGridInventoryService",
96 String.Empty);
97 string HGDll = inventoryConfig.GetString("HypergridInventoryService",
98 String.Empty);
99
100 if (localDll == String.Empty)
101 {
102 m_log.Error("[HG INVENTORY CONNECTOR]: No LocalGridInventoryService named in section InventoryService");
103 //return;
104 throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
105 }
106
107 if (HGDll == String.Empty)
108 { 78 {
109 m_log.Error("[HG INVENTORY CONNECTOR]: No HypergridInventoryService named in section InventoryService"); 79 IConfig inventoryConfig = source.Configs["InventoryService"];
110 //return; 80 if (inventoryConfig == null)
111 throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's"); 81 {
82 m_log.Error("[HG INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
83 return;
84 }
85
86 string localDll = inventoryConfig.GetString("LocalGridInventoryService",
87 String.Empty);
88 string HGDll = inventoryConfig.GetString("HypergridInventoryService",
89 String.Empty);
90
91 if (localDll == String.Empty)
92 {
93 m_log.Error("[HG INVENTORY CONNECTOR]: No LocalGridInventoryService named in section InventoryService");
94 //return;
95 throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
96 }
97
98 if (HGDll == String.Empty)
99 {
100 m_log.Error("[HG INVENTORY CONNECTOR]: No HypergridInventoryService named in section InventoryService");
101 //return;
102 throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
103 }
104
105 Object[] args = new Object[] { source };
106 m_GridService =
107 ServerUtils.LoadPlugin<IInventoryService>(localDll,
108 args);
109
110 m_HGService =
111 ServerUtils.LoadPlugin<ISessionAuthInventoryService>(HGDll,
112 args);
113
114 if (m_GridService == null)
115 {
116 m_log.Error("[HG INVENTORY CONNECTOR]: Can't load local inventory service");
117 return;
118 }
119 if (m_HGService == null)
120 {
121 m_log.Error("[HG INVENTORY CONNECTOR]: Can't load hypergrid inventory service");
122 return;
123 }
124
125 Init(source);
126
127 m_Enabled = true;
128 m_log.Info("[HG INVENTORY CONNECTOR]: HG inventory broker enabled");
112 } 129 }
113
114 Object[] args = new Object[] { source };
115 m_GridService =
116 ServerUtils.LoadPlugin<IInventoryService>(localDll,
117 args);
118
119 m_HGService =
120 ServerUtils.LoadPlugin<ISessionAuthInventoryService>(HGDll,
121 args);
122
123 if (m_GridService == null)
124 {
125 m_log.Error("[HG INVENTORY CONNECTOR]: Can't load local inventory service");
126 return;
127 }
128 if (m_HGService == null)
129 {
130 m_log.Error("[HG INVENTORY CONNECTOR]: Can't load hypergrid inventory service");
131 return;
132 }
133
134 m_LocalGridInventoryURI = inventoryConfig.GetString("InventoryServerURI", string.Empty);
135
136 Init(source);
137
138 m_Enabled = true;
139 m_log.Info("[HG INVENTORY CONNECTOR]: HG inventory broker enabled");
140 } 130 }
131 m_Initialized = true;
141 } 132 }
142 } 133 }
143 134
@@ -154,17 +145,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
154 if (!m_Enabled) 145 if (!m_Enabled)
155 return; 146 return;
156 147
157 if (!m_Initialized) 148 m_Scene = scene;
158 { 149 m_UserAccountService = m_Scene.UserAccountService;
159 m_Scene = scene;
160 // HACK for now. Ugh!
161 m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService;
162 // ugh!
163 m_UserProfileService.SetInventoryService(this);
164 scene.CommsManager.UserService.SetInventoryService(this);
165
166 m_Initialized = true;
167 }
168 150
169 scene.RegisterModuleInterface<IInventoryService>(this); 151 scene.RegisterModuleInterface<IInventoryService>(this);
170 m_cache.AddRegion(scene); 152 m_cache.AddRegion(scene);
@@ -201,22 +183,11 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
201 183
202 public override InventoryCollection GetUserInventory(UUID userID) 184 public override InventoryCollection GetUserInventory(UUID userID)
203 { 185 {
204 if (IsLocalGridUser(userID)) 186 return null;
205 return m_GridService.GetUserInventory(userID);
206 else
207 return null;
208 } 187 }
209 188
210 public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback) 189 public override void GetUserInventory(UUID userID, InventoryReceiptCallback callback)
211 { 190 {
212 if (IsLocalGridUser(userID))
213 m_GridService.GetUserInventory(userID, callback);
214 else
215 {
216 UUID sessionID = GetSessionID(userID);
217 string uri = GetUserInventoryURI(userID) + "/" + userID.ToString();
218 m_HGService.GetUserInventory(uri, sessionID, callback);
219 }
220 } 191 }
221 192
222 // Inherited. See base 193 // Inherited. See base
@@ -236,19 +207,21 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
236 207
237 public override InventoryCollection GetFolderContent(UUID userID, UUID folderID) 208 public override InventoryCollection GetFolderContent(UUID userID, UUID folderID)
238 { 209 {
239 if (IsLocalGridUser(userID)) 210 string uri = string.Empty;
211 if (!IsForeignUser(userID, out uri))
240 return m_GridService.GetFolderContent(userID, folderID); 212 return m_GridService.GetFolderContent(userID, folderID);
241 else 213 else
242 { 214 {
243 UUID sessionID = GetSessionID(userID); 215 UUID sessionID = GetSessionID(userID);
244 string uri = GetUserInventoryURI(userID) + "/" + userID.ToString(); 216 uri = uri + "/" + userID.ToString();
245 return m_HGService.GetFolderContent(uri, folderID, sessionID); 217 return m_HGService.GetFolderContent(uri, folderID, sessionID);
246 } 218 }
247 } 219 }
248 220
249 public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID) 221 public override Dictionary<AssetType, InventoryFolderBase> GetSystemFolders(UUID userID)
250 { 222 {
251 if (IsLocalGridUser(userID)) 223 string uri = string.Empty;
224 if (!IsForeignUser(userID, out uri))
252 { 225 {
253 // This is not pretty, but it will have to do for now 226 // This is not pretty, but it will have to do for now
254 if (m_GridService is BaseInventoryConnector) 227 if (m_GridService is BaseInventoryConnector)
@@ -265,7 +238,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
265 else 238 else
266 { 239 {
267 UUID sessionID = GetSessionID(userID); 240 UUID sessionID = GetSessionID(userID);
268 string uri = GetUserInventoryURI(userID) + "/" + userID.ToString(); 241 uri = uri + "/" + userID.ToString();
269 return m_HGService.GetSystemFolders(uri, sessionID); 242 return m_HGService.GetSystemFolders(uri, sessionID);
270 } 243 }
271 } 244 }
@@ -301,12 +274,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
301 274
302 public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID) 275 public override List<InventoryItemBase> GetFolderItems(UUID userID, UUID folderID)
303 { 276 {
304 if (IsLocalGridUser(userID)) 277 string uri = string.Empty;
278 if (!IsForeignUser(userID, out uri))
305 return m_GridService.GetFolderItems(userID, folderID); 279 return m_GridService.GetFolderItems(userID, folderID);
306 else 280 else
307 { 281 {
308 UUID sessionID = GetSessionID(userID); 282 UUID sessionID = GetSessionID(userID);
309 string uri = GetUserInventoryURI(userID) + "/" + userID; 283 uri = uri + "/" + userID.ToString();
310 return m_HGService.GetFolderItems(uri, folderID, sessionID); 284 return m_HGService.GetFolderItems(uri, folderID, sessionID);
311 } 285 }
312 } 286 }
@@ -316,12 +290,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
316 if (folder == null) 290 if (folder == null)
317 return false; 291 return false;
318 292
319 if (IsLocalGridUser(folder.Owner)) 293 string uri = string.Empty;
294 if (!IsForeignUser(folder.Owner, out uri))
320 return m_GridService.AddFolder(folder); 295 return m_GridService.AddFolder(folder);
321 else 296 else
322 { 297 {
323 UUID sessionID = GetSessionID(folder.Owner); 298 UUID sessionID = GetSessionID(folder.Owner);
324 string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); 299 uri = uri + "/" + folder.Owner.ToString();
325 return m_HGService.AddFolder(uri, folder, sessionID); 300 return m_HGService.AddFolder(uri, folder, sessionID);
326 } 301 }
327 } 302 }
@@ -331,12 +306,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
331 if (folder == null) 306 if (folder == null)
332 return false; 307 return false;
333 308
334 if (IsLocalGridUser(folder.Owner)) 309 string uri = string.Empty;
310 if (!IsForeignUser(folder.Owner, out uri))
335 return m_GridService.UpdateFolder(folder); 311 return m_GridService.UpdateFolder(folder);
336 else 312 else
337 { 313 {
338 UUID sessionID = GetSessionID(folder.Owner); 314 UUID sessionID = GetSessionID(folder.Owner);
339 string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); 315 uri = uri + "/" + folder.Owner.ToString();
340 return m_HGService.UpdateFolder(uri, folder, sessionID); 316 return m_HGService.UpdateFolder(uri, folder, sessionID);
341 } 317 }
342 } 318 }
@@ -348,12 +324,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
348 if (folderIDs.Count == 0) 324 if (folderIDs.Count == 0)
349 return false; 325 return false;
350 326
351 if (IsLocalGridUser(ownerID)) 327 string uri = string.Empty;
328 if (!IsForeignUser(ownerID, out uri))
352 return m_GridService.DeleteFolders(ownerID, folderIDs); 329 return m_GridService.DeleteFolders(ownerID, folderIDs);
353 else 330 else
354 { 331 {
355 UUID sessionID = GetSessionID(ownerID); 332 UUID sessionID = GetSessionID(ownerID);
356 string uri = GetUserInventoryURI(ownerID) + "/" + ownerID.ToString(); 333 uri = uri + "/" + ownerID.ToString();
357 return m_HGService.DeleteFolders(uri, folderIDs, sessionID); 334 return m_HGService.DeleteFolders(uri, folderIDs, sessionID);
358 } 335 }
359 } 336 }
@@ -363,12 +340,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
363 if (folder == null) 340 if (folder == null)
364 return false; 341 return false;
365 342
366 if (IsLocalGridUser(folder.Owner)) 343 string uri = string.Empty;
344 if (!IsForeignUser(folder.Owner, out uri))
367 return m_GridService.MoveFolder(folder); 345 return m_GridService.MoveFolder(folder);
368 else 346 else
369 { 347 {
370 UUID sessionID = GetSessionID(folder.Owner); 348 UUID sessionID = GetSessionID(folder.Owner);
371 string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); 349 uri = uri + "/" + folder.Owner.ToString();
372 return m_HGService.MoveFolder(uri, folder, sessionID); 350 return m_HGService.MoveFolder(uri, folder, sessionID);
373 } 351 }
374 } 352 }
@@ -378,12 +356,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
378 if (folder == null) 356 if (folder == null)
379 return false; 357 return false;
380 358
381 if (IsLocalGridUser(folder.Owner)) 359 string uri = string.Empty;
360 if (!IsForeignUser(folder.Owner, out uri))
382 return m_GridService.PurgeFolder(folder); 361 return m_GridService.PurgeFolder(folder);
383 else 362 else
384 { 363 {
385 UUID sessionID = GetSessionID(folder.Owner); 364 UUID sessionID = GetSessionID(folder.Owner);
386 string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); 365 uri = uri + "/" + folder.Owner.ToString();
387 return m_HGService.PurgeFolder(uri, folder, sessionID); 366 return m_HGService.PurgeFolder(uri, folder, sessionID);
388 } 367 }
389 } 368 }
@@ -396,14 +375,15 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
396 if (item == null) 375 if (item == null)
397 return false; 376 return false;
398 377
399 if (IsLocalGridUser(item.Owner)) 378 string uri = string.Empty;
379 if (!IsForeignUser(item.Owner, out uri))
400 { 380 {
401 return m_GridService.AddItem(item); 381 return m_GridService.AddItem(item);
402 } 382 }
403 else 383 else
404 { 384 {
405 UUID sessionID = GetSessionID(item.Owner); 385 UUID sessionID = GetSessionID(item.Owner);
406 string uri = GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); 386 uri = uri + "/" + item.Owner.ToString();
407 return m_HGService.AddItem(uri, item, sessionID); 387 return m_HGService.AddItem(uri, item, sessionID);
408 } 388 }
409 } 389 }
@@ -413,12 +393,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
413 if (item == null) 393 if (item == null)
414 return false; 394 return false;
415 395
416 if (IsLocalGridUser(item.Owner)) 396 string uri = string.Empty;
397 if (!IsForeignUser(item.Owner, out uri))
417 return m_GridService.UpdateItem(item); 398 return m_GridService.UpdateItem(item);
418 else 399 else
419 { 400 {
420 UUID sessionID = GetSessionID(item.Owner); 401 UUID sessionID = GetSessionID(item.Owner);
421 string uri = GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); 402 uri = uri + "/" + item.Owner.ToString();
422 return m_HGService.UpdateItem(uri, item, sessionID); 403 return m_HGService.UpdateItem(uri, item, sessionID);
423 } 404 }
424 } 405 }
@@ -430,12 +411,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
430 if (items.Count == 0) 411 if (items.Count == 0)
431 return true; 412 return true;
432 413
433 if (IsLocalGridUser(ownerID)) 414 string uri = string.Empty;
415 if (!IsForeignUser(ownerID, out uri))
434 return m_GridService.MoveItems(ownerID, items); 416 return m_GridService.MoveItems(ownerID, items);
435 else 417 else
436 { 418 {
437 UUID sessionID = GetSessionID(ownerID); 419 UUID sessionID = GetSessionID(ownerID);
438 string uri = GetUserInventoryURI(ownerID) + "/" + ownerID.ToString(); 420 uri = uri + "/" + ownerID.ToString();
439 return m_HGService.MoveItems(uri, items, sessionID); 421 return m_HGService.MoveItems(uri, items, sessionID);
440 } 422 }
441 } 423 }
@@ -449,12 +431,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
449 if (itemIDs.Count == 0) 431 if (itemIDs.Count == 0)
450 return true; 432 return true;
451 433
452 if (IsLocalGridUser(ownerID)) 434 string uri = string.Empty;
435 if (!IsForeignUser(ownerID, out uri))
453 return m_GridService.DeleteItems(ownerID, itemIDs); 436 return m_GridService.DeleteItems(ownerID, itemIDs);
454 else 437 else
455 { 438 {
456 UUID sessionID = GetSessionID(ownerID); 439 UUID sessionID = GetSessionID(ownerID);
457 string uri = GetUserInventoryURI(ownerID) + "/" + ownerID.ToString(); 440 uri = uri + "/" + ownerID.ToString();
458 return m_HGService.DeleteItems(uri, itemIDs, sessionID); 441 return m_HGService.DeleteItems(uri, itemIDs, sessionID);
459 } 442 }
460 } 443 }
@@ -464,12 +447,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
464 if (item == null) 447 if (item == null)
465 return null; 448 return null;
466 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetItem {0} for user {1}", item.ID, item.Owner); 449 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: GetItem {0} for user {1}", item.ID, item.Owner);
467 if (IsLocalGridUser(item.Owner)) 450 string uri = string.Empty;
451 if (!IsForeignUser(item.Owner, out uri))
468 return m_GridService.GetItem(item); 452 return m_GridService.GetItem(item);
469 else 453 else
470 { 454 {
471 UUID sessionID = GetSessionID(item.Owner); 455 UUID sessionID = GetSessionID(item.Owner);
472 string uri = GetUserInventoryURI(item.Owner) + "/" + item.Owner.ToString(); 456 uri = uri + "/" + item.Owner.ToString();
473 return m_HGService.QueryItem(uri, item, sessionID); 457 return m_HGService.QueryItem(uri, item, sessionID);
474 } 458 }
475 } 459 }
@@ -479,12 +463,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
479 if (folder == null) 463 if (folder == null)
480 return null; 464 return null;
481 465
482 if (IsLocalGridUser(folder.Owner)) 466 string uri = string.Empty;
467 if (!IsForeignUser(folder.Owner, out uri))
483 return m_GridService.GetFolder(folder); 468 return m_GridService.GetFolder(folder);
484 else 469 else
485 { 470 {
486 UUID sessionID = GetSessionID(folder.Owner); 471 UUID sessionID = GetSessionID(folder.Owner);
487 string uri = GetUserInventoryURI(folder.Owner) + "/" + folder.Owner.ToString(); 472 uri = uri + "/" + folder.Owner.ToString();
488 return m_HGService.QueryFolder(uri, folder, sessionID); 473 return m_HGService.QueryFolder(uri, folder, sessionID);
489 } 474 }
490 } 475 }
@@ -501,12 +486,13 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
501 486
502 public override int GetAssetPermissions(UUID userID, UUID assetID) 487 public override int GetAssetPermissions(UUID userID, UUID assetID)
503 { 488 {
504 if (IsLocalGridUser(userID)) 489 string uri = string.Empty;
490 if (!IsForeignUser(userID, out uri))
505 return m_GridService.GetAssetPermissions(userID, assetID); 491 return m_GridService.GetAssetPermissions(userID, assetID);
506 else 492 else
507 { 493 {
508 UUID sessionID = GetSessionID(userID); 494 UUID sessionID = GetSessionID(userID);
509 string uri = GetUserInventoryURI(userID) + "/" + userID.ToString(); 495 uri = uri + "/" + userID.ToString();
510 return m_HGService.GetAssetPermissions(uri, assetID, sessionID); 496 return m_HGService.GetAssetPermissions(uri, assetID, sessionID);
511 } 497 }
512 } 498 }
@@ -515,61 +501,40 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
515 501
516 private UUID GetSessionID(UUID userID) 502 private UUID GetSessionID(UUID userID)
517 { 503 {
518 CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); 504 ScenePresence sp = null;
519 if (uinfo != null) 505 if (m_Scene.TryGetAvatar(userID, out sp))
520 return uinfo.SessionID; 506 {
507 return sp.ControllingClient.SessionId;
508 }
521 509
522 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: user profile for {0} not found", userID); 510 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: scene presence for {0} not found", userID);
523 return UUID.Zero; 511 return UUID.Zero;
524 } 512 }
525 513
526 private bool IsLocalGridUser(UUID userID) 514 private bool IsForeignUser(UUID userID, out string inventoryURL)
527 { 515 {
528 if (m_UserProfileService == null) 516 inventoryURL = string.Empty;
529 { 517 UserAccount account = null;
530 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, no profile service. Returning false."); 518 if (m_Scene.UserAccountService != null)
531 return false; 519 account = m_Scene.UserAccountService.GetUserAccount(m_Scene.RegionInfo.ScopeID, userID);
532 }
533 520
534 CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID); 521 if (account == null) // foreign user
535 if (uinfo == null)
536 { 522 {
537 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: IsLocalGridUser, no profile for user {0}. Returning true.", userID); 523 ScenePresence sp = null;
538 return true; 524 m_Scene.TryGetAvatar(userID, out sp);
539 } 525 if (sp != null)
540 526 {
541 if ((uinfo.UserProfile.UserInventoryURI == null) || (uinfo.UserProfile.UserInventoryURI == "")) 527 AgentCircuitData aCircuit = m_Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
542 // this happens in standalone profiles, apparently 528 if (aCircuit.ServiceURLs.ContainsKey("InventoryServerURI"))
543 return true; 529 {
544 530 inventoryURL = aCircuit.ServiceURLs["InventoryServerURI"].ToString();
545 string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI); 531 inventoryURL = inventoryURL.Trim(new char[] { '/' });
546 532 return true;
547 string uri = LocalGridInventory.TrimEnd('/'); 533 }
548 534 }
549 if ((userInventoryServerURI == uri) || (userInventoryServerURI == ""))
550 {
551 return true;
552 } 535 }
553 m_log.DebugFormat("[HG INVENTORY CONNECTOR]: user {0} is foreign({1} - {2})", userID, userInventoryServerURI, uri);
554 return false; 536 return false;
555 } 537 }
556 538
557 private string GetUserInventoryURI(UUID userID)
558 {
559 string invURI = LocalGridInventory;
560
561 CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID);
562 if ((uinfo == null) || (uinfo.UserProfile == null))
563 return invURI;
564
565 string userInventoryServerURI = Util.ServerURI(uinfo.UserProfile.UserInventoryURI);
566
567 if ((userInventoryServerURI != null) &&
568 (userInventoryServerURI != ""))
569 invURI = userInventoryServerURI;
570 return invURI;
571 }
572
573
574 } 539 }
575} 540}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
index 66d11dd..9d6da4f 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/LocalInventoryServiceConnector.cs
@@ -131,9 +131,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
131 131
132 if (!m_Initialized) 132 if (!m_Initialized)
133 { 133 {
134 // ugh!
135 scene.CommsManager.UserProfileCacheService.SetInventoryService(this);
136 scene.CommsManager.UserService.SetInventoryService(this);
137 m_Initialized = true; 134 m_Initialized = true;
138 } 135 }
139 136
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
index 69504df..aa3b30d 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Inventory/RemoteInventoryServiceConnector.cs
@@ -32,7 +32,7 @@ using System.Reflection;
32using Nini.Config; 32using Nini.Config;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Framework.Statistics; 34using OpenSim.Framework.Statistics;
35using OpenSim.Framework.Communications.Cache; 35
36using OpenSim.Services.Connectors; 36using OpenSim.Services.Connectors;
37using OpenSim.Region.Framework.Interfaces; 37using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 38using OpenSim.Region.Framework.Scenes;
@@ -49,7 +49,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
49 private bool m_Enabled = false; 49 private bool m_Enabled = false;
50 private bool m_Initialized = false; 50 private bool m_Initialized = false;
51 private Scene m_Scene; 51 private Scene m_Scene;
52 private UserProfileCacheService m_UserProfileService;
53 private InventoryServicesConnector m_RemoteConnector; 52 private InventoryServicesConnector m_RemoteConnector;
54 53
55 public Type ReplaceableInterface 54 public Type ReplaceableInterface
@@ -114,9 +113,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
114 113
115 if (!m_Initialized) 114 if (!m_Initialized)
116 { 115 {
117 // ugh!
118 scene.CommsManager.UserProfileCacheService.SetInventoryService(this);
119 scene.CommsManager.UserService.SetInventoryService(this);
120 m_Initialized = true; 116 m_Initialized = true;
121 } 117 }
122 118
@@ -134,10 +130,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
134 130
135 public void RegionLoaded(Scene scene) 131 public void RegionLoaded(Scene scene)
136 { 132 {
137 m_UserProfileService = m_Scene.CommsManager.UserProfileCacheService;
138 if (m_UserProfileService != null)
139 m_log.Debug("[XXXX] Set m_UserProfileService in " + m_Scene.RegionInfo.RegionName);
140
141 if (!m_Enabled) 133 if (!m_Enabled)
142 return; 134 return;
143 135
@@ -345,23 +337,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Inventory
345 337
346 private UUID GetSessionID(UUID userID) 338 private UUID GetSessionID(UUID userID)
347 { 339 {
348 //if (m_Scene == null)
349 //{
350 // m_log.Debug("[INVENTORY CONNECTOR]: OOPS! scene is null");
351 //}
352
353 if (m_UserProfileService == null)
354 {
355 //m_log.Debug("[INVENTORY CONNECTOR]: OOPS! UserProfileCacheService is null");
356 return UUID.Zero;
357 }
358
359 CachedUserInfo uinfo = m_UserProfileService.GetUserDetails(userID);
360 if (uinfo != null)
361 return uinfo.SessionID;
362 m_log.DebugFormat("[INVENTORY CONNECTOR]: user profile for {0} not found", userID);
363 return UUID.Zero; 340 return UUID.Zero;
364
365 } 341 }
366 342
367 } 343 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
new file mode 100644
index 0000000..d78daf9
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/LocalPresenceServiceConnector.cs
@@ -0,0 +1,200 @@
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 */
27using System;
28using System.Collections.Generic;
29using System.Reflection;
30
31using OpenSim.Region.Framework.Interfaces;
32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Server.Base;
34using OpenSim.Services.Interfaces;
35using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
36
37using OpenMetaverse;
38using log4net;
39using Nini.Config;
40
41namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
42{
43 public class LocalPresenceServicesConnector : ISharedRegionModule, IPresenceService
44 {
45 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
46
47 private bool m_Enabled = false;
48
49 private PresenceDetector m_PresenceDetector;
50 private IPresenceService m_PresenceService;
51
52 public LocalPresenceServicesConnector()
53 {
54 }
55
56 public LocalPresenceServicesConnector(IConfigSource source)
57 {
58 Initialise(source);
59 }
60
61 #region ISharedRegionModule
62
63 public Type ReplaceableInterface
64 {
65 get { return null; }
66 }
67
68 public string Name
69 {
70 get { return "LocalPresenceServicesConnector"; }
71 }
72
73 public void Initialise(IConfigSource source)
74 {
75 IConfig moduleConfig = source.Configs["Modules"];
76 if (moduleConfig != null)
77 {
78 string name = moduleConfig.GetString("PresenceServices", "");
79 if (name == Name)
80 {
81 IConfig inventoryConfig = source.Configs["PresenceService"];
82 if (inventoryConfig == null)
83 {
84 m_log.Error("[LOCAL PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini");
85 return;
86 }
87
88 string serviceDll = inventoryConfig.GetString("LocalServiceModule", String.Empty);
89
90 if (serviceDll == String.Empty)
91 {
92 m_log.Error("[LOCAL PRESENCE CONNECTOR]: No LocalServiceModule named in section PresenceService");
93 return;
94 }
95
96 Object[] args = new Object[] { source };
97 m_log.DebugFormat("[LOCAL PRESENCE CONNECTOR]: Service dll = {0}", serviceDll);
98
99 m_PresenceService = ServerUtils.LoadPlugin<IPresenceService>(serviceDll, args);
100
101 if (m_PresenceService == null)
102 {
103 m_log.Error("[LOCAL PRESENCE CONNECTOR]: Can't load presence service");
104 //return;
105 throw new Exception("Unable to proceed. Please make sure your ini files in config-include are updated according to .example's");
106 }
107
108 //Init(source);
109
110 m_PresenceDetector = new PresenceDetector(this);
111
112 m_Enabled = true;
113 m_log.Info("[LOCAL PRESENCE CONNECTOR]: Local presence connector enabled");
114 }
115 }
116 }
117
118 public void PostInitialise()
119 {
120 }
121
122 public void Close()
123 {
124 }
125
126 public void AddRegion(Scene scene)
127 {
128 if (!m_Enabled)
129 return;
130
131 // m_log.DebugFormat(
132 // "[LOCAL PRESENCE CONNECTOR]: Registering IPresenceService to scene {0}", scene.RegionInfo.RegionName);
133
134 scene.RegisterModuleInterface<IPresenceService>(this);
135 m_PresenceDetector.AddRegion(scene);
136
137 m_log.InfoFormat("[LOCAL PRESENCE CONNECTOR]: Enabled local presence for region {0}", scene.RegionInfo.RegionName);
138
139 }
140
141 public void RemoveRegion(Scene scene)
142 {
143 if (!m_Enabled)
144 return;
145
146 m_PresenceDetector.RemoveRegion(scene);
147 }
148
149 public void RegionLoaded(Scene scene)
150 {
151 if (!m_Enabled)
152 return;
153
154 }
155
156 #endregion
157
158 #region IPresenceService
159
160 public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
161 {
162 m_log.Warn("[LOCAL PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators");
163 return false;
164 }
165
166 public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookat)
167 {
168 return m_PresenceService.LogoutAgent(sessionID, position, lookat);
169 }
170
171
172 public bool LogoutRegionAgents(UUID regionID)
173 {
174 return m_PresenceService.LogoutRegionAgents(regionID);
175 }
176
177 public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
178 {
179 return m_PresenceService.ReportAgent(sessionID, regionID, position, lookAt);
180 }
181
182 public PresenceInfo GetAgent(UUID sessionID)
183 {
184 return m_PresenceService.GetAgent(sessionID);
185 }
186
187 public PresenceInfo[] GetAgents(string[] userIDs)
188 {
189 return m_PresenceService.GetAgents(userIDs);
190 }
191
192 public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
193 {
194 return m_PresenceService.SetHomeLocation(userID, regionID, position, lookAt);
195 }
196
197 #endregion
198
199 }
200}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
new file mode 100644
index 0000000..891fc14
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/PresenceDetector.cs
@@ -0,0 +1,100 @@
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 */
27using System;
28using System.Collections.Generic;
29using System.Reflection;
30
31using OpenSim.Framework;
32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Services.Interfaces;
34
35using OpenMetaverse;
36using log4net;
37
38namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
39{
40 public class PresenceDetector
41 {
42 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
43
44 private IPresenceService m_PresenceService;
45 private Scene m_aScene;
46
47 public PresenceDetector(IPresenceService presenceservice)
48 {
49 m_PresenceService = presenceservice;
50 }
51
52 public void AddRegion(Scene scene)
53 {
54 scene.EventManager.OnMakeRootAgent += OnMakeRootAgent;
55 scene.EventManager.OnNewClient += OnNewClient;
56
57 m_PresenceService.LogoutRegionAgents(scene.RegionInfo.RegionID);
58
59 if (m_aScene == null)
60 m_aScene = scene;
61 }
62
63 public void RemoveRegion(Scene scene)
64 {
65 scene.EventManager.OnMakeRootAgent -= OnMakeRootAgent;
66 scene.EventManager.OnNewClient -= OnNewClient;
67
68 m_PresenceService.LogoutRegionAgents(scene.RegionInfo.RegionID);
69
70 }
71
72 public void OnMakeRootAgent(ScenePresence sp)
73 {
74 m_log.DebugFormat("[PRESENCE DETECTOR]: Detected root presence {0} in {1}", sp.UUID, sp.Scene.RegionInfo.RegionName);
75 m_PresenceService.ReportAgent(sp.ControllingClient.SessionId, sp.Scene.RegionInfo.RegionID, sp.AbsolutePosition, sp.Lookat);
76 }
77
78 public void OnNewClient(IClientAPI client)
79 {
80 client.OnLogout += OnLogout;
81 }
82
83 public void OnLogout(IClientAPI client)
84 {
85 client.OnLogout -= OnLogout;
86
87 ScenePresence sp = null;
88 Vector3 position = new Vector3(128, 128, 0);
89 Vector3 lookat = new Vector3(0, 1, 0);
90
91 if (m_aScene.TryGetAvatar(client.AgentId, out sp))
92 {
93 position = sp.AbsolutePosition;
94 lookat = sp.Lookat;
95 }
96 m_PresenceService.LogoutAgent(client.SessionId, position, lookat);
97
98 }
99 }
100}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
new file mode 100644
index 0000000..865f99e
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/RemotePresenceServiceConnector.cs
@@ -0,0 +1,164 @@
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 */
27using System;
28using System.Collections.Generic;
29using System.Reflection;
30
31using OpenSim.Region.Framework.Interfaces;
32using OpenSim.Region.Framework.Scenes;
33using OpenSim.Server.Base;
34using OpenSim.Services.Interfaces;
35using OpenSim.Services.Connectors;
36using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
37
38using OpenMetaverse;
39using log4net;
40using Nini.Config;
41
42namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence
43{
44 public class RemotePresenceServicesConnector : ISharedRegionModule, IPresenceService
45 {
46 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
47
48 #region ISharedRegionModule
49
50 private bool m_Enabled = false;
51
52 private PresenceDetector m_PresenceDetector;
53 private IPresenceService m_RemoteConnector;
54
55 public Type ReplaceableInterface
56 {
57 get { return null; }
58 }
59
60 public string Name
61 {
62 get { return "RemotePresenceServicesConnector"; }
63 }
64
65 public void Initialise(IConfigSource source)
66 {
67 IConfig moduleConfig = source.Configs["Modules"];
68 if (moduleConfig != null)
69 {
70 string name = moduleConfig.GetString("PresenceServices", "");
71 if (name == Name)
72 {
73 m_RemoteConnector = new PresenceServicesConnector(source);
74
75 m_Enabled = true;
76
77 m_PresenceDetector = new PresenceDetector(this);
78
79 m_log.Info("[INVENTORY CONNECTOR]: Remote presence enabled");
80 }
81 }
82
83 }
84
85 public void PostInitialise()
86 {
87 }
88
89 public void Close()
90 {
91 }
92
93 public void AddRegion(Scene scene)
94 {
95 if (!m_Enabled)
96 return;
97
98 scene.RegisterModuleInterface<IPresenceService>(this);
99 m_PresenceDetector.AddRegion(scene);
100
101 m_log.InfoFormat("[REMOTE PRESENCE CONNECTOR]: Enabled remote presence for region {0}", scene.RegionInfo.RegionName);
102
103 }
104
105 public void RemoveRegion(Scene scene)
106 {
107 if (!m_Enabled)
108 return;
109
110 m_PresenceDetector.RemoveRegion(scene);
111 }
112
113 public void RegionLoaded(Scene scene)
114 {
115 if (!m_Enabled)
116 return;
117
118 }
119
120 #endregion
121
122 #region IPresenceService
123
124 public bool LoginAgent(string userID, UUID sessionID, UUID secureSessionID)
125 {
126 m_log.Warn("[REMOTE PRESENCE CONNECTOR]: LoginAgent connector not implemented at the simulators");
127 return false;
128 }
129
130 public bool LogoutAgent(UUID sessionID, Vector3 position, Vector3 lookat)
131 {
132 return m_RemoteConnector.LogoutAgent(sessionID, position, lookat);
133 }
134
135
136 public bool LogoutRegionAgents(UUID regionID)
137 {
138 return m_RemoteConnector.LogoutRegionAgents(regionID);
139 }
140
141 public bool ReportAgent(UUID sessionID, UUID regionID, Vector3 position, Vector3 lookAt)
142 {
143 return m_RemoteConnector.ReportAgent(sessionID, regionID, position, lookAt);
144 }
145
146 public PresenceInfo GetAgent(UUID sessionID)
147 {
148 return m_RemoteConnector.GetAgent(sessionID);
149 }
150
151 public PresenceInfo[] GetAgents(string[] userIDs)
152 {
153 return m_RemoteConnector.GetAgents(userIDs);
154 }
155
156 public bool SetHomeLocation(string userID, UUID regionID, Vector3 position, Vector3 lookAt)
157 {
158 return m_RemoteConnector.SetHomeLocation(userID, regionID, position, lookAt);
159 }
160
161 #endregion
162
163 }
164}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
new file mode 100644
index 0000000..9ba1bdc
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Presence/Tests/PresenceConnectorsTests.cs
@@ -0,0 +1,104 @@
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
28using System;
29using System.Collections.Generic;
30using System.IO;
31using System.Reflection;
32using System.Threading;
33using log4net.Config;
34using NUnit.Framework;
35using NUnit.Framework.SyntaxHelpers;
36using OpenMetaverse;
37using OpenSim.Framework;
38using Nini.Config;
39
40using OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence;
41using OpenSim.Region.Framework.Scenes;
42using PresenceInfo = OpenSim.Services.Interfaces.PresenceInfo;
43using OpenSim.Tests.Common;
44using OpenSim.Tests.Common.Setup;
45
46namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Presence.Tests
47{
48 [TestFixture]
49 public class PresenceConnectorsTests
50 {
51 LocalPresenceServicesConnector m_LocalConnector;
52 private void SetUp()
53 {
54 IConfigSource config = new IniConfigSource();
55 config.AddConfig("Modules");
56 config.AddConfig("PresenceService");
57 config.Configs["Modules"].Set("PresenceServices", "LocalPresenceServicesConnector");
58 config.Configs["PresenceService"].Set("LocalServiceModule", "OpenSim.Services.PresenceService.dll:PresenceService");
59 config.Configs["PresenceService"].Set("StorageProvider", "OpenSim.Data.Null.dll:NullPresenceData");
60
61 m_LocalConnector = new LocalPresenceServicesConnector(config);
62 }
63
64 /// <summary>
65 /// Test OpenSim Presence.
66 /// </summary>
67 [Test]
68 public void TestPresenceV0_1()
69 {
70 SetUp();
71
72 string user1 = UUID.Zero.ToString();
73 UUID session1 = UUID.Zero;
74
75 // this is not implemented by this connector
76 //m_LocalConnector.LoginAgent(user1, session1, UUID.Zero);
77 PresenceInfo result = m_LocalConnector.GetAgent(session1);
78 Assert.IsNotNull(result, "Retrieved GetAgent is null");
79 Assert.That(result.UserID, Is.EqualTo(user1), "Retrieved userID does not match");
80 Assert.IsTrue(result.Online, "Agent just logged in but is offline");
81
82 UUID region1 = UUID.Random();
83 bool r = m_LocalConnector.ReportAgent(session1, region1, Vector3.Zero, Vector3.Zero);
84 Assert.IsTrue(r, "First ReportAgent returned false");
85 result = m_LocalConnector.GetAgent(session1);
86 Assert.That(result.RegionID, Is.EqualTo(region1), "Agent is not in the right region (region1)");
87
88 UUID region2 = UUID.Random();
89 r = m_LocalConnector.ReportAgent(session1, region2, Vector3.Zero, Vector3.Zero);
90 Assert.IsTrue(r, "Second ReportAgent returned false");
91 result = m_LocalConnector.GetAgent(session1);
92 Assert.That(result.RegionID, Is.EqualTo(region2), "Agent is not in the right region (region2)");
93
94 r = m_LocalConnector.LogoutAgent(session1, Vector3.Zero, Vector3.UnitY);
95 Assert.IsTrue(r, "LogoutAgent returned false");
96 result = m_LocalConnector.GetAgent(session1);
97 Assert.IsNotNull(result, "Agent session disappeared from storage after logout");
98 Assert.IsFalse(result.Online, "Agent is reported to be Online after logout");
99
100 r = m_LocalConnector.ReportAgent(session1, region1, Vector3.Zero, Vector3.Zero);
101 Assert.IsFalse(r, "ReportAgent of non-logged in user returned true");
102 }
103 }
104}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
index d68c683..e913891 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Interregion/LocalInterregionComms.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
@@ -33,33 +33,49 @@ using OpenMetaverse;
33using OpenSim.Framework; 33using OpenSim.Framework;
34using OpenSim.Region.Framework.Interfaces; 34using OpenSim.Region.Framework.Interfaces;
35using OpenSim.Region.Framework.Scenes; 35using OpenSim.Region.Framework.Scenes;
36using OpenSim.Services.Interfaces;
37using GridRegion = OpenSim.Services.Interfaces.GridRegion;
36 38
37namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion 39namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
38{ 40{
39 public class LocalInterregionComms : ISharedRegionModule, IInterregionCommsOut, IInterregionCommsIn 41 public class LocalSimulationConnectorModule : ISharedRegionModule, ISimulationService
40 { 42 {
41 private bool m_enabled = false;
42
43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 private List<Scene> m_sceneList = new List<Scene>(); 44 private List<Scene> m_sceneList = new List<Scene>();
45 45
46 #region Events 46 private IEntityTransferModule m_AgentTransferModule;
47 public event ChildAgentUpdateReceived OnChildAgentUpdate; 47 protected IEntityTransferModule AgentTransferModule
48 {
49 get
50 {
51 if (m_AgentTransferModule == null)
52 m_AgentTransferModule = m_sceneList[0].RequestModuleInterface<IEntityTransferModule>();
53 return m_AgentTransferModule;
54 }
55 }
48 56
49 #endregion /* Events */ 57 private bool m_ModuleEnabled = false;
50 58
51 #region IRegionModule 59 #region IRegionModule
52 60
53 public void Initialise(IConfigSource config) 61 public void Initialise(IConfigSource config)
54 { 62 {
55 if (m_sceneList.Count == 0) 63 IConfig moduleConfig = config.Configs["Modules"];
64 if (moduleConfig != null)
56 { 65 {
57 IConfig startupConfig = config.Configs["Communications"]; 66 string name = moduleConfig.GetString("SimulationServices", "");
58 67 if (name == Name)
59 if ((startupConfig != null) && (startupConfig.GetString("InterregionComms", "RESTComms") == "LocalComms"))
60 { 68 {
61 m_log.Debug("[LOCAL COMMS]: Enabling InterregionComms LocalComms module"); 69 //IConfig userConfig = config.Configs["SimulationService"];
62 m_enabled = true; 70 //if (userConfig == null)
71 //{
72 // m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpanSim.ini");
73 // return;
74 //}
75
76 m_ModuleEnabled = true;
77
78 m_log.Info("[SIMULATION CONNECTOR]: Local simulation enabled");
63 } 79 }
64 } 80 }
65 } 81 }
@@ -70,22 +86,24 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
70 86
71 public void AddRegion(Scene scene) 87 public void AddRegion(Scene scene)
72 { 88 {
89 if (!m_ModuleEnabled)
90 return;
91
92 Init(scene);
93 scene.RegisterModuleInterface<ISimulationService>(this);
73 } 94 }
74 95
75 public void RemoveRegion(Scene scene) 96 public void RemoveRegion(Scene scene)
76 { 97 {
77 if (m_enabled) 98 if (!m_ModuleEnabled)
78 { 99 return;
79 RemoveScene(scene); 100
80 } 101 RemoveScene(scene);
102 scene.UnregisterModuleInterface<ISimulationService>(this);
81 } 103 }
82 104
83 public void RegionLoaded(Scene scene) 105 public void RegionLoaded(Scene scene)
84 { 106 {
85 if (m_enabled)
86 {
87 Init(scene);
88 }
89 } 107 }
90 108
91 public void Close() 109 public void Close()
@@ -99,7 +117,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
99 117
100 public string Name 118 public string Name
101 { 119 {
102 get { return "LocalInterregionCommsModule"; } 120 get { return "LocalSimulationConnectorModule"; }
103 } 121 }
104 122
105 /// <summary> 123 /// <summary>
@@ -128,9 +146,6 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
128 lock (m_sceneList) 146 lock (m_sceneList)
129 { 147 {
130 m_sceneList.Add(scene); 148 m_sceneList.Add(scene);
131 if (m_enabled)
132 scene.RegisterModuleInterface<IInterregionCommsOut>(this);
133 scene.RegisterModuleInterface<IInterregionCommsIn>(this);
134 } 149 }
135 150
136 } 151 }
@@ -138,40 +153,58 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
138 153
139 #endregion /* IRegionModule */ 154 #endregion /* IRegionModule */
140 155
141 #region IInterregionComms 156 #region ISimulation
157
158 public IScene GetScene(ulong regionhandle)
159 {
160 foreach (Scene s in m_sceneList)
161 {
162 if (s.RegionInfo.RegionHandle == regionhandle)
163 return s;
164 }
165 // ? weird. should not happen
166 return m_sceneList[0];
167 }
142 168
143 /** 169 /**
144 * Agent-related communications 170 * Agent-related communications
145 */ 171 */
146 172
147 public bool SendCreateChildAgent(ulong regionHandle, AgentCircuitData aCircuit, uint teleportFlags, out string reason) 173 public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
148 { 174 {
175 if (destination == null)
176 {
177 reason = "Given destination was null";
178 m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: CreateAgent was given a null destination");
179 return false;
180 }
149 181
150 foreach (Scene s in m_sceneList) 182 foreach (Scene s in m_sceneList)
151 { 183 {
152 if (s.RegionInfo.RegionHandle == regionHandle) 184 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
153 { 185 {
154// m_log.DebugFormat("[LOCAL COMMS]: Found region {0} to send SendCreateChildAgent", regionHandle); 186 m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Found region {0} to send SendCreateChildAgent", destination.RegionName);
155 return s.NewUserConnection(aCircuit, teleportFlags, out reason); 187 return s.NewUserConnection(aCircuit, teleportFlags, out reason);
156 } 188 }
157 } 189 }
158 190
159// m_log.DebugFormat("[LOCAL COMMS]: Did not find region {0} for SendCreateChildAgent", regionHandle); 191 m_log.DebugFormat("[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCreateChildAgent", destination.RegionName);
160 uint x = 0, y = 0; 192 reason = "Did not find region " + destination.RegionName;
161 Utils.LongToUInts(regionHandle, out x, out y);
162 reason = "Did not find region " + x + "-" + y;
163 return false; 193 return false;
164 } 194 }
165 195
166 public bool SendChildAgentUpdate(ulong regionHandle, AgentData cAgentData) 196 public bool UpdateAgent(GridRegion destination, AgentData cAgentData)
167 { 197 {
198 if (destination == null)
199 return false;
200
168 foreach (Scene s in m_sceneList) 201 foreach (Scene s in m_sceneList)
169 { 202 {
170 if (s.RegionInfo.RegionHandle == regionHandle) 203 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
171 { 204 {
172 //m_log.DebugFormat( 205 m_log.DebugFormat(
173 // "[LOCAL COMMS]: Found region {0} {1} to send ChildAgentUpdate", 206 "[LOCAL SIMULATION CONNECTOR]: Found region {0} {1} to send AgentUpdate",
174 // s.RegionInfo.RegionName, regionHandle); 207 s.RegionInfo.RegionName, destination.RegionHandle);
175 208
176 s.IncomingChildAgentDataUpdate(cAgentData); 209 s.IncomingChildAgentDataUpdate(cAgentData);
177 return true; 210 return true;
@@ -182,11 +215,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
182 return false; 215 return false;
183 } 216 }
184 217
185 public bool SendChildAgentUpdate(ulong regionHandle, AgentPosition cAgentData) 218 public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData)
186 { 219 {
220 if (destination == null)
221 return false;
222
187 foreach (Scene s in m_sceneList) 223 foreach (Scene s in m_sceneList)
188 { 224 {
189 if (s.RegionInfo.RegionHandle == regionHandle) 225 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
190 { 226 {
191 //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate"); 227 //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
192 s.IncomingChildAgentDataUpdate(cAgentData); 228 s.IncomingChildAgentDataUpdate(cAgentData);
@@ -197,12 +233,16 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
197 return false; 233 return false;
198 } 234 }
199 235
200 public bool SendRetrieveRootAgent(ulong regionHandle, UUID id, out IAgentData agent) 236 public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
201 { 237 {
202 agent = null; 238 agent = null;
239
240 if (destination == null)
241 return false;
242
203 foreach (Scene s in m_sceneList) 243 foreach (Scene s in m_sceneList)
204 { 244 {
205 if (s.RegionInfo.RegionHandle == regionHandle) 245 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
206 { 246 {
207 //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate"); 247 //m_log.Debug("[LOCAL COMMS]: Found region to send ChildAgentUpdate");
208 return s.IncomingRetrieveRootAgent(id, out agent); 248 return s.IncomingRetrieveRootAgent(id, out agent);
@@ -212,35 +252,30 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
212 return false; 252 return false;
213 } 253 }
214 254
215 public bool SendReleaseAgent(ulong regionHandle, UUID id, string uri) 255 public bool ReleaseAgent(UUID origin, UUID id, string uri)
216 { 256 {
217 //uint x, y;
218 //Utils.LongToUInts(regionHandle, out x, out y);
219 //x = x / Constants.RegionSize;
220 //y = y / Constants.RegionSize;
221 //m_log.Debug("\n >>> Local SendReleaseAgent " + x + "-" + y);
222 foreach (Scene s in m_sceneList) 257 foreach (Scene s in m_sceneList)
223 { 258 {
224 if (s.RegionInfo.RegionHandle == regionHandle) 259 if (s.RegionInfo.RegionID == origin)
225 { 260 {
226 //m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent"); 261 m_log.Debug("[LOCAL COMMS]: Found region to SendReleaseAgent");
227 return s.IncomingReleaseAgent(id); 262 AgentTransferModule.AgentArrivedAtDestination(id);
263 return true;
264// return s.IncomingReleaseAgent(id);
228 } 265 }
229 } 266 }
230 //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent"); 267 //m_log.Debug("[LOCAL COMMS]: region not found in SendReleaseAgent " + origin);
231 return false; 268 return false;
232 } 269 }
233 270
234 public bool SendCloseAgent(ulong regionHandle, UUID id) 271 public bool CloseAgent(GridRegion destination, UUID id)
235 { 272 {
236 //uint x, y; 273 if (destination == null)
237 //Utils.LongToUInts(regionHandle, out x, out y); 274 return false;
238 //x = x / Constants.RegionSize; 275
239 //y = y / Constants.RegionSize;
240 //m_log.Debug("\n >>> Local SendCloseAgent " + x + "-" + y);
241 foreach (Scene s in m_sceneList) 276 foreach (Scene s in m_sceneList)
242 { 277 {
243 if (s.RegionInfo.RegionHandle == regionHandle) 278 if (s.RegionInfo.RegionID == destination.RegionID)
244 { 279 {
245 //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent"); 280 //m_log.Debug("[LOCAL COMMS]: Found region to SendCloseAgent");
246 return s.IncomingCloseAgent(id); 281 return s.IncomingCloseAgent(id);
@@ -254,11 +289,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
254 * Object-related communications 289 * Object-related communications
255 */ 290 */
256 291
257 public bool SendCreateObject(ulong regionHandle, SceneObjectGroup sog, bool isLocalCall) 292 public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall)
258 { 293 {
294 if (destination == null)
295 return false;
296
259 foreach (Scene s in m_sceneList) 297 foreach (Scene s in m_sceneList)
260 { 298 {
261 if (s.RegionInfo.RegionHandle == regionHandle) 299 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
262 { 300 {
263 //m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject"); 301 //m_log.Debug("[LOCAL COMMS]: Found region to SendCreateObject");
264 if (isLocalCall) 302 if (isLocalCall)
@@ -278,11 +316,14 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
278 return false; 316 return false;
279 } 317 }
280 318
281 public bool SendCreateObject(ulong regionHandle, UUID userID, UUID itemID) 319 public bool CreateObject(GridRegion destination, UUID userID, UUID itemID)
282 { 320 {
321 if (destination == null)
322 return false;
323
283 foreach (Scene s in m_sceneList) 324 foreach (Scene s in m_sceneList)
284 { 325 {
285 if (s.RegionInfo.RegionHandle == regionHandle) 326 if (s.RegionInfo.RegionHandle == destination.RegionHandle)
286 { 327 {
287 return s.IncomingCreateObject(userID, itemID); 328 return s.IncomingCreateObject(userID, itemID);
288 } 329 }
@@ -295,21 +336,18 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Interregion
295 336
296 #region Misc 337 #region Misc
297 338
298 public Scene GetScene(ulong regionhandle) 339 public bool IsLocalRegion(ulong regionhandle)
299 { 340 {
300 foreach (Scene s in m_sceneList) 341 foreach (Scene s in m_sceneList)
301 {
302 if (s.RegionInfo.RegionHandle == regionhandle) 342 if (s.RegionInfo.RegionHandle == regionhandle)
303 return s; 343 return true;
304 } 344 return false;
305 // ? weird. should not happen
306 return m_sceneList[0];
307 } 345 }
308 346
309 public bool IsLocalRegion(ulong regionhandle) 347 public bool IsLocalRegion(UUID id)
310 { 348 {
311 foreach (Scene s in m_sceneList) 349 foreach (Scene s in m_sceneList)
312 if (s.RegionInfo.RegionHandle == regionhandle) 350 if (s.RegionInfo.RegionID == id)
313 return true; 351 return true;
314 return false; 352 return false;
315 } 353 }
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
new file mode 100644
index 0000000..2b1f815
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
@@ -0,0 +1,300 @@
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
28using System;
29using System.Collections;
30using System.IO;
31using System.Net;
32using System.Reflection;
33using System.Text;
34using log4net;
35using Nini.Config;
36using OpenMetaverse;
37using OpenMetaverse.StructuredData;
38using OpenSim.Framework;
39using OpenSim.Framework.Communications;
40using OpenSim.Region.Framework.Interfaces;
41using OpenSim.Region.Framework.Scenes;
42using OpenSim.Region.Framework.Scenes.Serialization;
43using OpenSim.Services.Interfaces;
44using OpenSim.Services.Connectors.Simulation;
45using GridRegion = OpenSim.Services.Interfaces.GridRegion;
46
47namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
48{
49 public class RemoteSimulationConnectorModule : ISharedRegionModule, ISimulationService
50 {
51 private bool initialized = false;
52 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
53
54 protected bool m_enabled = false;
55 protected Scene m_aScene;
56 // RemoteSimulationConnector does not care about local regions; it delegates that to the Local module
57 protected LocalSimulationConnectorModule m_localBackend;
58 protected SimulationServiceConnector m_remoteConnector;
59
60 protected bool m_safemode;
61 protected IPAddress m_thisIP;
62
63 #region IRegionModule
64
65 public virtual void Initialise(IConfigSource config)
66 {
67
68 IConfig moduleConfig = config.Configs["Modules"];
69 if (moduleConfig != null)
70 {
71 string name = moduleConfig.GetString("SimulationServices", "");
72 if (name == Name)
73 {
74 //IConfig userConfig = config.Configs["SimulationService"];
75 //if (userConfig == null)
76 //{
77 // m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpanSim.ini");
78 // return;
79 //}
80
81 m_remoteConnector = new SimulationServiceConnector();
82
83 m_enabled = true;
84
85 m_log.Info("[SIMULATION CONNECTOR]: Remote simulation enabled");
86 }
87 }
88 }
89
90 public virtual void PostInitialise()
91 {
92 }
93
94 public virtual void Close()
95 {
96 }
97
98 public void AddRegion(Scene scene)
99 {
100 if (!m_enabled)
101 return;
102
103 if (!initialized)
104 {
105 InitOnce(scene);
106 initialized = true;
107 }
108 InitEach(scene);
109 }
110
111 public void RemoveRegion(Scene scene)
112 {
113 if (m_enabled)
114 {
115 m_localBackend.RemoveScene(scene);
116 scene.UnregisterModuleInterface<ISimulationService>(this);
117 }
118 }
119
120 public void RegionLoaded(Scene scene)
121 {
122 if (!m_enabled)
123 return;
124 }
125
126 public Type ReplaceableInterface
127 {
128 get { return null; }
129 }
130
131 public virtual string Name
132 {
133 get { return "RemoteSimulationConnectorModule"; }
134 }
135
136 protected virtual void InitEach(Scene scene)
137 {
138 m_localBackend.Init(scene);
139 scene.RegisterModuleInterface<ISimulationService>(this);
140 }
141
142 protected virtual void InitOnce(Scene scene)
143 {
144 m_localBackend = new LocalSimulationConnectorModule();
145 m_aScene = scene;
146 //m_regionClient = new RegionToRegionClient(m_aScene, m_hyperlinkService);
147 m_thisIP = Util.GetHostFromDNS(scene.RegionInfo.ExternalHostName);
148 }
149
150 #endregion /* IRegionModule */
151
152 #region IInterregionComms
153
154 public IScene GetScene(ulong handle)
155 {
156 return m_localBackend.GetScene(handle);
157 }
158
159 /**
160 * Agent-related communications
161 */
162
163 public bool CreateAgent(GridRegion destination, AgentCircuitData aCircuit, uint teleportFlags, out string reason)
164 {
165 if (destination == null)
166 {
167 reason = "Given destination was null";
168 m_log.DebugFormat("[REMOTE SIMULATION CONNECTOR]: CreateAgent was given a null destination");
169 return false;
170 }
171
172 // Try local first
173 if (m_localBackend.CreateAgent(destination, aCircuit, teleportFlags, out reason))
174 return true;
175
176 // else do the remote thing
177 if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
178 {
179 //m_regionClient.SendUserInformation(regInfo, aCircuit);
180 return m_remoteConnector.CreateAgent(destination, aCircuit, teleportFlags, out reason);
181 }
182 return false;
183 }
184
185 public bool UpdateAgent(GridRegion destination, AgentData cAgentData)
186 {
187 if (destination == null)
188 return false;
189
190 // Try local first
191 if (m_localBackend.UpdateAgent(destination, cAgentData))
192 return true;
193
194 // else do the remote thing
195 if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
196 return m_remoteConnector.UpdateAgent(destination, cAgentData);
197
198 return false;
199
200 }
201
202 public bool UpdateAgent(GridRegion destination, AgentPosition cAgentData)
203 {
204 if (destination == null)
205 return false;
206
207 // Try local first
208 if (m_localBackend.UpdateAgent(destination, cAgentData))
209 return true;
210
211 // else do the remote thing
212 if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
213 return m_remoteConnector.UpdateAgent(destination, cAgentData);
214
215 return false;
216
217 }
218
219 public bool RetrieveAgent(GridRegion destination, UUID id, out IAgentData agent)
220 {
221 agent = null;
222
223 if (destination == null)
224 return false;
225
226 // Try local first
227 if (m_localBackend.RetrieveAgent(destination, id, out agent))
228 return true;
229
230 // else do the remote thing
231 if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
232 return m_remoteConnector.RetrieveAgent(destination, id, out agent);
233
234 return false;
235
236 }
237
238 public bool ReleaseAgent(UUID origin, UUID id, string uri)
239 {
240 // Try local first
241 if (m_localBackend.ReleaseAgent(origin, id, uri))
242 return true;
243
244 // else do the remote thing
245 if (!m_localBackend.IsLocalRegion(origin))
246 return m_remoteConnector.ReleaseAgent(origin, id, uri);
247
248 return false;
249 }
250
251
252 public bool CloseAgent(GridRegion destination, UUID id)
253 {
254 if (destination == null)
255 return false;
256
257 // Try local first
258 if (m_localBackend.CloseAgent(destination, id))
259 return true;
260
261 // else do the remote thing
262 if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
263 return m_remoteConnector.CloseAgent(destination, id);
264
265 return false;
266 }
267
268 /**
269 * Object-related communications
270 */
271
272 public bool CreateObject(GridRegion destination, ISceneObject sog, bool isLocalCall)
273 {
274 if (destination == null)
275 return false;
276
277 // Try local first
278 if (m_localBackend.CreateObject(destination, sog, isLocalCall))
279 {
280 //m_log.Debug("[REST COMMS]: LocalBackEnd SendCreateObject succeeded");
281 return true;
282 }
283
284 // else do the remote thing
285 if (!m_localBackend.IsLocalRegion(destination.RegionHandle))
286 return m_remoteConnector.CreateObject(destination, sog, isLocalCall);
287
288 return false;
289 }
290
291 public bool CreateObject(GridRegion destination, UUID userID, UUID itemID)
292 {
293 // Not Implemented
294 return false;
295 }
296
297 #endregion /* IInterregionComms */
298
299 }
300}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
new file mode 100644
index 0000000..07fee79
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
@@ -0,0 +1,189 @@
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
28using System;
29using System.Collections.Generic;
30using System.Reflection;
31using log4net;
32using Nini.Config;
33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Server.Base;
36using OpenSim.Services.Interfaces;
37
38using OpenMetaverse;
39
40namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
41{
42 public class LocalUserAccountServicesConnector : ISharedRegionModule, IUserAccountService
43 {
44 private static readonly ILog m_log =
45 LogManager.GetLogger(
46 MethodBase.GetCurrentMethod().DeclaringType);
47
48 private IUserAccountService m_UserService;
49 private UserAccountCache m_Cache;
50
51 private bool m_Enabled = false;
52
53 #region ISharedRegionModule
54
55 public Type ReplaceableInterface
56 {
57 get { return null; }
58 }
59
60 public string Name
61 {
62 get { return "LocalUserAccountServicesConnector"; }
63 }
64
65 public void Initialise(IConfigSource source)
66 {
67 IConfig moduleConfig = source.Configs["Modules"];
68 if (moduleConfig != null)
69 {
70 string name = moduleConfig.GetString("UserAccountServices", "");
71 if (name == Name)
72 {
73 IConfig userConfig = source.Configs["UserAccountService"];
74 if (userConfig == null)
75 {
76 m_log.Error("[USER CONNECTOR]: UserAccountService missing from OpenSim.ini");
77 return;
78 }
79
80 string serviceDll = userConfig.GetString("LocalServiceModule",
81 String.Empty);
82
83 if (serviceDll == String.Empty)
84 {
85 m_log.Error("[USER CONNECTOR]: No LocalServiceModule named in section UserService");
86 return;
87 }
88
89 Object[] args = new Object[] { source };
90 m_UserService =
91 ServerUtils.LoadPlugin<IUserAccountService>(serviceDll,
92 args);
93
94 if (m_UserService == null)
95 {
96 m_log.Error("[USER CONNECTOR]: Can't load user account service");
97 return;
98 }
99 m_Enabled = true;
100 m_Cache = new UserAccountCache();
101
102 m_log.Info("[USER CONNECTOR]: Local user connector enabled");
103 }
104 }
105 }
106
107 public void PostInitialise()
108 {
109 if (!m_Enabled)
110 return;
111 }
112
113 public void Close()
114 {
115 if (!m_Enabled)
116 return;
117 }
118
119 public void AddRegion(Scene scene)
120 {
121 if (!m_Enabled)
122 return;
123
124 scene.RegisterModuleInterface<IUserAccountService>(m_UserService);
125 }
126
127 public void RemoveRegion(Scene scene)
128 {
129 if (!m_Enabled)
130 return;
131 }
132
133 public void RegionLoaded(Scene scene)
134 {
135 if (!m_Enabled)
136 return;
137 }
138
139 #endregion
140
141 #region IUserAccountService
142
143 public UserAccount GetUserAccount(UUID scopeID, UUID userID)
144 {
145 UserAccount account = m_Cache.Get(userID);
146 if (account != null)
147 return account;
148
149 account = m_UserService.GetUserAccount(scopeID, userID);
150 if (account != null)
151 m_Cache.Cache(account);
152
153 return account;
154 }
155
156 public UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
157 {
158 UserAccount account = m_Cache.Get(firstName + " " + lastName);
159 if (account != null)
160 return account;
161
162 account = m_UserService.GetUserAccount(scopeID, firstName, lastName);
163 if (account != null)
164 m_Cache.Cache(account);
165
166 return account;
167 }
168
169 public UserAccount GetUserAccount(UUID scopeID, string Email)
170 {
171 return m_UserService.GetUserAccount(scopeID, Email);
172 }
173
174 public List<UserAccount> GetUserAccounts(UUID scopeID, string query)
175 {
176 return m_UserService.GetUserAccounts(scopeID, query);
177 }
178
179 // Update all updatable fields
180 //
181 public bool StoreUserAccount(UserAccount data)
182 {
183 return m_UserService.StoreUserAccount(data);
184 }
185
186 #endregion
187
188 }
189}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
new file mode 100644
index 0000000..13acdf2
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/RemoteUserAccountServiceConnector.cs
@@ -0,0 +1,148 @@
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
28using System;
29using Nini.Config;
30using log4net;
31using System.Reflection;
32using OpenSim.Region.Framework.Interfaces;
33using OpenSim.Region.Framework.Scenes;
34using OpenSim.Services.Interfaces;
35using OpenSim.Services.Connectors;
36
37using OpenMetaverse;
38
39namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
40{
41 public class RemoteUserAccountServicesConnector : UserAccountServicesConnector,
42 ISharedRegionModule, IUserAccountService
43 {
44 private static readonly ILog m_log =
45 LogManager.GetLogger(
46 MethodBase.GetCurrentMethod().DeclaringType);
47
48 private bool m_Enabled = false;
49 private UserAccountCache m_Cache;
50
51 public Type ReplaceableInterface
52 {
53 get { return null; }
54 }
55
56 public string Name
57 {
58 get { return "RemoteUserAccountServicesConnector"; }
59 }
60
61 public override void Initialise(IConfigSource source)
62 {
63 IConfig moduleConfig = source.Configs["Modules"];
64 if (moduleConfig != null)
65 {
66 string name = moduleConfig.GetString("UserAccountServices", "");
67 if (name == Name)
68 {
69 IConfig userConfig = source.Configs["UserAccountService"];
70 if (userConfig == null)
71 {
72 m_log.Error("[USER CONNECTOR]: UserAccountService missing from OpanSim.ini");
73 return;
74 }
75
76 m_Enabled = true;
77
78 base.Initialise(source);
79 m_Cache = new UserAccountCache();
80
81 m_log.Info("[USER CONNECTOR]: Remote users enabled");
82 }
83 }
84 }
85
86 public void PostInitialise()
87 {
88 if (!m_Enabled)
89 return;
90 }
91
92 public void Close()
93 {
94 if (!m_Enabled)
95 return;
96 }
97
98 public void AddRegion(Scene scene)
99 {
100 if (!m_Enabled)
101 return;
102
103 scene.RegisterModuleInterface<IUserAccountService>(this);
104 }
105
106 public void RemoveRegion(Scene scene)
107 {
108 if (!m_Enabled)
109 return;
110 }
111
112 public void RegionLoaded(Scene scene)
113 {
114 if (!m_Enabled)
115 return;
116 }
117
118 #region Overwritten methods from IUserAccountService
119
120 public override UserAccount GetUserAccount(UUID scopeID, UUID userID)
121 {
122 UserAccount account = m_Cache.Get(userID);
123 if (account != null)
124 return account;
125
126 account = base.GetUserAccount(scopeID, userID);
127 if (account != null)
128 m_Cache.Cache(account);
129
130 return account;
131 }
132
133 public override UserAccount GetUserAccount(UUID scopeID, string firstName, string lastName)
134 {
135 UserAccount account = m_Cache.Get(firstName + " " + lastName);
136 if (account != null)
137 return account;
138
139 account = base.GetUserAccount(scopeID, firstName, lastName);
140 if (account != null)
141 m_Cache.Cache(account);
142
143 return account;
144 }
145
146 #endregion
147 }
148}
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
new file mode 100644
index 0000000..e430fc7
--- /dev/null
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/UserAccountCache.cs
@@ -0,0 +1,87 @@
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 */
27using System;
28using System.Reflection;
29using System.Collections.Generic;
30using OpenSim.Framework;
31using OpenSim.Services.Interfaces;
32using OpenMetaverse;
33using log4net;
34
35namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
36{
37 public class UserAccountCache
38 {
39 //private static readonly ILog m_log =
40 // LogManager.GetLogger(
41 // MethodBase.GetCurrentMethod().DeclaringType);
42
43 private ICnmCache<UUID, UserAccount> m_UUIDCache;
44 private Dictionary<string, UUID> m_NameCache;
45
46 public UserAccountCache()
47 {
48 // Warning: the size values are a bit fuzzy. What matters
49 // most for this cache is the count value (128 entries).
50 m_UUIDCache = CnmSynchronizedCache<UUID, UserAccount>.Synchronized(new CnmMemoryCache<UUID, UserAccount>(
51 128, 128*512, TimeSpan.FromMinutes(30.0)));
52 m_NameCache = new Dictionary<string, UUID>(); // this one is unbound
53 }
54
55 public void Cache(UserAccount account)
56 {
57 m_UUIDCache.Set(account.PrincipalID, account, 512);
58 m_NameCache[account.Name] = account.PrincipalID;
59
60 //m_log.DebugFormat("[USER CACHE]: cached user {0} {1}", account.FirstName, account.LastName);
61 }
62
63 public UserAccount Get(UUID userID)
64 {
65 UserAccount account = null;
66 if (m_UUIDCache.TryGetValue(userID, out account))
67 {
68 //m_log.DebugFormat("[USER CACHE]: Account {0} {1} found in cache", account.FirstName, account.LastName);
69 return account;
70 }
71
72 return null;
73 }
74
75 public UserAccount Get(string name)
76 {
77 if (!m_NameCache.ContainsKey(name))
78 return null;
79
80 UserAccount account = null;
81 if (m_UUIDCache.TryGetValue(m_NameCache[name], out account))
82 return account;
83
84 return null;
85 }
86 }
87}
diff --git a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
index 73f7ae3..127469e 100644
--- a/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
+++ b/OpenSim/Region/CoreModules/World/Access/AccessModule.cs
@@ -33,7 +33,6 @@ using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Console; 35using OpenSim.Framework.Console;
36using OpenSim.Framework.Communications.Cache;
37using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
38using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
39using OpenSim.Services.Interfaces; 38using OpenSim.Services.Interfaces;
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index 8ed1913..59a1b8f 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -38,10 +38,11 @@ using OpenMetaverse;
38using OpenSim.Framework; 38using OpenSim.Framework;
39using OpenSim.Framework.Serialization; 39using OpenSim.Framework.Serialization;
40using OpenSim.Framework.Serialization.External; 40using OpenSim.Framework.Serialization.External;
41using OpenSim.Framework.Communications.Cache; 41
42using OpenSim.Region.CoreModules.World.Terrain; 42using OpenSim.Region.CoreModules.World.Terrain;
43using OpenSim.Region.Framework.Interfaces; 43using OpenSim.Region.Framework.Interfaces;
44using OpenSim.Region.Framework.Scenes; 44using OpenSim.Region.Framework.Scenes;
45using OpenSim.Services.Interfaces;
45 46
46namespace OpenSim.Region.CoreModules.World.Archiver 47namespace OpenSim.Region.CoreModules.World.Archiver
47{ 48{
@@ -181,10 +182,6 @@ namespace OpenSim.Region.CoreModules.World.Archiver
181 182
182 // Try to retain the original creator/owner/lastowner if their uuid is present on this grid 183 // Try to retain the original creator/owner/lastowner if their uuid is present on this grid
183 // otherwise, use the master avatar uuid instead 184 // otherwise, use the master avatar uuid instead
184 UUID masterAvatarId = m_scene.RegionInfo.MasterAvatarAssignedUUID;
185
186 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
187 masterAvatarId = m_scene.RegionInfo.EstateSettings.EstateOwner;
188 185
189 // Reload serialized parcels 186 // Reload serialized parcels
190 m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels. Please wait.", serialisedParcels.Count); 187 m_log.InfoFormat("[ARCHIVER]: Loading {0} parcels. Please wait.", serialisedParcels.Count);
@@ -193,7 +190,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
193 { 190 {
194 LandData parcel = LandDataSerializer.Deserialize(serialisedParcel); 191 LandData parcel = LandDataSerializer.Deserialize(serialisedParcel);
195 if (!ResolveUserUuid(parcel.OwnerID)) 192 if (!ResolveUserUuid(parcel.OwnerID))
196 parcel.OwnerID = masterAvatarId; 193 parcel.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
197 landData.Add(parcel); 194 landData.Add(parcel);
198 } 195 }
199 m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData); 196 m_scene.EventManager.TriggerIncomingLandDataFromStorage(landData);
@@ -232,13 +229,13 @@ namespace OpenSim.Region.CoreModules.World.Archiver
232 foreach (SceneObjectPart part in sceneObject.Children.Values) 229 foreach (SceneObjectPart part in sceneObject.Children.Values)
233 { 230 {
234 if (!ResolveUserUuid(part.CreatorID)) 231 if (!ResolveUserUuid(part.CreatorID))
235 part.CreatorID = masterAvatarId; 232 part.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
236 233
237 if (!ResolveUserUuid(part.OwnerID)) 234 if (!ResolveUserUuid(part.OwnerID))
238 part.OwnerID = masterAvatarId; 235 part.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
239 236
240 if (!ResolveUserUuid(part.LastOwnerID)) 237 if (!ResolveUserUuid(part.LastOwnerID))
241 part.LastOwnerID = masterAvatarId; 238 part.LastOwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
242 239
243 // And zap any troublesome sit target information 240 // And zap any troublesome sit target information
244 part.SitTargetOrientation = new Quaternion(0, 0, 0, 1); 241 part.SitTargetOrientation = new Quaternion(0, 0, 0, 1);
@@ -254,11 +251,11 @@ namespace OpenSim.Region.CoreModules.World.Archiver
254 { 251 {
255 if (!ResolveUserUuid(kvp.Value.OwnerID)) 252 if (!ResolveUserUuid(kvp.Value.OwnerID))
256 { 253 {
257 kvp.Value.OwnerID = masterAvatarId; 254 kvp.Value.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
258 } 255 }
259 if (!ResolveUserUuid(kvp.Value.CreatorID)) 256 if (!ResolveUserUuid(kvp.Value.CreatorID))
260 { 257 {
261 kvp.Value.CreatorID = masterAvatarId; 258 kvp.Value.CreatorID = m_scene.RegionInfo.EstateSettings.EstateOwner;
262 } 259 }
263 } 260 }
264 } 261 }
@@ -292,8 +289,8 @@ namespace OpenSim.Region.CoreModules.World.Archiver
292 { 289 {
293 if (!m_validUserUuids.ContainsKey(uuid)) 290 if (!m_validUserUuids.ContainsKey(uuid))
294 { 291 {
295 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(uuid); 292 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, uuid);
296 if (profile != null && profile.UserProfile != null) 293 if (account != null)
297 m_validUserUuids.Add(uuid, true); 294 m_validUserUuids.Add(uuid, true);
298 else 295 else
299 m_validUserUuids.Add(uuid, false); 296 m_validUserUuids.Add(uuid, false);
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
index c3e57f0..d986274 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs
@@ -34,7 +34,7 @@ using NUnit.Framework;
34using NUnit.Framework.SyntaxHelpers; 34using NUnit.Framework.SyntaxHelpers;
35using OpenMetaverse; 35using OpenMetaverse;
36using OpenSim.Framework; 36using OpenSim.Framework;
37using OpenSim.Framework.Communications.Cache; 37
38using OpenSim.Framework.Serialization; 38using OpenSim.Framework.Serialization;
39using OpenSim.Framework.Serialization.External; 39using OpenSim.Framework.Serialization.External;
40using OpenSim.Region.CoreModules.World.Serialiser; 40using OpenSim.Region.CoreModules.World.Serialiser;
diff --git a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
index 695cced..189efdc 100644
--- a/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
@@ -57,10 +57,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
57 if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime) 57 if (!m_scene.RegionInfo.EstateSettings.UseGlobalTime)
58 sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800; 58 sun=(uint)(m_scene.RegionInfo.EstateSettings.SunPosition*1024.0) + 0x1800;
59 UUID estateOwner; 59 UUID estateOwner;
60 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 60 estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner;
61 estateOwner = m_scene.RegionInfo.EstateSettings.EstateOwner;
62 else
63 estateOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
64 61
65 if (m_scene.Permissions.IsGod(remote_client.AgentId)) 62 if (m_scene.Permissions.IsGod(remote_client.AgentId))
66 estateOwner = remote_client.AgentId; 63 estateOwner = remote_client.AgentId;
@@ -241,8 +238,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
241 238
242 if (user == m_scene.RegionInfo.EstateSettings.EstateOwner) 239 if (user == m_scene.RegionInfo.EstateSettings.EstateOwner)
243 return; // never process EO 240 return; // never process EO
244 if (user == m_scene.RegionInfo.MasterAvatarAssignedUUID)
245 return; // never process owner
246 241
247 if ((estateAccessType & 4) != 0) // User add 242 if ((estateAccessType & 4) != 0) // User add
248 { 243 {
@@ -709,16 +704,9 @@ namespace OpenSim.Region.CoreModules.World.Estate
709 lsri.TaskID = sog.UUID; 704 lsri.TaskID = sog.UUID;
710 lsri.TaskLocalID = sog.LocalId; 705 lsri.TaskLocalID = sog.LocalId;
711 lsri.TaskName = sog.GetPartName(obj); 706 lsri.TaskName = sog.GetPartName(obj);
712 if (m_scene.CommsManager.UUIDNameCachedTest(sog.OwnerID)) 707 lsri.OwnerName = "waiting";
713 { 708 lock (uuidNameLookupList)
714 lsri.OwnerName = m_scene.CommsManager.UUIDNameRequestString(sog.OwnerID); 709 uuidNameLookupList.Add(sog.OwnerID);
715 }
716 else
717 {
718 lsri.OwnerName = "waiting";
719 lock (uuidNameLookupList)
720 uuidNameLookupList.Add(sog.OwnerID);
721 }
722 710
723 if (filter.Length != 0) 711 if (filter.Length != 0)
724 { 712 {
@@ -769,7 +757,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
769 for (int i = 0; i < uuidarr.Length; i++) 757 for (int i = 0; i < uuidarr.Length; i++)
770 { 758 {
771 // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); 759 // string lookupname = m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]);
772 m_scene.CommsManager.UUIDNameRequestString(uuidarr[i]); 760 m_scene.GetUserName(uuidarr[i]);
773 // we drop it. It gets cached though... so we're ready for the next request. 761 // we drop it. It gets cached though... so we're ready for the next request.
774 } 762 }
775 } 763 }
@@ -808,14 +796,7 @@ namespace OpenSim.Region.CoreModules.World.Estate
808 args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight; 796 args.waterHeight = (float)m_scene.RegionInfo.RegionSettings.WaterHeight;
809 args.regionFlags = GetRegionFlags(); 797 args.regionFlags = GetRegionFlags();
810 args.regionName = m_scene.RegionInfo.RegionName; 798 args.regionName = m_scene.RegionInfo.RegionName;
811 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 799 args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner;
812 args.SimOwner = m_scene.RegionInfo.EstateSettings.EstateOwner;
813 else
814 args.SimOwner = m_scene.RegionInfo.MasterAvatarAssignedUUID;
815
816 // Fudge estate owner
817 //if (m_scene.Permissions.IsGod(remoteClient.AgentId))
818 // args.SimOwner = remoteClient.AgentId;
819 800
820 args.terrainBase0 = UUID.Zero; 801 args.terrainBase0 = UUID.Zero;
821 args.terrainBase1 = UUID.Zero; 802 args.terrainBase1 = UUID.Zero;
@@ -1194,8 +1175,6 @@ namespace OpenSim.Region.CoreModules.World.Estate
1194 1175
1195 public bool IsManager(UUID avatarID) 1176 public bool IsManager(UUID avatarID)
1196 { 1177 {
1197 if (avatarID == m_scene.RegionInfo.MasterAvatarAssignedUUID)
1198 return true;
1199 if (avatarID == m_scene.RegionInfo.EstateSettings.EstateOwner) 1178 if (avatarID == m_scene.RegionInfo.EstateSettings.EstateOwner)
1200 return true; 1179 return true;
1201 1180
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 9b39b09..f0c87f4 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -227,10 +227,7 @@ namespace OpenSim.Region.CoreModules.World.Land
227 ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene); 227 ILandObject fullSimParcel = new LandObject(UUID.Zero, false, m_scene);
228 228
229 fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); 229 fullSimParcel.SetLandBitmap(fullSimParcel.GetSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
230 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 230 fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
231 fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
232 else
233 fullSimParcel.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
234 fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); 231 fullSimParcel.LandData.ClaimDate = Util.UnixTimeSinceEpoch();
235 AddLandObject(fullSimParcel); 232 AddLandObject(fullSimParcel);
236 } 233 }
@@ -1090,10 +1087,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1090 { 1087 {
1091 if (m_scene.Permissions.CanAbandonParcel(remote_client.AgentId, land)) 1088 if (m_scene.Permissions.CanAbandonParcel(remote_client.AgentId, land))
1092 { 1089 {
1093 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 1090 land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
1094 land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
1095 else
1096 land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
1097 land.LandData.GroupID = UUID.Zero; 1091 land.LandData.GroupID = UUID.Zero;
1098 land.LandData.IsGroupOwned = false; 1092 land.LandData.IsGroupOwned = false;
1099 m_scene.ForEachClient(SendParcelOverlay); 1093 m_scene.ForEachClient(SendParcelOverlay);
@@ -1114,10 +1108,7 @@ namespace OpenSim.Region.CoreModules.World.Land
1114 { 1108 {
1115 if (m_scene.Permissions.CanReclaimParcel(remote_client.AgentId, land)) 1109 if (m_scene.Permissions.CanReclaimParcel(remote_client.AgentId, land))
1116 { 1110 {
1117 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 1111 land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
1118 land.LandData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
1119 else
1120 land.LandData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
1121 land.LandData.ClaimDate = Util.UnixTimeSinceEpoch(); 1112 land.LandData.ClaimDate = Util.UnixTimeSinceEpoch();
1122 land.LandData.GroupID = UUID.Zero; 1113 land.LandData.GroupID = UUID.Zero;
1123 land.LandData.IsGroupOwned = false; 1114 land.LandData.IsGroupOwned = false;
diff --git a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
index 1533462..4652d70 100644
--- a/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
+++ b/OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
@@ -32,7 +32,7 @@ using log4net;
32using Nini.Config; 32using Nini.Config;
33using OpenMetaverse; 33using OpenMetaverse;
34using OpenSim.Framework; 34using OpenSim.Framework;
35using OpenSim.Framework.Communications.Cache; 35
36using OpenSim.Region.Framework.Interfaces; 36using OpenSim.Region.Framework.Interfaces;
37using OpenSim.Region.Framework.Scenes; 37using OpenSim.Region.Framework.Scenes;
38using OpenSim.Services.Interfaces; 38using OpenSim.Services.Interfaces;
@@ -95,6 +95,23 @@ namespace OpenSim.Region.CoreModules.World.Permissions
95 95
96 protected Scene m_scene; 96 protected Scene m_scene;
97 97
98 private InventoryFolderImpl m_libraryRootFolder;
99 protected InventoryFolderImpl LibraryRootFolder
100 {
101 get
102 {
103 if (m_libraryRootFolder != null)
104 return m_libraryRootFolder;
105
106 ILibraryService lib = m_scene.RequestModuleInterface<ILibraryService>();
107 if (lib != null)
108 {
109 m_libraryRootFolder = lib.LibraryRootFolder;
110 }
111 return m_libraryRootFolder;
112 }
113 }
114
98 #region Constants 115 #region Constants
99 // These are here for testing. They will be taken out 116 // These are here for testing. They will be taken out
100 117
@@ -462,12 +479,6 @@ namespace OpenSim.Region.CoreModules.World.Permissions
462 { 479 {
463 if (user == UUID.Zero) return false; 480 if (user == UUID.Zero) return false;
464 481
465 if (m_scene.RegionInfo.MasterAvatarAssignedUUID != UUID.Zero)
466 {
467 if (m_RegionOwnerIsGod && (m_scene.RegionInfo.MasterAvatarAssignedUUID == user))
468 return true;
469 }
470
471 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero) 482 if (m_scene.RegionInfo.EstateSettings.EstateOwner != UUID.Zero)
472 { 483 {
473 if (m_scene.RegionInfo.EstateSettings.EstateOwner == user && m_RegionOwnerIsGod) 484 if (m_scene.RegionInfo.EstateSettings.EstateOwner == user && m_RegionOwnerIsGod)
@@ -479,10 +490,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
479 490
480 if (m_allowGridGods) 491 if (m_allowGridGods)
481 { 492 {
482 CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user); 493 UserAccount account = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, user);
483 if (profile != null && profile.UserProfile != null) 494 if (account != null)
484 { 495 {
485 if (profile.UserProfile.GodLevel >= 200) 496 if (account.UserLevel >= 200)
486 return true; 497 return true;
487 } 498 }
488 } 499 }
@@ -499,13 +510,10 @@ namespace OpenSim.Region.CoreModules.World.Permissions
499 if (m_friendsModule == null) 510 if (m_friendsModule == null)
500 return false; 511 return false;
501 512
502 List<FriendListItem> profile = m_friendsModule.GetUserFriends(user); 513 uint friendPerms = m_friendsModule.GetFriendPerms(user, objectOwner);
514 if ((friendPerms & (uint)FriendRights.CanModifyObjects) != 0)
515 return true;
503 516
504 foreach (FriendListItem item in profile)
505 {
506 if (item.Friend == objectOwner && (item.FriendPerms & (uint)FriendRights.CanModifyObjects) != 0)
507 return true;
508 }
509 return false; 517 return false;
510 } 518 }
511 519
@@ -1011,9 +1019,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1011 IInventoryService invService = m_scene.InventoryService; 1019 IInventoryService invService = m_scene.InventoryService;
1012 InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user); 1020 InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user);
1013 assetRequestItem = invService.GetItem(assetRequestItem); 1021 assetRequestItem = invService.GetItem(assetRequestItem);
1014 if (assetRequestItem == null) // Library item 1022 if (assetRequestItem == null && LibraryRootFolder != null) // Library item
1015 { 1023 {
1016 assetRequestItem = scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard); 1024 assetRequestItem = LibraryRootFolder.FindItem(notecard);
1017 1025
1018 if (assetRequestItem != null) // Implicitly readable 1026 if (assetRequestItem != null) // Implicitly readable
1019 return true; 1027 return true;
@@ -1431,9 +1439,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1431 IInventoryService invService = m_scene.InventoryService; 1439 IInventoryService invService = m_scene.InventoryService;
1432 InventoryItemBase assetRequestItem = new InventoryItemBase(script, user); 1440 InventoryItemBase assetRequestItem = new InventoryItemBase(script, user);
1433 assetRequestItem = invService.GetItem(assetRequestItem); 1441 assetRequestItem = invService.GetItem(assetRequestItem);
1434 if (assetRequestItem == null) // Library item 1442 if (assetRequestItem == null && LibraryRootFolder != null) // Library item
1435 { 1443 {
1436 assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(script); 1444 assetRequestItem = LibraryRootFolder.FindItem(script);
1437 1445
1438 if (assetRequestItem != null) // Implicitly readable 1446 if (assetRequestItem != null) // Implicitly readable
1439 return true; 1447 return true;
@@ -1526,9 +1534,9 @@ namespace OpenSim.Region.CoreModules.World.Permissions
1526 IInventoryService invService = m_scene.InventoryService; 1534 IInventoryService invService = m_scene.InventoryService;
1527 InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user); 1535 InventoryItemBase assetRequestItem = new InventoryItemBase(notecard, user);
1528 assetRequestItem = invService.GetItem(assetRequestItem); 1536 assetRequestItem = invService.GetItem(assetRequestItem);
1529 if (assetRequestItem == null) // Library item 1537 if (assetRequestItem == null && LibraryRootFolder != null) // Library item
1530 { 1538 {
1531 assetRequestItem = m_scene.CommsManager.UserProfileCacheService.LibraryRoot.FindItem(notecard); 1539 assetRequestItem = LibraryRootFolder.FindItem(notecard);
1532 1540
1533 if (assetRequestItem != null) // Implicitly readable 1541 if (assetRequestItem != null) // Implicitly readable
1534 return true; 1542 return true;
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
index be46fa5..56b50dc 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
@@ -32,7 +32,6 @@ using OpenMetaverse;
32using OpenSim.Framework; 32using OpenSim.Framework;
33using OpenSim.Region.Framework.Interfaces; 33using OpenSim.Region.Framework.Interfaces;
34using OpenSim.Region.Framework.Scenes; 34using OpenSim.Region.Framework.Scenes;
35using OpenSim.Region.Framework.Scenes.Hypergrid;
36using OpenSim.Services.Interfaces; 35using OpenSim.Services.Interfaces;
37using GridRegion = OpenSim.Services.Interfaces.GridRegion; 36using GridRegion = OpenSim.Services.Interfaces.GridRegion;
38 37
@@ -104,25 +103,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
104 if (info != null) regionInfos.Add(info); 103 if (info != null) regionInfos.Add(info);
105 } 104 }
106 105
107 if ((regionInfos.Count == 0) && IsHypergridOn())
108 {
109 // OK, we tried but there are no regions matching that name.
110 // Let's check quickly if this is a domain name, and if so link to it
111 if (mapName.Contains("."))
112 {
113 // It probably is a domain name. Try to link to it.
114 GridRegion regInfo;
115 Scene cScene = GetClientScene(remoteClient);
116 IHyperlinkService hyperService = cScene.RequestModuleInterface<IHyperlinkService>();
117 if (hyperService != null)
118 {
119 regInfo = hyperService.TryLinkRegion(remoteClient, mapName);
120 if (regInfo != null)
121 regionInfos.Add(regInfo);
122 }
123 }
124 }
125
126 List<MapBlockData> blocks = new List<MapBlockData>(); 106 List<MapBlockData> blocks = new List<MapBlockData>();
127 107
128 MapBlockData data; 108 MapBlockData data;
@@ -158,11 +138,6 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
158 remoteClient.SendMapBlock(blocks, 0); 138 remoteClient.SendMapBlock(blocks, 0);
159 } 139 }
160 140
161 private bool IsHypergridOn()
162 {
163 return (m_scene.SceneGridService is HGSceneCommunicationService);
164 }
165
166 private Scene GetClientScene(IClientAPI client) 141 private Scene GetClientScene(IClientAPI client)
167 { 142 {
168 foreach (Scene s in m_scenes) 143 foreach (Scene s in m_scenes)