aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorTeravus Ovares2008-09-26 17:25:22 +0000
committerTeravus Ovares2008-09-26 17:25:22 +0000
commit16b6738cdadc70966a93b6d025ae469738955dcb (patch)
tree7a3c0075e9ee5fd04d972bc52be38aec4d51f648 /OpenSim/Framework
parentDNE code cleanups (diff)
downloadopensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.zip
opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.gz
opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.bz2
opensim-SC_OLD-16b6738cdadc70966a93b6d025ae469738955dcb.tar.xz
* Patch from JHurliman
* Updates to libomv r2243, * Remove lots of unnecessary typecasts * Improves SendWindData() Thanks jhurliman. * Will update OpenSim-libs in 10 minutes..
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/Cache/AssetCache.cs2
-rw-r--r--OpenSim/Framework/Communications/LoginService.cs14
-rw-r--r--OpenSim/Framework/EstateSettings.cs24
-rw-r--r--OpenSim/Framework/IClientAPI.cs3
-rw-r--r--OpenSim/Framework/LLGroup.cs2
-rw-r--r--OpenSim/Framework/RegionSettings.cs24
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
523 /// <param name="transferRequest"></param> 523 /// <param name="transferRequest"></param>
524 public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest) 524 public void AddAssetRequest(IClientAPI userInfo, TransferRequestPacket transferRequest)
525 { 525 {
526 UUID requestID = null; 526 UUID requestID = UUID.Zero;
527 byte source = 2; 527 byte source = 2;
528 if (transferRequest.TransferInfo.SourceType == 2) 528 if (transferRequest.TransferInfo.SourceType == 2)
529 { 529 {
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
165 } 165 }
166 else if (requestData.Contains("web_login_key")) 166 else if (requestData.Contains("web_login_key"))
167 { 167 {
168 UUID webloginkey = null; 168 UUID webloginkey = UUID.Zero;
169 try 169 try
170 { 170 {
171 webloginkey = new UUID((string)requestData["web_login_key"]); 171 webloginkey = new UUID((string)requestData["web_login_key"]);
@@ -268,9 +268,9 @@ namespace OpenSim.Framework.Communications
268 logResponse.CircuitCode = Util.RandomClass.Next(); 268 logResponse.CircuitCode = Util.RandomClass.Next();
269 logResponse.Lastname = userProfile.SurName; 269 logResponse.Lastname = userProfile.SurName;
270 logResponse.Firstname = userProfile.FirstName; 270 logResponse.Firstname = userProfile.FirstName;
271 logResponse.AgentID = agentID.ToString(); 271 logResponse.AgentID = agentID;
272 logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString(); 272 logResponse.SessionID = userProfile.CurrentAgent.SessionID;
273 logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString(); 273 logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID;
274 logResponse.Message = GetMessage(); 274 logResponse.Message = GetMessage();
275 logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID)); 275 logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID));
276 logResponse.StartLocation = startLocationRequest; 276 logResponse.StartLocation = startLocationRequest;
@@ -436,9 +436,9 @@ namespace OpenSim.Framework.Communications
436 logResponse.CircuitCode = (Int32)Util.RandomClass.Next(); 436 logResponse.CircuitCode = (Int32)Util.RandomClass.Next();
437 logResponse.Lastname = userProfile.SurName; 437 logResponse.Lastname = userProfile.SurName;
438 logResponse.Firstname = userProfile.FirstName; 438 logResponse.Firstname = userProfile.FirstName;
439 logResponse.AgentID = agentID.ToString(); 439 logResponse.AgentID = agentID;
440 logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString(); 440 logResponse.SessionID = userProfile.CurrentAgent.SessionID;
441 logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString(); 441 logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID;
442 logResponse.Message = GetMessage(); 442 logResponse.Message = GetMessage();
443 logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID)); 443 logResponse.BuddList = ConvertFriendListItem(m_userManager.GetUserFriendList(agentID));
444 logResponse.StartLocation = startLocationRequest; 444 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
434 switch (configuration_key) 434 switch (configuration_key)
435 { 435 {
436 case "region_flags": 436 case "region_flags":
437 Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)configuration_result; 437 RegionFlags flags = (RegionFlags)(uint)configuration_result;
438 if ((flags & (Simulator.RegionFlags)(1<<29)) != 0) 438 if ((flags & (RegionFlags)(1<<29)) != 0)
439 m_AllowVoice = true; 439 m_AllowVoice = true;
440 if ((flags & Simulator.RegionFlags.AllowDirectTeleport) != 0) 440 if ((flags & RegionFlags.AllowDirectTeleport) != 0)
441 m_AllowDirectTeleport = true; 441 m_AllowDirectTeleport = true;
442 if ((flags & Simulator.RegionFlags.DenyAnonymous) != 0) 442 if ((flags & RegionFlags.DenyAnonymous) != 0)
443 m_DenyAnonymous = true; 443 m_DenyAnonymous = true;
444 if ((flags & Simulator.RegionFlags.DenyIdentified) != 0) 444 if ((flags & RegionFlags.DenyIdentified) != 0)
445 m_DenyIdentified = true; 445 m_DenyIdentified = true;
446 if ((flags & Simulator.RegionFlags.DenyTransacted) != 0) 446 if ((flags & RegionFlags.DenyTransacted) != 0)
447 m_DenyTransacted = true; 447 m_DenyTransacted = true;
448 if ((flags & Simulator.RegionFlags.AbuseEmailToEstateOwner) != 0) 448 if ((flags & RegionFlags.AbuseEmailToEstateOwner) != 0)
449 m_AbuseEmailToEstateOwner = true; 449 m_AbuseEmailToEstateOwner = true;
450 if ((flags & Simulator.RegionFlags.BlockDwell) != 0) 450 if ((flags & RegionFlags.BlockDwell) != 0)
451 m_BlockDwell = true; 451 m_BlockDwell = true;
452 if ((flags & Simulator.RegionFlags.EstateSkipScripts) != 0) 452 if ((flags & RegionFlags.EstateSkipScripts) != 0)
453 m_EstateSkipScripts = true; 453 m_EstateSkipScripts = true;
454 if ((flags & Simulator.RegionFlags.ResetHomeOnTeleport) != 0) 454 if ((flags & RegionFlags.ResetHomeOnTeleport) != 0)
455 m_ResetHomeOnTeleport = true; 455 m_ResetHomeOnTeleport = true;
456 if ((flags & Simulator.RegionFlags.TaxFree) != 0) 456 if ((flags & RegionFlags.TaxFree) != 0)
457 m_TaxFree = true; 457 m_TaxFree = true;
458 if ((flags & Simulator.RegionFlags.PublicAllowed) != 0) 458 if ((flags & RegionFlags.PublicAllowed) != 0)
459 m_PublicAccess = true; 459 m_PublicAccess = true;
460 break; 460 break;
461 case "billable_factor": 461 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
558 void SendLayerData(float[] map); 558 void SendLayerData(float[] map);
559 void SendLayerData(int px, int py, float[] map); 559 void SendLayerData(int px, int py, float[] map);
560 560
561 void SendWindData(float[] map); 561 void SendWindData(Vector2[] windSpeeds);
562 void SendWindData(int p1x, int p1y, int p2x, int p2y, float[] map);
563 562
564 void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look); 563 void MoveAgentIntoRegion(RegionInfo regInfo, Vector3 pos, Vector3 look);
565 void InformClientOfNeighbour(ulong neighbourHandle, IPEndPoint neighbourExternalEndPoint); 564 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
40 public UUID GroupID; 40 public UUID GroupID;
41 public List<UUID> GroupMembers; 41 public List<UUID> GroupMembers;
42 public string groupName; 42 public string groupName;
43 public uint groupPowers = (uint)(GroupPowers.LandAllowLandmark | GroupPowers.LandAllowSetHome); 43 public uint groupPowers = (uint)(GroupPowers.AllowLandmark | GroupPowers.AllowSetHome);
44 public List<string> GroupTitles; 44 public List<string> GroupTitles;
45 public bool AcceptNotices = true; 45 public bool AcceptNotices = true;
46 public bool AllowPublish = true; 46 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
138 switch (key) 138 switch (key)
139 { 139 {
140 case "region_flags": 140 case "region_flags":
141 Simulator.RegionFlags flags = (Simulator.RegionFlags)(uint)value; 141 RegionFlags flags = (RegionFlags)(uint)value;
142 142
143 m_BlockTerraform = 143 m_BlockTerraform =
144 (flags & Simulator.RegionFlags.BlockTerraform) != 0; 144 (flags & RegionFlags.BlockTerraform) != 0;
145 m_BlockFly = 145 m_BlockFly =
146 (flags & Simulator.RegionFlags.NoFly) != 0; 146 (flags & RegionFlags.NoFly) != 0;
147 m_AllowDamage = 147 m_AllowDamage =
148 (flags & Simulator.RegionFlags.AllowDamage) != 0; 148 (flags & RegionFlags.AllowDamage) != 0;
149 m_RestrictPushing = 149 m_RestrictPushing =
150 (flags & Simulator.RegionFlags.RestrictPushObject) != 0; 150 (flags & RegionFlags.RestrictPushObject) != 0;
151 m_AllowLandResell = 151 m_AllowLandResell =
152 (flags & Simulator.RegionFlags.BlockLandResell) == 0; 152 (flags & RegionFlags.BlockLandResell) == 0;
153 m_AllowLandJoinDivide = 153 m_AllowLandJoinDivide =
154 (flags & Simulator.RegionFlags.AllowParcelChanges) != 0; 154 (flags & RegionFlags.AllowParcelChanges) != 0;
155 m_BlockShowInSearch = 155 m_BlockShowInSearch =
156 ((uint)flags & (1 << 29)) != 0; 156 ((uint)flags & (1 << 29)) != 0;
157 m_DisableScripts = 157 m_DisableScripts =
158 (flags & Simulator.RegionFlags.SkipScripts) != 0; 158 (flags & RegionFlags.SkipScripts) != 0;
159 m_DisableCollisions = 159 m_DisableCollisions =
160 (flags & Simulator.RegionFlags.SkipCollisions) != 0; 160 (flags & RegionFlags.SkipCollisions) != 0;
161 m_DisablePhysics = 161 m_DisablePhysics =
162 (flags & Simulator.RegionFlags.SkipPhysics) != 0; 162 (flags & RegionFlags.SkipPhysics) != 0;
163 m_FixedSun = 163 m_FixedSun =
164 (flags & Simulator.RegionFlags.SunFixed) != 0; 164 (flags & RegionFlags.SunFixed) != 0;
165 m_Sandbox = 165 m_Sandbox =
166 (flags & Simulator.RegionFlags.Sandbox) != 0; 166 (flags & RegionFlags.Sandbox) != 0;
167 break; 167 break;
168 case "max_agents": 168 case "max_agents":
169 m_AgentLimit = (int)value; 169 m_AgentLimit = (int)value;