ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 18:25:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Patch from JHurliman

Browse Source 
* Updates to libomv r2243, 
* Remove lots of unnecessary typecasts
* Improves SendWindData()
Thanks jhurliman. 
* Will update OpenSim-libs in 10 minutes..
This commit is contained in:
Teravus Ovares
2008-09-26 17:25:22 +00:00
parent 34cfd710ce
commit 16b6738cda
42 changed files with 233 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/Cache/AssetCache.cs
View File

@@ -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)
{

14
OpenSim/Framework/Communications/LoginService.cs
View File

@@ -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;

24
OpenSim/Framework/EstateSettings.cs
View File

@@ -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":

3
OpenSim/Framework/IClientAPI.cs
View File

@@ -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);

2
OpenSim/Framework/LLGroup.cs
View File

@@ -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;

24
OpenSim/Framework/RegionSettings.cs
View File

@@ -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;