Update svn properties, minor formatting cleanup.
parent
80186a68df
commit
6fa26f5b41
OpenSim
Framework/Communications/Cache
Region
ClientStack/LindenUDP
Communications/OGS1
Environment
Modules
Avatar/Profiles
World
Permissions
Scenes
ScriptEngine
Common
Shared/Api/Implementation
|
@ -65,7 +65,7 @@ namespace OpenSim.Framework.Communications.Cache
|
|||
/// <param name="userID"></param>
|
||||
public void AddNewUser(LLUUID userID)
|
||||
{
|
||||
if(userID == LLUUID.Zero)
|
||||
if (userID == LLUUID.Zero)
|
||||
return;
|
||||
m_log.DebugFormat("[USER CACHE]: Adding user profile for {0}", userID);
|
||||
GetUserDetails(userID);
|
||||
|
@ -132,7 +132,7 @@ namespace OpenSim.Framework.Communications.Cache
|
|||
/// <returns>null if no user details are found</returns>
|
||||
public CachedUserInfo GetUserDetails(LLUUID userID)
|
||||
{
|
||||
if(userID == LLUUID.Zero)
|
||||
if (userID == LLUUID.Zero)
|
||||
return null;
|
||||
|
||||
lock (m_userProfiles)
|
||||
|
|
|
@ -2695,7 +2695,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
|||
returnblock[0].Parameter = Helpers.StringToField(estateName);
|
||||
// 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());
|
||||
else
|
||||
returnblock[1].Parameter = Helpers.StringToField(m_scene.RegionInfo.MasterAvatarAssignedUUID.ToString());
|
||||
|
|
|
@ -123,7 +123,7 @@ namespace OpenSim.Region.Communications.OGS1
|
|||
GridParams["server_uri"] = regionInfo.ServerURI;
|
||||
GridParams["region_secret"] = regionInfo.regionSecret;
|
||||
|
||||
if(regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
|
||||
if (regionInfo.MasterAvatarAssignedUUID != LLUUID.Zero)
|
||||
GridParams["master_avatar_uuid"] = regionInfo.MasterAvatarAssignedUUID.ToString();
|
||||
else
|
||||
GridParams["master_avatar_uuid"] = regionInfo.EstateSettings.EstateOwner.ToString();
|
||||
|
|
|
@ -96,7 +96,7 @@ namespace OpenSim.Region.Communications.OGS1
|
|||
userData.CustomType = (string) data["custom_type"];
|
||||
else
|
||||
userData.CustomType = "";
|
||||
if(userData.CustomType == null)
|
||||
if (userData.CustomType == null)
|
||||
userData.CustomType = "";
|
||||
|
||||
if (data.Contains("partner"))
|
||||
|
|
|
@ -97,7 +97,7 @@ namespace OpenSim.Region.Environment.Modules.Avatar.Profiles
|
|||
if (null != profile)
|
||||
{
|
||||
Byte[] charterMember;
|
||||
if(profile.CustomType == "")
|
||||
if (profile.CustomType == "")
|
||||
{
|
||||
charterMember = new Byte[1];
|
||||
charterMember[0] = (Byte)((profile.UserFlags & 0xf00) >> 8);
|
||||
|
|
|
@ -162,7 +162,7 @@ namespace OpenSim.Region.Environment.Modules.World.Land
|
|||
ILandObject fullSimParcel = new LandObject(LLUUID.Zero, false, m_scene);
|
||||
|
||||
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;
|
||||
else
|
||||
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.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
|
||||
if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
|
||||
landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
|
||||
else
|
||||
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.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
|
||||
if (m_scene.RegionInfo.EstateSettings.EstateOwner != LLUUID.Zero)
|
||||
landList[local_id].landData.OwnerID = m_scene.RegionInfo.EstateSettings.EstateOwner;
|
||||
else
|
||||
landList[local_id].landData.OwnerID = m_scene.RegionInfo.MasterAvatarAssignedUUID;
|
||||
|
|
|
@ -246,12 +246,12 @@ namespace OpenSim.Region.Environment.Modules.World.Permissions
|
|||
if (m_scene.RegionInfo.EstateSettings.EstateOwner == user)
|
||||
return true;
|
||||
}
|
||||
if(m_allowGridGods)
|
||||
if (m_allowGridGods)
|
||||
{
|
||||
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;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -2030,7 +2030,7 @@ namespace OpenSim.Region.Environment.Scenes
|
|||
// who is granted god powers, but has no god level set.
|
||||
//
|
||||
CachedUserInfo profile = m_scene.CommsManager.UserProfileCacheService.GetUserDetails(agentID);
|
||||
if(profile.UserProfile.GodLevel > 0)
|
||||
if (profile.UserProfile.GodLevel > 0)
|
||||
m_godlevel = profile.UserProfile.GodLevel;
|
||||
else
|
||||
m_godlevel = 200;
|
||||
|
|
|
@ -5704,12 +5704,12 @@ namespace OpenSim.Region.ScriptEngine.Common
|
|||
|
||||
LSL_Types.list l = new LSL_Types.list();
|
||||
ScenePresence av = World.GetScenePresence(id);
|
||||
if( av == null )
|
||||
if (av == null)
|
||||
return l;
|
||||
LLUUID[] anims;
|
||||
anims = av.GetAnimationArray();
|
||||
foreach( LLUUID foo in anims )
|
||||
l.Add( foo.ToString() );
|
||||
foreach (LLUUID foo in anims)
|
||||
l.Add(foo.ToString());
|
||||
return l;
|
||||
}
|
||||
|
||||
|
|
|
@ -5568,12 +5568,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
|
||||
LSL_Types.list l = new LSL_Types.list();
|
||||
ScenePresence av = World.GetScenePresence(id);
|
||||
if( av == null )
|
||||
if (av == null)
|
||||
return l;
|
||||
LLUUID[] anims;
|
||||
anims = av.GetAnimationArray();
|
||||
foreach( LLUUID foo in anims )
|
||||
l.Add( foo.ToString() );
|
||||
foreach (LLUUID foo in anims)
|
||||
l.Add(foo.ToString());
|
||||
return l;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue