diff options
author | Diva Canto | 2013-06-11 15:36:52 -0700 |
---|---|---|
committer | Diva Canto | 2013-06-11 15:36:52 -0700 |
commit | a0fed03e1012f76195ac6fd02912bf5979b9a27f (patch) | |
tree | 898336047dd123c2603a69d56666c50f18a2b01c /OpenSim/Region/CoreModules | |
parent | Really bad idea to lock m_UserCache for so long in UserManagementModule. Adde... (diff) | |
parent | Put the "script saved" and "notecard saved" messages back into the bottom (diff) | |
download | opensim-SC-a0fed03e1012f76195ac6fd02912bf5979b9a27f.zip opensim-SC-a0fed03e1012f76195ac6fd02912bf5979b9a27f.tar.gz opensim-SC-a0fed03e1012f76195ac6fd02912bf5979b9a27f.tar.bz2 opensim-SC-a0fed03e1012f76195ac6fd02912bf5979b9a27f.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/CoreModules')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs | 20 |
2 files changed, 22 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs index 880205a..1203192 100644 --- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs +++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||
@@ -260,7 +260,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
260 | return UUID.Zero; | 260 | return UUID.Zero; |
261 | } | 261 | } |
262 | 262 | ||
263 | remoteClient.SendAgentAlertMessage("Notecard saved", false); | 263 | remoteClient.SendAlertMessage("Notecard saved"); |
264 | } | 264 | } |
265 | else if ((InventoryType)item.InvType == InventoryType.LSL) | 265 | else if ((InventoryType)item.InvType == InventoryType.LSL) |
266 | { | 266 | { |
@@ -270,7 +270,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess | |||
270 | return UUID.Zero; | 270 | return UUID.Zero; |
271 | } | 271 | } |
272 | 272 | ||
273 | remoteClient.SendAgentAlertMessage("Script saved", false); | 273 | remoteClient.SendAlertMessage("Script saved"); |
274 | } | 274 | } |
275 | 275 | ||
276 | AssetBase asset = | 276 | AssetBase asset = |
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs index 1982473..7073433 100644 --- a/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs +++ b/OpenSim/Region/CoreModules/ServiceConnectorsOut/Asset/Tests/AssetConnectorTests.cs | |||
@@ -93,7 +93,9 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests | |||
93 | LocalAssetServicesConnector lasc = new LocalAssetServicesConnector(); | 93 | LocalAssetServicesConnector lasc = new LocalAssetServicesConnector(); |
94 | lasc.Initialise(config); | 94 | lasc.Initialise(config); |
95 | 95 | ||
96 | // If it is local, it should not be stored | ||
96 | AssetBase a1 = AssetHelpers.CreateNotecardAsset(); | 97 | AssetBase a1 = AssetHelpers.CreateNotecardAsset(); |
98 | a1.Local = true; | ||
97 | a1.Temporary = true; | 99 | a1.Temporary = true; |
98 | 100 | ||
99 | lasc.Store(a1); | 101 | lasc.Store(a1); |
@@ -102,6 +104,24 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset.Tests | |||
102 | Assert.That(lasc.GetData(a1.ID), Is.Null); | 104 | Assert.That(lasc.GetData(a1.ID), Is.Null); |
103 | Assert.That(lasc.GetMetadata(a1.ID), Is.Null); | 105 | Assert.That(lasc.GetMetadata(a1.ID), Is.Null); |
104 | 106 | ||
107 | // If it is remote, it should be stored | ||
108 | // AssetBase a2 = AssetHelpers.CreateNotecardAsset(); | ||
109 | // a2.Local = false; | ||
110 | // a2.Temporary = true; | ||
111 | |||
112 | // lasc.Store(a2); | ||
113 | |||
114 | // AssetBase retreivedA2 = lasc.Get(a2.ID); | ||
115 | // Assert.That(retreivedA2.ID, Is.EqualTo(a2.ID)); | ||
116 | // Assert.That(retreivedA2.Metadata.ID, Is.EqualTo(a2.Metadata.ID)); | ||
117 | // Assert.That(retreivedA2.Data.Length, Is.EqualTo(a2.Data.Length)); | ||
118 | |||
119 | // AssetMetadata retrievedA2Metadata = lasc.GetMetadata(a2.ID); | ||
120 | // Assert.That(retrievedA2Metadata.ID, Is.EqualTo(a2.ID)); | ||
121 | |||
122 | // byte[] retrievedA2Data = lasc.GetData(a2.ID); | ||
123 | // Assert.That(retrievedA2Data.Length, Is.EqualTo(a2.Data.Length)); | ||
124 | |||
105 | // TODO: Add cache and check that this does receive a copy of the asset | 125 | // TODO: Add cache and check that this does receive a copy of the asset |
106 | } | 126 | } |
107 | 127 | ||