aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs15
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs7
2 files changed, 20 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index 429dda7..844054c 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -56,6 +56,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
56 56
57 private string m_ProfileServerURI; 57 private string m_ProfileServerURI;
58 private bool m_OutboundPermission; 58 private bool m_OutboundPermission;
59 private string m_ThisGatekeeper;
59 60
60// private bool m_Initialized = false; 61// private bool m_Initialized = false;
61 62
@@ -85,6 +86,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
85 { 86 {
86 m_ProfileServerURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty); 87 m_ProfileServerURI = thisModuleConfig.GetString("ProfileServerURI", string.Empty);
87 m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true); 88 m_OutboundPermission = thisModuleConfig.GetBoolean("OutboundPermission", true);
89 m_ThisGatekeeper = thisModuleConfig.GetString("Gatekeeper", string.Empty);
88 } 90 }
89 else 91 else
90 m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!"); 92 m_log.Warn("[HG INVENTORY ACCESS MODULE]: HGInventoryAccessModule configs not found. ProfileServerURI not set!");
@@ -119,6 +121,19 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
119 #endregion 121 #endregion
120 122
121 #region Overrides of Basic Inventory Access methods 123 #region Overrides of Basic Inventory Access methods
124
125 protected override string GenerateLandmark(ScenePresence presence, out string suffix)
126 {
127 suffix = " @ " + m_ThisGatekeeper;
128 Vector3 pos = presence.AbsolutePosition;
129 return String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\ngatekeeper {5}",
130 presence.Scene.RegionInfo.RegionID,
131 pos.X, pos.Y, pos.Z,
132 presence.RegionHandle,
133 m_ThisGatekeeper);
134 }
135
136
122 /// 137 ///
123 /// CapsUpdateInventoryItemAsset 138 /// CapsUpdateInventoryItemAsset
124 /// 139 ///
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index 641a042..d441aa4 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -196,8 +196,10 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
196 196
197 if (invType == (sbyte)InventoryType.Landmark && presence != null) 197 if (invType == (sbyte)InventoryType.Landmark && presence != null)
198 { 198 {
199 string strdata = GenerateLandmark(presence); 199 string suffix = string.Empty;
200 string strdata = GenerateLandmark(presence, out suffix);
200 data = Encoding.ASCII.GetBytes(strdata); 201 data = Encoding.ASCII.GetBytes(strdata);
202 description += suffix;
201 } 203 }
202 204
203 AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId); 205 AssetBase asset = m_Scene.CreateAsset(name, description, assetType, data, remoteClient.AgentId);
@@ -224,8 +226,9 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
224 } 226 }
225 } 227 }
226 228
227 protected virtual string GenerateLandmark(ScenePresence presence) 229 protected virtual string GenerateLandmark(ScenePresence presence, out string suffix)
228 { 230 {
231 suffix = string.Empty;
229 Vector3 pos = presence.AbsolutePosition; 232 Vector3 pos = presence.AbsolutePosition;
230 return String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\n", 233 return String.Format("Landmark version 2\nregion_id {0}\nlocal_pos {1} {2} {3}\nregion_handle {4}\n",
231 presence.Scene.RegionInfo.RegionID, 234 presence.Scene.RegionInfo.RegionID,