aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-10-25 03:18:53 +0100
committerMelanie2011-10-25 03:18:53 +0100
commitde8cdbda151c7664e7b341f872854db316c6f3aa (patch)
tree0ebad80ee11aecc05fcfb2f211fd0e306d605609
parentMerge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge (diff)
parentcorrect misleading method doc on CreateNotecardAsset() (diff)
downloadopensim-SC_OLD-de8cdbda151c7664e7b341f872854db316c6f3aa.zip
opensim-SC_OLD-de8cdbda151c7664e7b341f872854db316c6f3aa.tar.gz
opensim-SC_OLD-de8cdbda151c7664e7b341f872854db316c6f3aa.tar.bz2
opensim-SC_OLD-de8cdbda151c7664e7b341f872854db316c6f3aa.tar.xz
Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge
-rw-r--r--OpenSim/Tests/Common/Helpers/AssetHelpers.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
index 94d3629..f5db0f7 100644
--- a/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
+++ b/OpenSim/Tests/Common/Helpers/AssetHelpers.cs
@@ -49,7 +49,7 @@ namespace OpenSim.Tests.Common
49 /// <summary> 49 /// <summary>
50 /// Create a notecard asset with a random uuid and dummy text. 50 /// Create a notecard asset with a random uuid and dummy text.
51 /// </summary> 51 /// </summary>
52 /// <param name="creatorId">/param> 52 /// <param name="assetId">/param>
53 /// <returns></returns> 53 /// <returns></returns>
54 public static AssetBase CreateNotecardAsset(UUID id) 54 public static AssetBase CreateNotecardAsset(UUID id)
55 { 55 {