diff options
author | Justin Clark-Casey (justincc) | 2009-12-04 18:26:58 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2009-12-04 18:26:58 +0000 |
commit | c0f3a4c8332f235e998714214011c5412bdcacf0 (patch) | |
tree | 78838e69a71b5a3d76d320161ba89111d156665a /OpenSim/Region/Framework | |
parent | * Clarifies that the PrimMaxPhys in OpenSim.ini.example does nothing. Tells ... (diff) | |
download | opensim-SC_OLD-c0f3a4c8332f235e998714214011c5412bdcacf0.zip opensim-SC_OLD-c0f3a4c8332f235e998714214011c5412bdcacf0.tar.gz opensim-SC_OLD-c0f3a4c8332f235e998714214011c5412bdcacf0.tar.bz2 opensim-SC_OLD-c0f3a4c8332f235e998714214011c5412bdcacf0.tar.xz |
Allow terrain heightmaps to be loaded directly from URIs via the remote admin plugin
See http://opensimulator.org/mantis/view.php?id=4418
Thanks StrawberryFride
See
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs index 2dcba0c..7caac55 100644 --- a/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainModule.cs | |||
@@ -51,7 +51,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
51 | /// </param> | 51 | /// </param> |
52 | /// <param name="stream"></param> | 52 | /// <param name="stream"></param> |
53 | void LoadFromStream(string filename, Stream stream); | 53 | void LoadFromStream(string filename, Stream stream); |
54 | 54 | void LoadFromStream(string filename, System.Uri pathToTerrainHeightmap); | |
55 | /// <summary> | 55 | /// <summary> |
56 | /// Save a terrain to a stream. | 56 | /// Save a terrain to a stream. |
57 | /// </summary> | 57 | /// </summary> |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 09d02f4..0b0c205 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -2393,6 +2393,12 @@ namespace OpenSim.Region.Framework.Scenes | |||
2393 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); | 2393 | InventoryItemBase item = new InventoryItemBase(itemID, remoteClient.AgentId); |
2394 | item = InventoryService.GetItem(item); | 2394 | item = InventoryService.GetItem(item); |
2395 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); | 2395 | presence.Appearance.SetAttachment((int)AttachmentPt, itemID, item.AssetID /*att.UUID*/); |
2396 | |||
2397 | if (m_AvatarFactory != null) | ||
2398 | { | ||
2399 | m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance); | ||
2400 | } | ||
2401 | |||
2396 | } | 2402 | } |
2397 | } | 2403 | } |
2398 | 2404 | ||