Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
commit
abf0dd4250
|
@ -373,5 +373,11 @@ namespace OpenSim.Framework
|
|||
|
||||
return l_EstateAccess.Contains(user);
|
||||
}
|
||||
|
||||
public bool GroupAccess(UUID groupID)
|
||||
{
|
||||
return l_EstateGroups.Contains(groupID);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
@ -489,19 +489,21 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
|
|||
List<mapItemReply> mapitems = new List<mapItemReply>();
|
||||
mapItemReply mapitem = new mapItemReply();
|
||||
|
||||
SceneObjectPart sop = m_scene.GetSceneObjectPart(m_scene.RegionInfo.RegionSettings.TelehubObject);
|
||||
|
||||
SceneObjectGroup sog = m_scene.GetSceneObjectGroup(m_scene.RegionInfo.RegionSettings.TelehubObject);
|
||||
if (sog != null)
|
||||
{
|
||||
mapitem = new mapItemReply();
|
||||
mapitem.x = (uint)(xstart + sop.AbsolutePosition.X);
|
||||
mapitem.y = (uint)(ystart + sop.AbsolutePosition.Y);
|
||||
mapitem.x = (uint)(xstart + sog.AbsolutePosition.X);
|
||||
mapitem.y = (uint)(ystart + sog.AbsolutePosition.Y);
|
||||
mapitem.id = UUID.Zero;
|
||||
mapitem.name = sop.Name;
|
||||
mapitem.name = sog.Name;
|
||||
mapitem.Extra = 0; // color (not used)
|
||||
mapitem.Extra2 = 0; // 0 = telehub / 1 = infohub
|
||||
mapitems.Add(mapitem);
|
||||
|
||||
remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
// Remote Map Item Request
|
||||
|
|
|
@ -5067,6 +5067,36 @@ namespace OpenSim.Region.Framework.Scenes
|
|||
}
|
||||
}
|
||||
|
||||
if (position == Vector3.Zero) // Teleport
|
||||
{
|
||||
if (!RegionInfo.EstateSettings.AllowDirectTeleport)
|
||||
{
|
||||
SceneObjectGroup telehub;
|
||||
if (RegionInfo.RegionSettings.TelehubObject != UUID.Zero && (telehub = GetSceneObjectGroup(RegionInfo.RegionSettings.TelehubObject)) != null)
|
||||
{
|
||||
List<SpawnPoint> spawnPoints = RegionInfo.RegionSettings.SpawnPoints();
|
||||
bool banned = true;
|
||||
foreach (SpawnPoint sp in spawnPoints)
|
||||
{
|
||||
Vector3 spawnPoint = sp.GetLocation(telehub.AbsolutePosition, telehub.GroupRotation);
|
||||
ILandObject land = LandChannel.GetLandObject(spawnPoint.X, spawnPoint.Y);
|
||||
if (land == null)
|
||||
continue;
|
||||
if (land.IsEitherBannedOrRestricted(agentID))
|
||||
continue;
|
||||
banned = false;
|
||||
break;
|
||||
}
|
||||
|
||||
if (banned)
|
||||
{
|
||||
reason = "No suitable landing point found";
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
reason = String.Empty;
|
||||
return true;
|
||||
}
|
||||
|
|
|
@ -10646,6 +10646,75 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
|
|||
return list;
|
||||
}
|
||||
|
||||
public LSL_Integer llManageEstateAccess(int action, string avatar)
|
||||
{
|
||||
m_host.AddScriptLPS(1);
|
||||
EstateSettings estate = World.RegionInfo.EstateSettings;
|
||||
bool isAccount = false;
|
||||
bool isGroup = false;
|
||||
|
||||
if (!estate.IsEstateOwner(m_host.OwnerID) || !estate.IsEstateManager(m_host.OwnerID))
|
||||
return 0;
|
||||
|
||||
UUID id = new UUID();
|
||||
if (!UUID.TryParse(avatar, out id))
|
||||
return 0;
|
||||
|
||||
UserAccount account = World.UserAccountService.GetUserAccount(World.RegionInfo.ScopeID, id);
|
||||
isAccount = account != null ? true : false;
|
||||
if (!isAccount)
|
||||
{
|
||||
IGroupsModule groups = World.RequestModuleInterface<IGroupsModule>();
|
||||
if (groups != null)
|
||||
{
|
||||
GroupRecord group = groups.GetGroupRecord(id);
|
||||
isGroup = group != null ? true : false;
|
||||
if (!isGroup)
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch (action)
|
||||
{
|
||||
case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_ADD:
|
||||
if (!isAccount) return 0;
|
||||
if (estate.HasAccess(id)) return 1;
|
||||
if (estate.IsBanned(id))
|
||||
estate.RemoveBan(id);
|
||||
estate.AddEstateUser(id);
|
||||
break;
|
||||
case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_AGENT_REMOVE:
|
||||
if (!isAccount || !estate.HasAccess(id)) return 0;
|
||||
estate.RemoveEstateUser(id);
|
||||
break;
|
||||
case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_GROUP_ADD:
|
||||
if (!isGroup) return 0;
|
||||
if (estate.GroupAccess(id)) return 1;
|
||||
estate.AddEstateGroup(id);
|
||||
break;
|
||||
case ScriptBaseClass.ESTATE_ACCESS_ALLOWED_GROUP_REMOVE:
|
||||
if (!isGroup || !estate.GroupAccess(id)) return 0;
|
||||
estate.RemoveEstateGroup(id);
|
||||
break;
|
||||
case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_ADD:
|
||||
if (!isAccount) return 0;
|
||||
if (estate.IsBanned(id)) return 1;
|
||||
EstateBan ban = new EstateBan();
|
||||
ban.EstateID = estate.EstateID;
|
||||
ban.BannedUserID = id;
|
||||
estate.AddBan(ban);
|
||||
break;
|
||||
case ScriptBaseClass.ESTATE_ACCESS_BANNED_AGENT_REMOVE:
|
||||
if (!isAccount || !estate.IsBanned(id)) return 0;
|
||||
estate.RemoveBan(id);
|
||||
break;
|
||||
default: return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
#region Not Implemented
|
||||
//
|
||||
// Listing the unimplemented lsl functions here, please move
|
||||
|
|
|
@ -242,6 +242,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
|
|||
void llLoopSound(string sound, double volume);
|
||||
void llLoopSoundMaster(string sound, double volume);
|
||||
void llLoopSoundSlave(string sound, double volume);
|
||||
LSL_Integer llManageEstateAccess(int action, string avatar);
|
||||
void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset);
|
||||
void llMakeFire(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset);
|
||||
void llMakeFountain(int particles, double scale, double vel, double lifetime, double arc, int bounce, string texture, LSL_Vector offset, double bounce_offset);
|
||||
|
|
|
@ -432,6 +432,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|||
public const int REGION_FLAG_ALLOW_DIRECT_TELEPORT = 0x100000; // region allows direct teleports
|
||||
public const int REGION_FLAG_RESTRICT_PUSHOBJECT = 0x400000; // region restricts llPushObject
|
||||
|
||||
//llManageEstateAccess
|
||||
public const int ESTATE_ACCESS_ALLOWED_AGENT_ADD = 0;
|
||||
public const int ESTATE_ACCESS_ALLOWED_AGENT_REMOVE = 1;
|
||||
public const int ESTATE_ACCESS_ALLOWED_GROUP_ADD = 2;
|
||||
public const int ESTATE_ACCESS_ALLOWED_GROUP_REMOVE = 3;
|
||||
public const int ESTATE_ACCESS_BANNED_AGENT_ADD = 4;
|
||||
public const int ESTATE_ACCESS_BANNED_AGENT_REMOVE = 5;
|
||||
|
||||
public static readonly LSLInteger PAY_HIDE = new LSLInteger(-1);
|
||||
public static readonly LSLInteger PAY_DEFAULT = new LSLInteger(-2);
|
||||
|
||||
|
|
|
@ -1054,6 +1054,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.ScriptBase
|
|||
m_LSL_Functions.llLoopSoundSlave(sound, volume);
|
||||
}
|
||||
|
||||
public LSL_Integer llManageEstateAccess(int action, string avatar)
|
||||
{
|
||||
return m_LSL_Functions.llManageEstateAccess(action, avatar);
|
||||
}
|
||||
|
||||
public void llMakeExplosion(int particles, double scale, double vel, double lifetime, double arc, string texture, LSL_Vector offset)
|
||||
{
|
||||
m_LSL_Functions.llMakeExplosion(particles, scale, vel, lifetime, arc, texture, offset);
|
||||
|
|
|
@ -319,13 +319,14 @@ namespace OpenSim.Services.HypergridService
|
|||
public override InventoryItemBase GetItem(InventoryItemBase item)
|
||||
{
|
||||
InventoryItemBase it = base.GetItem(item);
|
||||
|
||||
if (it != null)
|
||||
{
|
||||
UserAccount user = m_Cache.GetUser(it.CreatorId);
|
||||
|
||||
// Adjust the creator data
|
||||
if (user != null && it != null && (it.CreatorData == null || it.CreatorData == string.Empty))
|
||||
it.CreatorData = m_HomeURL + ";" + user.FirstName + " " + user.LastName;
|
||||
|
||||
}
|
||||
return it;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue