diff --git a/libsecondlife-cs/Types.cs b/libsecondlife-cs/Types.cs
index bf68c304..49835c35 100644
--- a/libsecondlife-cs/Types.cs
+++ b/libsecondlife-cs/Types.cs
@@ -29,104 +29,13 @@ using System.Net;
namespace libsecondlife
{
- /*public class U64
- {
- public uint[] Data;
-
- public U64()
- {
- Data = new uint[2];
- Data[0] = 0;
- Data[1] = 1;
- }
-
- public U64(uint left, uint right)
- {
- Data = new uint[2];
- // "backwards", due to little-endian ordering
- Data[0] = right;
- Data[1] = left;
- }
-
- public U64(int left, int right)
- {
- Data = new uint[2];
- // "backwards", due to little-endian ordering
- Data[0] = (uint)right;
- Data[1] = (uint)left;
- }
-
- public U64(byte[] bA, int pos)
- {
- Data = new uint[2];
- Data[0] = (uint)(bA[pos] + (bA[pos+1]<<8) + (bA[pos+2]<<16) + (bA[pos+3]<<24));
- Data[1] = (uint)(bA[pos+4] + (bA[pos+5]<<8) + (bA[pos+6]<<16) + (bA[pos+7]<<24));
- }
-
- public byte[] GetBytes()
- {
- byte[] bA = new byte[8];
-
- bA[0]=(byte)((Data[0]) %256); bA[1]=(byte)((Data[0]>>8) %256);
- bA[2]=(byte)((Data[0]>>16)%256); bA[3]=(byte)((Data[0]>>24)%256);
- bA[4]=(byte)((Data[1]) %256); bA[5]=(byte)((Data[1]>>8) %256);
- bA[6]=(byte)((Data[1]>>16)%256); bA[7]=(byte)((Data[1]>>24)%256);
-
- return bA;
- }
-
- public override int GetHashCode()
- {
- return (int)(Data[0] ^ Data[1]);
- }
-
- public override bool Equals(object o)
- {
- if (!(o is U64)) return false;
-
- U64 u64 = (U64)o;
-
- return (u64.Data[0] == Data[0] && u64.Data[1] == Data[1]);
- }
-
- public static bool operator==(U64 lhs, U64 rhs)
- {
- if(object.ReferenceEquals(lhs, rhs)) return true;
- if(object.ReferenceEquals(lhs, null)) return false;
- if(object.ReferenceEquals(rhs, null)) return false;
-
- return (lhs.Data[0] == rhs.Data[0] && lhs.Data[1] == rhs.Data[1]);
- }
-
- public static bool operator!=(U64 lhs, U64 rhs)
- {
- return !(lhs == rhs);
- }
-
- public static bool operator==(U64 lhs, int rhs)
- {
- if(object.ReferenceEquals(lhs, null)) return (rhs == 0);
- return (lhs.Data[0] == 0 && lhs.Data[1] == rhs);
- }
-
- public static bool operator!=(U64 lhs, int rhs)
- {
- return !(lhs == rhs);
- }
-
- public override string ToString()
- {
- ulong u64 = (Data[1] << 32) + Data[0];
- return u64.ToString();
- }
- }*/
-
///
- ///
+ /// A 128-bit Universally Unique Identifier, used throughout the Second
+ /// Life networking protocol
///
public class LLUUID
{
- ///
+ /// Get a byte array of the 16 raw bytes making up the UUID
public byte[] Data
{
get { return data; }
@@ -284,8 +193,11 @@ namespace libsecondlife
public static LLUUID operator ^(LLUUID lhs, LLUUID rhs)
{
LLUUID returnUUID = new LLUUID();
+
for (int count = 0; count < returnUUID.Data.Length; count++)
- returnUUID.Data[count] = lhs.Data[count] ^ rhs.Data[count];
+ {
+ returnUUID.Data[count] = (byte)(lhs.Data[count] ^ rhs.Data[count]);
+ }
return returnUUID;
}
diff --git a/libsecondlife-cs/examples/groupmanager/frmGroupInfo.cs b/libsecondlife-cs/examples/groupmanager/frmGroupInfo.cs
index 998410b4..876e988e 100644
--- a/libsecondlife-cs/examples/groupmanager/frmGroupInfo.cs
+++ b/libsecondlife-cs/examples/groupmanager/frmGroupInfo.cs
@@ -73,7 +73,6 @@ namespace groupmanager
chkFee.Checked = (Profile.MembershipFee != 0);
numFee.Value = Profile.MembershipFee;
chkMature.Checked = Profile.MaturePublish;
- lblMemberTitle.Text = Profile.MemberTitle;
Client.Avatars.BeginGetAvatarName(Profile.FounderID, new AgentNamesCallback(AgentNamesHandler));
}
diff --git a/libsecondlife-cs/examples/groupmanager/groupmanager.csproj b/libsecondlife-cs/examples/groupmanager/groupmanager.csproj
index 45fb2575..63c8f8dd 100644
--- a/libsecondlife-cs/examples/groupmanager/groupmanager.csproj
+++ b/libsecondlife-cs/examples/groupmanager/groupmanager.csproj
@@ -73,7 +73,6 @@
prompt
-
System
@@ -89,6 +88,10 @@
System.XML
+
+ {7D4C4807-7705-48A7-9D82-F6689FBBCC8B}
+ libjaspernet
+
libsecondlife
{D9CDEDFB-8169-4B03-B57F-0DF638F044EC}
@@ -130,4 +133,4 @@
-
+
\ No newline at end of file
diff --git a/libsecondlife-cs/libsecondlife.sln b/libsecondlife-cs/libsecondlife.sln
index 316b7605..29de15c0 100644
--- a/libsecondlife-cs/libsecondlife.sln
+++ b/libsecondlife-cs/libsecondlife.sln
@@ -34,6 +34,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "groupmanager", "examples\gr
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationSample", "examples\AnimationSample\AnimationSample.csproj", "{4EF98AD4-B3B3-42B0-9273-13A614A823F7}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "libjaspernet", "..\libjaspernet\libjaspernet.csproj", "{7D4C4807-7705-48A7-9D82-F6689FBBCC8B}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -108,6 +110,10 @@ Global
{4EF98AD4-B3B3-42B0-9273-13A614A823F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4EF98AD4-B3B3-42B0-9273-13A614A823F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4EF98AD4-B3B3-42B0-9273-13A614A823F7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7D4C4807-7705-48A7-9D82-F6689FBBCC8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7D4C4807-7705-48A7-9D82-F6689FBBCC8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7D4C4807-7705-48A7-9D82-F6689FBBCC8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7D4C4807-7705-48A7-9D82-F6689FBBCC8B}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE