diff --git a/libsecondlife-cs/VisualParamGenerator/VisualParamGenerator.cs b/libsecondlife-cs/VisualParamGenerator/VisualParamGenerator.cs
index f63393e8..c49fb80e 100644
--- a/libsecondlife-cs/VisualParamGenerator/VisualParamGenerator.cs
+++ b/libsecondlife-cs/VisualParamGenerator/VisualParamGenerator.cs
@@ -38,7 +38,7 @@ namespace VisualParamGenerator
bool first = true;
output.Write("using System;" + Environment.NewLine + Environment.NewLine);
- output.Write("namespace libsecondlife.Utilities.Appearance" + Environment.NewLine);
+ output.Write("namespace libsecondlife" + Environment.NewLine);
output.Write("{" + Environment.NewLine);
output.Write(" public static class VisualParams" + Environment.NewLine);
output.Write(" {" + Environment.NewLine);
diff --git a/libsecondlife-cs/libsecondlife.Utilities/_VisualParam_.cs b/libsecondlife-cs/_VisualParam_.cs
similarity index 92%
rename from libsecondlife-cs/libsecondlife.Utilities/_VisualParam_.cs
rename to libsecondlife-cs/_VisualParam_.cs
index b477cbb1..7e2b29da 100644
--- a/libsecondlife-cs/libsecondlife.Utilities/_VisualParam_.cs
+++ b/libsecondlife-cs/_VisualParam_.cs
@@ -1,9 +1,67 @@
using System;
-namespace libsecondlife.Utilities.Appearance
+namespace libsecondlife
{
+ ///
+ /// A single visual characteristic of an avatar mesh, such as eyebrow height
+ ///
+ public struct VisualParam
+ {
+ /// Index of this visual param
+ public int ParamID;
+ /// Internal name
+ public string Name;
+ /// Group ID this parameter belongs to
+ public int Group;
+ /// Name of the wearable this parameter belongs to
+ public string Wearable;
+ /// Displayable label of this characteristic
+ public string Label;
+ /// Displayable label for the minimum value of this characteristic
+ public string LabelMin;
+ /// Displayable label for the maximum value of this characteristic
+ public string LabelMax;
+ /// Default value
+ public float DefaultValue;
+ /// Minimum value
+ public float MinValue;
+ /// Maximum value
+ public float MaxValue;
+
+ ///
+ /// Set all the values through the constructor
+ ///
+ /// Index of this visual param
+ /// Internal name
+ ///
+ ///
+ /// Displayable label of this characteristic
+ /// Displayable label for the minimum value of this characteristic
+ /// Displayable label for the maximum value of this characteristic
+ /// Default value
+ /// Minimum value
+ /// Maximum value
+ public VisualParam(int paramID, string name, int group, string wearable, string label, string labelMin, string labelMax, float def, float min, float max)
+ {
+ ParamID = paramID;
+ Name = name;
+ Group = group;
+ Wearable = wearable;
+ Label = label;
+ LabelMin = labelMin;
+ LabelMax = labelMax;
+ DefaultValue = def;
+ MaxValue = max;
+ MinValue = min;
+ }
+ }
+
+ ///
+ /// Holds the Params array of all the avatar appearance parameters
+ ///
public static class VisualParams
{
+ /// Array of all the visual parameters available for avatar appearances
public static VisualParam[] Params = new VisualParam[]
{
new VisualParam(32, "Male_Skeleton", 1, "shape", "", "Female", "Male", 0f, 0f, 1f),
diff --git a/libsecondlife-cs/libsecondlife.Utilities/Appearance.cs b/libsecondlife-cs/libsecondlife.Utilities/Appearance.cs
index f342df79..c76d82be 100644
--- a/libsecondlife-cs/libsecondlife.Utilities/Appearance.cs
+++ b/libsecondlife-cs/libsecondlife.Utilities/Appearance.cs
@@ -75,61 +75,6 @@ namespace libsecondlife.Utilities.Appearance
};
- ///
- /// A single visual characteristic of an avatar mesh, such as eyebrow height
- ///
- public struct VisualParam
- {
- /// Index of this visual param
- public int ParamID;
- /// Internal name
- public string Name;
- /// Group ID this parameter belongs to
- public int Group;
- /// Name of the wearable this parameter belongs to
- public string Wearable;
- /// Displayable label of this characteristic
- public string Label;
- /// Displayable label for the minimum value of this characteristic
- public string LabelMin;
- /// Displayable label for the maximum value of this characteristic
- public string LabelMax;
- /// Default value
- public float Default;
- /// Minimum value
- public float Min;
- /// Maximum value
- public float Max;
-
- ///
- /// Set all the values through the constructor
- ///
- /// Index of this visual param
- /// Internal name
- ///
- ///
- /// Displayable label of this characteristic
- /// Displayable label for the minimum value of this characteristic
- /// Displayable label for the maximum value of this characteristic
- /// Default value
- /// Minimum value
- /// Maximum value
- public VisualParam(int paramID, string name, int group, string wearable, string label, string labelMin, string labelMax, float def, float min, float max)
- {
- ParamID = paramID;
- Name = name;
- Group = group;
- Wearable = wearable;
- Label = label;
- LabelMin = labelMin;
- LabelMax = labelMax;
- Default = def;
- Max = max;
- Min = min;
- }
- }
-
-
///
///
///
diff --git a/libsecondlife-cs/libsecondlife.Utilities/libsecondlife.Utilities.csproj b/libsecondlife-cs/libsecondlife.Utilities/libsecondlife.Utilities.csproj
index f38b31a5..a71ad400 100644
--- a/libsecondlife-cs/libsecondlife.Utilities/libsecondlife.Utilities.csproj
+++ b/libsecondlife-cs/libsecondlife.Utilities/libsecondlife.Utilities.csproj
@@ -37,7 +37,6 @@
-
diff --git a/libsecondlife-cs/libsecondlife.csproj b/libsecondlife-cs/libsecondlife.csproj
index 14759f9b..e53d13ad 100644
--- a/libsecondlife-cs/libsecondlife.csproj
+++ b/libsecondlife-cs/libsecondlife.csproj
@@ -218,6 +218,7 @@
Code
+