6 files changed, 34 insertions, 35 deletions

diff --git a/OpenSim/Framework/Communications/Cache/AssetCache.cs b/OpenSim/Framework/Communications/Cache/AssetCache.cs
index 32a6c7d..1a442ea 100644
--- a/OpenSim/Framework/Communications/Cache/AssetCache.cs
+++ b/OpenSim/Framework/Communications/Cache/AssetCache.cs
@@ -523,7 +523,7 @@ namespace OpenSim.Framework.Communications.Cache
         /// <param name="transferRequest"></param>
         public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest)
         {
-            UUID requestID = null;
+            UUID requestID = UUID.Zero;
             byte source = 2;
             if (transferRequest.TransferInfo.SourceType == 2)
             {
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index 8d27a23..7a39a97 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -165,7 +165,7 @@ namespace OpenSim.Framework.Communications
                     }
                     else if (requestData.Contains("web_login_key"))
                     {
-                        UUID webloginkey = null;
+                        UUID webloginkey = UUID.Zero;
                         try
                         {
                             webloginkey = new UUID((string)requestData["web_login_key"]);
@@ -268,9 +268,9 @@ namespace OpenSim.Framework.Communications
                         logResponse.CircuitCode = Util.RandomClass.Next();
                         logResponse.Lastname = userProfile.SurName;
                         logResponse.Firstname = userProfile.FirstName;
-                        logResponse.AgentID = agentID.ToString();
-                        logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString();
-                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString();
+                        logResponse.AgentID = agentID;
+                        logResponse.SessionID = userProfile.CurrentAgent.SessionID;
+                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID;
                         logResponse.Message = GetMessage();
                         logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID));
                         logResponse.StartLocation = startLocationRequest;
@@ -436,9 +436,9 @@ namespace OpenSim.Framework.Communications
                         logResponse.CircuitCode = (Int32)Util.RandomClass.Next();
                         logResponse.Lastname = userProfile.SurName;
                         logResponse.Firstname = userProfile.FirstName;
-                        logResponse.AgentID = agentID.ToString();
-                        logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString();
-                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString();
+                        logResponse.AgentID = agentID;
+                        logResponse.SessionID = userProfile.CurrentAgent.SessionID;
+                        logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID;
                         logResponse.Message = GetMessage();
                         logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID));
                         logResponse.StartLocation = startLocationRequest;
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs
index 8921c6d..8cd876a 100644
--- a/OpenSim/Framework/EstateSettings.cs
+++ b/OpenSim/Framework/EstateSettings.cs
@@ -434,28 +434,28 @@ namespace OpenSim.Framework
             switch (configuration_key)
             {
                 case "region_flags":
-                    Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)configuration_result;
-                    if ((flags & (Simulator.RegionFlags)(1<<29)) != 0)
+                    RegionFlags flags = (RegionFlags)(uint)configuration_result;
+                    if ((flags & (RegionFlags)(1<<29)) != 0)
                         m_AllowVoice = true;
-                    if ((flags & Simulator.RegionFlags.AllowDirectTeleport) != 0)
+                    if ((flags & RegionFlags.AllowDirectTeleport) != 0)
                         m_AllowDirectTeleport = true;
-                    if ((flags & Simulator.RegionFlags.DenyAnonymous) != 0)
+                    if ((flags & RegionFlags.DenyAnonymous) != 0)
                          m_DenyAnonymous = true;
-                    if ((flags & Simulator.RegionFlags.DenyIdentified) != 0)
+                    if ((flags & RegionFlags.DenyIdentified) != 0)
                         m_DenyIdentified = true;
-                    if ((flags & Simulator.RegionFlags.DenyTransacted) != 0)
+                    if ((flags & RegionFlags.DenyTransacted) != 0)
                         m_DenyTransacted = true;
-                    if ((flags & Simulator.RegionFlags.AbuseEmailToEstateOwner) != 0)
+                    if ((flags & RegionFlags.AbuseEmailToEstateOwner) != 0)
                         m_AbuseEmailToEstateOwner = true;
-                    if ((flags & Simulator.RegionFlags.BlockDwell) != 0)
+                    if ((flags & RegionFlags.BlockDwell) != 0)
                         m_BlockDwell = true;
-                    if ((flags & Simulator.RegionFlags.EstateSkipScripts) != 0)
+                    if ((flags & RegionFlags.EstateSkipScripts) != 0)
                         m_EstateSkipScripts = true;
-                    if ((flags & Simulator.RegionFlags.ResetHomeOnTeleport) != 0)
+                    if ((flags & RegionFlags.ResetHomeOnTeleport) != 0)
                         m_ResetHomeOnTeleport = true;
-                    if ((flags & Simulator.RegionFlags.TaxFree) != 0)
+                    if ((flags & RegionFlags.TaxFree) != 0)
                         m_TaxFree = true;
-                    if ((flags & Simulator.RegionFlags.PublicAllowed) != 0)
+                    if ((flags & RegionFlags.PublicAllowed) != 0)
                         m_PublicAccess = true;
                     break;
                 case "billable_factor":
diff --git a/OpenSim/Framework/IClientAPI.cs b/OpenSim/Framework/IClientAPI.cs
index 0e6a9da..3b5bcaa 100644
--- a/OpenSim/Framework/IClientAPI.cs
+++ b/OpenSim/Framework/IClientAPI.cs
@@ -558,8 +558,7 @@ namespace OpenSim.Framework
         void SendLayerData(float[] map);
         void SendLayerData(int px, int py, float[] map);
 
-        void SendWindData(float[] map);
-        void SendWindData(int p1x, int p1y, int p2x, int p2y, float[] map);
+        void SendWindData(Vector2[] windSpeeds);
 
         void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
         void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint);
diff --git a/OpenSim/Framework/LLGroup.cs b/OpenSim/Framework/LLGroup.cs
index 53d42a4..7405b97 100644
--- a/OpenSim/Framework/LLGroup.cs
+++ b/OpenSim/Framework/LLGroup.cs
@@ -40,7 +40,7 @@ namespace OpenSim.Framework
         public UUID GroupID;
         public List<UUID> GroupMembers;
         public string groupName;
-        public uint groupPowers = (uint)(GroupPowers.LandAllowLandmark | GroupPowers.LandAllowSetHome);
+        public uint groupPowers = (uint)(GroupPowers.AllowLandmark | GroupPowers.AllowSetHome);
         public List<string> GroupTitles;
         public bool AcceptNotices = true;
         public bool AllowPublish = true;
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs
index 5eb7209..64f6768 100644
--- a/OpenSim/Framework/RegionSettings.cs
+++ b/OpenSim/Framework/RegionSettings.cs
@@ -138,32 +138,32 @@ namespace OpenSim.Framework
             switch (key)
             {
             case "region_flags":
-                Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value;
+                RegionFlags flags = (RegionFlags)(uint)value;
 
                 m_BlockTerraform =
-                        (flags & Simulator.RegionFlags.BlockTerraform) != 0;
+                        (flags & RegionFlags.BlockTerraform) != 0;
                 m_BlockFly =
-                        (flags & Simulator.RegionFlags.NoFly) != 0;
+                        (flags & RegionFlags.NoFly) != 0;
                 m_AllowDamage =
-                        (flags & Simulator.RegionFlags.AllowDamage) != 0;
+                        (flags & RegionFlags.AllowDamage) != 0;
                 m_RestrictPushing =
-                        (flags & Simulator.RegionFlags.RestrictPushObject) != 0;
+                        (flags & RegionFlags.RestrictPushObject) != 0;
                 m_AllowLandResell =
-                        (flags & Simulator.RegionFlags.BlockLandResell) == 0;
+                        (flags & RegionFlags.BlockLandResell) == 0;
                 m_AllowLandJoinDivide =
-                        (flags & Simulator.RegionFlags.AllowParcelChanges) != 0;
+                        (flags & RegionFlags.AllowParcelChanges) != 0;
                 m_BlockShowInSearch =
                         ((uint)flags & (1 << 29)) != 0;
                 m_DisableScripts =
-                        (flags & Simulator.RegionFlags.SkipScripts) != 0;
+                        (flags & RegionFlags.SkipScripts) != 0;
                 m_DisableCollisions =
-                        (flags & Simulator.RegionFlags.SkipCollisions) != 0;
+                        (flags & RegionFlags.SkipCollisions) != 0;
                 m_DisablePhysics =
-                        (flags & Simulator.RegionFlags.SkipPhysics) != 0;
+                        (flags & RegionFlags.SkipPhysics) != 0;
                 m_FixedSun =
-                        (flags & Simulator.RegionFlags.SunFixed) != 0;
+                        (flags & RegionFlags.SunFixed) != 0;
                 m_Sandbox =
-                        (flags & Simulator.RegionFlags.Sandbox) != 0;
+                        (flags & RegionFlags.Sandbox) != 0;
                 break;
             case "max_agents":
                 m_AgentLimit = (int)value;