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

Some typos fixed related to master avie removal

slimupdates
Diva Canto 2010-01-10 15:41:49 -08:00
parent e3d1d824e1
commit e31131b40f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Client/MXP/ClientStack/MXPClientView.cs
View File

@ -427,7 +427,7 @@ namespace OpenSim.Client.MXP.ClientStack
pe.ObjectFragment.ObjectIndex = (uint)(m_scene.RegionInfo.RegionSettings.RegionUUID.GetHashCode() + ((long)int.MaxValue) / 2); pe.ObjectFragment.ObjectIndex = (uint)(m_scene.RegionInfo.RegionSettings.RegionUUID.GetHashCode() + ((long)int.MaxValue) / 2);
pe.ObjectFragment.ParentObjectId = UUID.Zero.Guid; pe.ObjectFragment.ParentObjectId = UUID.Zero.Guid;
pe.ObjectFragment.ObjectName = "Terrain of " + m_scene.RegionInfo.RegionName; pe.ObjectFragment.ObjectName = "Terrain of " + m_scene.RegionInfo.RegionName;
pe.ObjectFragment.OwnerId = m_scene.RegionInfo.EstateSettings.EstateOwner; pe.ObjectFragment.OwnerId = m_scene.RegionInfo.EstateSettings.EstateOwner.Guid;
pe.ObjectFragment.TypeId = Guid.Empty; pe.ObjectFragment.TypeId = Guid.Empty;
pe.ObjectFragment.TypeName = "Terrain"; pe.ObjectFragment.TypeName = "Terrain";
pe.ObjectFragment.Acceleration = new MsdVector3f(); pe.ObjectFragment.Acceleration = new MsdVector3f();

2
OpenSim/Region/DataSnapshot/EstateSnapshot.cs
View File

@ -56,7 +56,7 @@ namespace OpenSim.Region.DataSnapshot.Providers
//Now in DataSnapshotProvider module form! //Now in DataSnapshotProvider module form!
XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", ""); XmlNode estatedata = factory.CreateNode(XmlNodeType.Element, "estate", "");
ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner; UUID ownerid = m_scene.RegionInfo.EstateSettings.EstateOwner;
UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid); UserAccount userInfo = m_scene.UserAccountService.GetUserAccount(m_scene.RegionInfo.ScopeID, ownerid);
//TODO: Change to query userserver about the master avatar UUID ? //TODO: Change to query userserver about the master avatar UUID ?

4
OpenSim/Region/OptionalModules/Scripting/Minimodule/MRMModule.cs
View File

@ -212,7 +212,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
if (script.StartsWith("//MRM:C#")) if (script.StartsWith("//MRM:C#"))
{ {
if (m_config.GetBoolean("OwnerOnly", true)) if (m_config.GetBoolean("OwnerOnly", true))
if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.EstateSettings.EstateOwner) if (m_scene.GetSceneObjectPart(localID).OwnerID != m_scene.RegionInfo.EstateSettings.EstateOwner
|| m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.EstateSettings.EstateOwner) || m_scene.GetSceneObjectPart(localID).CreatorID != m_scene.RegionInfo.EstateSettings.EstateOwner)
return; return;
@ -280,7 +280,7 @@ namespace OpenSim.Region.OptionalModules.Scripting.Minimodule
public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host) public void GetGlobalEnvironment(uint localID, out IWorld world, out IHost host)
{ {
// UUID should be changed to object owner. // UUID should be changed to object owner.
UUID owner = m_scene.RegionInfo.EstateSettings.EstateOwner) UUID owner = m_scene.RegionInfo.EstateSettings.EstateOwner;
SEUser securityUser = new SEUser(owner, "Name Unassigned"); SEUser securityUser = new SEUser(owner, "Name Unassigned");
SecurityCredential creds = new SecurityCredential(securityUser, m_scene); SecurityCredential creds = new SecurityCredential(securityUser, m_scene);