Bring us up to date.

author: Tom 2011-09-14 19:11:32 -0700
committer: Tom 2011-09-14 19:11:32 -0700
commit: 5484c9b585a2a6289456e9492ac2989d489b555c (patch)
tree: c9b79199722fe09c993c237dce40febf731264e3 /OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
parent: Merge fixes, and fix the build (diff)
parent: Don't try and delete attachments for child agent close (diff)
download: opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.zip
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.gz
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.bz2
opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.xz
1 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
index 4e60ca9..ceb7905 100644
--- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -88,8 +88,7 @@ namespace OpenSim.Tests.Common
            if (type == InventoryType.Notecard)
                asset = AssetHelpers.CreateAsset(scene, userId);
            else if (type == InventoryType.Object)
-                asset
+                asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
-                    = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
            else
                throw new Exception(string.Format("Inventory type {0} not supported", type));
author	Tom	2011-09-14 19:11:32 -0700
committer	Tom	2011-09-14 19:11:32 -0700
commit	5484c9b585a2a6289456e9492ac2989d489b555c (patch)
tree	c9b79199722fe09c993c237dce40febf731264e3 /OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
parent	Merge fixes, and fix the build (diff)
parent	Don't try and delete attachments for child agent close (diff)
download	opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.zip opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.gz opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.bz2 opensim-SC_OLD-5484c9b585a2a6289456e9492ac2989d489b555c.tar.xz

diff --git a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs index 4e60ca9..ceb7905 100644 --- a/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs +++ b/OpenSim/Tests/Common/Helpers/UserInventoryHelpers.cs
@@ -88,8 +88,7 @@ namespace OpenSim.Tests.Common
88	if (type == InventoryType.Notecard)	88	if (type == InventoryType.Notecard)
89	asset = AssetHelpers.CreateAsset(scene, userId);	89	asset = AssetHelpers.CreateAsset(scene, userId);
90	else if (type == InventoryType.Object)	90	else if (type == InventoryType.Object)
91	asset	91	asset = AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
92	= AssetHelpers.CreateAsset(assetId, SceneHelpers.CreateSceneObject(1, userId));
93	else	92	else
94	throw new Exception(string.Format("Inventory type {0} not supported", type));	93	throw new Exception(string.Format("Inventory type {0} not supported", type));
95		94