* Typo fixes
* Performance improvement in the expensive GenerateClientFlags()slimupdates
parent
fa38cf3ee8
commit
01218093a6
|
@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Asset
|
||||||
IConfig assetConfig = source.Configs["AssetService"];
|
IConfig assetConfig = source.Configs["AssetService"];
|
||||||
if (assetConfig == null)
|
if (assetConfig == null)
|
||||||
{
|
{
|
||||||
m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpanSim.ini");
|
m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -66,7 +66,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Avatar
|
||||||
IConfig userConfig = source.Configs["AvatarService"];
|
IConfig userConfig = source.Configs["AvatarService"];
|
||||||
if (userConfig == null)
|
if (userConfig == null)
|
||||||
{
|
{
|
||||||
m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpanSim.ini");
|
m_log.Error("[AVATAR CONNECTOR]: AvatarService missing from OpenSim.ini");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
|
||||||
//IConfig userConfig = config.Configs["SimulationService"];
|
//IConfig userConfig = config.Configs["SimulationService"];
|
||||||
//if (userConfig == null)
|
//if (userConfig == null)
|
||||||
//{
|
//{
|
||||||
// m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpanSim.ini");
|
// m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpenSim.ini");
|
||||||
// return;
|
// return;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation
|
||||||
//IConfig userConfig = config.Configs["SimulationService"];
|
//IConfig userConfig = config.Configs["SimulationService"];
|
||||||
//if (userConfig == null)
|
//if (userConfig == null)
|
||||||
//{
|
//{
|
||||||
// m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpanSim.ini");
|
// m_log.Error("[AVATAR CONNECTOR]: SimulationService missing from OpenSim.ini");
|
||||||
// return;
|
// return;
|
||||||
//}
|
//}
|
||||||
|
|
||||||
|
|
|
@ -69,7 +69,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.UserAccounts
|
||||||
IConfig userConfig = source.Configs["UserAccountService"];
|
IConfig userConfig = source.Configs["UserAccountService"];
|
||||||
if (userConfig == null)
|
if (userConfig == null)
|
||||||
{
|
{
|
||||||
m_log.Error("[USER CONNECTOR]: UserAccountService missing from OpanSim.ini");
|
m_log.Error("[USER CONNECTOR]: UserAccountService missing from OpenSim.ini");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -609,16 +609,17 @@ namespace OpenSim.Region.CoreModules.World.Permissions
|
||||||
if (IsFriendWithPerms(user, objectOwner))
|
if (IsFriendWithPerms(user, objectOwner))
|
||||||
return objectOwnerMask;
|
return objectOwnerMask;
|
||||||
|
|
||||||
// Estate users should be able to edit anything in the sim
|
// Estate users should be able to edit anything in the sim if RegionOwnerIsGod is set
|
||||||
if (IsEstateManager(user) && m_RegionOwnerIsGod && (!IsAdministrator(objectOwner)) || objectOwner == user)
|
if (IsEstateManager(user) && m_RegionOwnerIsGod)
|
||||||
return objectOwnerMask;
|
return objectOwnerMask;
|
||||||
|
|
||||||
// Admin should be able to edit anything in the sim (including admin objects)
|
// Admin should be able to edit anything in the sim (including admin objects)
|
||||||
if (IsAdministrator(user))
|
if (IsAdministrator(user))
|
||||||
return objectOwnerMask;
|
return objectOwnerMask;
|
||||||
|
|
||||||
// Users should be able to edit what is over their land.
|
// Users should be able to edit what is over their land.
|
||||||
ILandObject parcel = m_scene.LandChannel.GetLandObject(task.AbsolutePosition.X, task.AbsolutePosition.Y);
|
Vector3 taskPos = task.AbsolutePosition;
|
||||||
|
ILandObject parcel = m_scene.LandChannel.GetLandObject(taskPos.X, taskPos.Y);
|
||||||
if (parcel != null && parcel.LandData.OwnerID == user && m_ParcelOwnerIsGod)
|
if (parcel != null && parcel.LandData.OwnerID == user && m_ParcelOwnerIsGod)
|
||||||
{
|
{
|
||||||
// Admin objects should not be editable by the above
|
// Admin objects should not be editable by the above
|
||||||
|
|
|
@ -68,7 +68,7 @@ namespace OpenSim.Services.Connectors
|
||||||
IConfig assetConfig = source.Configs["AssetService"];
|
IConfig assetConfig = source.Configs["AssetService"];
|
||||||
if (assetConfig == null)
|
if (assetConfig == null)
|
||||||
{
|
{
|
||||||
m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpanSim.ini");
|
m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini");
|
||||||
throw new Exception("Asset connector init error");
|
throw new Exception("Asset connector init error");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors
|
||||||
IConfig assetConfig = source.Configs["AuthenticationService"];
|
IConfig assetConfig = source.Configs["AuthenticationService"];
|
||||||
if (assetConfig == null)
|
if (assetConfig == null)
|
||||||
{
|
{
|
||||||
m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpanSim.ini");
|
m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini");
|
||||||
throw new Exception("Authentication connector init error");
|
throw new Exception("Authentication connector init error");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,7 @@ namespace OpenSim.Services.Connectors
|
||||||
IConfig assetConfig = source.Configs["InventoryService"];
|
IConfig assetConfig = source.Configs["InventoryService"];
|
||||||
if (assetConfig == null)
|
if (assetConfig == null)
|
||||||
{
|
{
|
||||||
m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpanSim.ini");
|
m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini");
|
||||||
throw new Exception("Inventory connector init error");
|
throw new Exception("Inventory connector init error");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue