OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update svn properties, minor formatting cleanup.

0.6.0-stable
Jeff Ames 2008-08-16 17:26:25 +00:00
parent 80186a68df
commit 6fa26f5b41
11 changed files with 192 additions and 192 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
View File

@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <param name="userID"></param> /// <param name="userID"></param>
public void AddNewUser(LLUUID userID) public void AddNewUser(LLUUID userID)
{ {
if(userID == LLUUID.Zero) if (userID == LLUUID.Zero)
return; return;
m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID); m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID);
GetUserDetails(userID); GetUserDetails(userID);
@ -132,7 +132,7 @@ namespace OpenSim.Framework.Communications.Cache
/// <returns>null if no user details are found</returns> /// <returns>null if no user details are found</returns>
public CachedUserInfo GetUserDetails(LLUUID userID) public CachedUserInfo GetUserDetails(LLUUID userID)
{ {
if(userID == LLUUID.Zero) if (userID == LLUUID.Zero)
return null; return null;
lock (m_userProfiles) lock (m_userProfiles)

2
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@ -2695,7 +2695,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
returnblock[0].Parameter = Helpers.StringToField(estateName); returnblock[0].Parameter = Helpers.StringToField(estateName);
// TODO: remove this cruft once MasterAvatar is fully deprecated // TODO: remove this cruft once MasterAvatar is fully deprecated
// //
if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.EstateOwner.ToString()); returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.EstateSettings.EstateOwner.ToString());
else else
returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString()); returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());

2
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -123,7 +123,7 @@ namespace OpenSim.Region.Communications.OGS1
GridParams["server_uri"] = regionInfo.ServerURI; GridParams["server_uri"] = regionInfo.ServerURI;
GridParams["region_secret"] = regionInfo.regionSecret; GridParams["region_secret"] = regionInfo.regionSecret;
if(regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero) if (regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString(); GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
else else
GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString(); GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();

2
OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
View File

@ -96,7 +96,7 @@ namespace OpenSim.Region.Communications.OGS1
userData.CustomType = (string) data["custom_type"]; userData.CustomType = (string) data["custom_type"];
else else
userData.CustomType = ""; userData.CustomType = "";
if(userData.CustomType == null) if (userData.CustomType == null)
userData.CustomType = ""; userData.CustomType = "";
if (data.Contains("partner")) if (data.Contains("partner"))

2
OpenSim/Region/Environment/Modules/Avatar/Profiles/AvatarProfilesModule.cs
View File

@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
if (null != profile) if (null != profile)
{ {
Byte[] charterMember; Byte[] charterMember;
if(profile.CustomType == "") if (profile.CustomType == "")
{ {
charterMember = new Byte[1]; charterMember = new Byte[1];
charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8); charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8);

6
OpenSim/Region/Environment/Modules/World/Land/LandManagementModule.cs
View File

@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene); ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene);
fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize)); fullSimParcel.setLandBitmap(fullSimParcel.getSquareLandBitmap(0, 0, (int)Constants.RegionSize, (int)Constants.RegionSize));
if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
fullSimParcel.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; fullSimParcel.landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
else else
fullSimParcel.landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; fullSimParcel.landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
@ -934,7 +934,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
{ {
if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, landList[local_id])) if (m_scene.ExternalChecks.ExternalChecksCanAbandonParcel(remote_client.AgentId, landList[local_id]))
{ {
if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
else else
landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
@ -951,7 +951,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
{ {
if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id])) if (m_scene.ExternalChecks.ExternalChecksCanReclaimParcel(remote_client.AgentId, landList[local_id]))
{ {
if(m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero) if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner; landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
else else
landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID; landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;

6
OpenSim/Region/Environment/Modules/World/Permissions/PermissionsModule.cs
View File

@ -246,12 +246,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
if (m_scene.RegionInfo.EstateSettings.EstateOwner == user) if (m_scene.RegionInfo.EstateSettings.EstateOwner == user)
return true; return true;
} }
if(m_allowGridGods) if (m_allowGridGods)
{ {
CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user); CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(user);
if(profile != null && profile.UserProfile != null) if (profile != null && profile.UserProfile != null)
{ {
if(profile.UserProfile.GodLevel >= 200) if (profile.UserProfile.GodLevel >= 200)
return true; return true;
} }
} }

2
OpenSim/Region/Environment/Scenes/ScenePresence.cs
View File

@ -2030,7 +2030,7 @@ namespace OpenSim.Region.Environment.Scenes
// who is granted god powers, but has no god level set. // who is granted god powers, but has no god level set.
// //
CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(agentID); CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(agentID);
if(profile.UserProfile.GodLevel > 0) if (profile.UserProfile.GodLevel > 0)
m_godlevel = profile.UserProfile.GodLevel; m_godlevel = profile.UserProfile.GodLevel;
else else
m_godlevel = 200; m_godlevel = 200;

6
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@ -5704,12 +5704,12 @@ namespace OpenSim.Region.ScriptEngine.Common
LSL_Types.list l = new LSL_Types.list(); LSL_Types.list l = new LSL_Types.list();
ScenePresence av = World.GetScenePresence(id); ScenePresence av = World.GetScenePresence(id);
if( av == null ) if (av == null)
return l; return l;
LLUUID[] anims; LLUUID[] anims;
anims = av.GetAnimationArray(); anims = av.GetAnimationArray();
foreach( LLUUID foo in anims ) foreach (LLUUID foo in anims)
l.Add( foo.ToString() ); l.Add(foo.ToString());
return l; return l;
} }

6
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -5568,12 +5568,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
LSL_Types.list l = new LSL_Types.list(); LSL_Types.list l = new LSL_Types.list();
ScenePresence av = World.GetScenePresence(id); ScenePresence av = World.GetScenePresence(id);
if( av == null ) if (av == null)
return l; return l;
LLUUID[] anims; LLUUID[] anims;
anims = av.GetAnimationArray(); anims = av.GetAnimationArray();
foreach( LLUUID foo in anims ) foreach (LLUUID foo in anims)
l.Add( foo.ToString() ); l.Add(foo.ToString());
return l; return l;
} }