aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
diff options
context:
space:
mode:
authorDiva Canto2011-06-03 09:04:34 -0700
committerDiva Canto2011-06-03 09:04:34 -0700
commit995b893e4c7c89db8fc044e3f8524229490fb220 (patch)
tree408cee6b9352601ae0a4553ccc71dd6a1b094e83 /OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
parentMoved CreateNewInventoryItem to the InventoryAccessModule in preparation for ... (diff)
downloadopensim-SC_OLD-995b893e4c7c89db8fc044e3f8524229490fb220.zip
opensim-SC_OLD-995b893e4c7c89db8fc044e3f8524229490fb220.tar.gz
opensim-SC_OLD-995b893e4c7c89db8fc044e3f8524229490fb220.tar.bz2
opensim-SC_OLD-995b893e4c7c89db8fc044e3f8524229490fb220.tar.xz
HG Landmarks being created. WARNING: new config var under [HGInventoryAccessModule], Gatekeeper.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs7
1 files changed, 5 insertions, 2 deletions
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,