* Changed a few OSD.FromBinary() calls to the more accurate OSD.FromULong() to fix the build

author: John Hurliman 2010-08-17 13:50:04 -0700
committer: John Hurliman 2010-08-17 13:50:04 -0700
commit: a8c0b131f9aa62d4b6260fd37f89014e55b457cf (patch)
tree: f0af68b59debfc262f70716fb5c4e659a15c1f72
parent: * Updated to OpenMetaverse.StructuredData.dll that includes implicit typecast... (diff)
download: opensim-SC_OLD-a8c0b131f9aa62d4b6260fd37f89014e55b457cf.zip
opensim-SC_OLD-a8c0b131f9aa62d4b6260fd37f89014e55b457cf.tar.gz
opensim-SC_OLD-a8c0b131f9aa62d4b6260fd37f89014e55b457cf.tar.bz2
opensim-SC_OLD-a8c0b131f9aa62d4b6260fd37f89014e55b457cf.tar.xz
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index bb9e6d4..1d3bdf3 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3033,7 +3033,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
             {
                 OSDMap GroupDataMap = new OSDMap(6);
                 OSDMap NewGroupDataMap = new OSDMap(1);
-                 GroupDataMap.Add("GroupPowers", OSD.FromBinary(m.GroupPowers));
+                 GroupDataMap.Add("GroupPowers", OSD.FromULong(m.GroupPowers));
                 GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(m.AcceptNotices));
                 GroupDataMap.Add("GroupTitle", OSD.FromString(m.GroupTitle));
                 GroupDataMap.Add("GroupID", OSD.FromUUID(m.GroupID));
diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
index 53a2a7d..e9bcae3 100644
--- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
+++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
            info.Add("SimAccess", OSD.FromInteger(simAccess));
            info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));
            info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port));
-            info.Add("TeleportFlags", OSD.FromBinary(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
+            info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
            OSDArray infoArr = new OSDArray();
            infoArr.Add(info);
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
index 3f15b69..2969503 100644
--- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
+++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1129,7 +1129,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
                OSDMap NewGroupDataMap = new OSDMap(1);
                GroupDataMap.Add("GroupID", OSD.FromUUID(membership.GroupID));
-                GroupDataMap.Add("GroupPowers", OSD.FromBinary(membership.GroupPowers));
+                GroupDataMap.Add("GroupPowers", OSD.FromULong(membership.GroupPowers));
                GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(membership.AcceptNotices));
                GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(membership.GroupPicture));
                GroupDataMap.Add("Contribution", OSD.FromInteger(membership.Contribution));
author	John Hurliman	2010-08-17 13:50:04 -0700
committer	John Hurliman	2010-08-17 13:50:04 -0700
commit	a8c0b131f9aa62d4b6260fd37f89014e55b457cf (patch)
tree	f0af68b59debfc262f70716fb5c4e659a15c1f72
parent	* Updated to OpenMetaverse.StructuredData.dll that includes implicit typecast... (diff)
download	opensim-SC_OLD-a8c0b131f9aa62d4b6260fd37f89014e55b457cf.zip opensim-SC_OLD-a8c0b131f9aa62d4b6260fd37f89014e55b457cf.tar.gz opensim-SC_OLD-a8c0b131f9aa62d4b6260fd37f89014e55b457cf.tar.bz2 opensim-SC_OLD-a8c0b131f9aa62d4b6260fd37f89014e55b457cf.tar.xz

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index bb9e6d4..1d3bdf3 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -3033,7 +3033,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
3033	{	3033	{
3034	OSDMap GroupDataMap = new OSDMap(6);	3034	OSDMap GroupDataMap = new OSDMap(6);
3035	OSDMap NewGroupDataMap = new OSDMap(1);	3035	OSDMap NewGroupDataMap = new OSDMap(1);
3036	GroupDataMap.Add("GroupPowers", OSD.FromBinary(m.GroupPowers));	3036	GroupDataMap.Add("GroupPowers", OSD.FromULong(m.GroupPowers));
3037	GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(m.AcceptNotices));	3037	GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(m.AcceptNotices));
3038	GroupDataMap.Add("GroupTitle", OSD.FromString(m.GroupTitle));	3038	GroupDataMap.Add("GroupTitle", OSD.FromString(m.GroupTitle));
3039	GroupDataMap.Add("GroupID", OSD.FromUUID(m.GroupID));	3039	GroupDataMap.Add("GroupID", OSD.FromUUID(m.GroupID));


diff --git a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs index 53a2a7d..e9bcae3 100644 --- a/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs +++ b/OpenSim/Region/CoreModules/Framework/EventQueue/EventQueueHelper.cs
@@ -158,7 +158,7 @@ namespace OpenSim.Region.CoreModules.Framework.EventQueue
158	info.Add("SimAccess", OSD.FromInteger(simAccess));	158	info.Add("SimAccess", OSD.FromInteger(simAccess));
159	info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));	159	info.Add("SimIP", OSD.FromBinary(regionExternalEndPoint.Address.GetAddressBytes()));
160	info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port));	160	info.Add("SimPort", OSD.FromInteger(regionExternalEndPoint.Port));
161	info.Add("TeleportFlags", OSD.FromBinary(1L << 4)); // AgentManager.TeleportFlags.ViaLocation	161	info.Add("TeleportFlags", OSD.FromULong(1L << 4)); // AgentManager.TeleportFlags.ViaLocation
162		162
163	OSDArray infoArr = new OSDArray();	163	OSDArray infoArr = new OSDArray();
164	infoArr.Add(info);	164	infoArr.Add(info);


diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs index 3f15b69..2969503 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/GroupsModule.cs
@@ -1129,7 +1129,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups
1129	OSDMap NewGroupDataMap = new OSDMap(1);	1129	OSDMap NewGroupDataMap = new OSDMap(1);
1130		1130
1131	GroupDataMap.Add("GroupID", OSD.FromUUID(membership.GroupID));	1131	GroupDataMap.Add("GroupID", OSD.FromUUID(membership.GroupID));
1132	GroupDataMap.Add("GroupPowers", OSD.FromBinary(membership.GroupPowers));	1132	GroupDataMap.Add("GroupPowers", OSD.FromULong(membership.GroupPowers));
1133	GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(membership.AcceptNotices));	1133	GroupDataMap.Add("AcceptNotices", OSD.FromBoolean(membership.AcceptNotices));
1134	GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(membership.GroupPicture));	1134	GroupDataMap.Add("GroupInsigniaID", OSD.FromUUID(membership.GroupPicture));
1135	GroupDataMap.Add("Contribution", OSD.FromInteger(membership.Contribution));	1135	GroupDataMap.Add("Contribution", OSD.FromInteger(membership.Contribution));