ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into presence-refactor

Browse Source
This commit is contained in:
Melanie
2010-01-04 21:41:33 +00:00
parent 1ac36bb5d9 1ae9bfc074
commit 7f960cd595
62 changed files with 1839 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
View File

@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
List<string> serialisedParcels = new List<string>();
string filePath = "NONE";
TarArchiveReader archive = new TarArchiveReader(m_loadStream);
TarArchiveReader archive = new TarArchiveReader(m_loadStream);
byte[] data;
TarArchiveReader.TarEntryType entryType;

2
OpenSim/Region/CoreModules/World/Archiver/ArchiveWriteRequestExecution.cs
View File

@@ -91,7 +91,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
m_log.InfoFormat("[ARCHIVER]: Finished writing out OAR for {0}", m_scene.RegionInfo.RegionName);
m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty);
m_scene.EventManager.TriggerOarFileSaved(m_requestId, String.Empty);
}
protected internal void Save(ICollection<UUID> assetsFoundUuids, ICollection<UUID> assetsNotFoundUuids)

4
OpenSim/Region/CoreModules/World/Archiver/ArchiverModule.cs
View File

@@ -50,7 +50,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
/// <value>
/// The file used to load and save an opensimulator archive if no filename has been specified
/// </value>
protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar";
protected const string DEFAULT_OAR_BACKUP_FILENAME = "region.oar";
public string Name
{
@@ -111,7 +111,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
{
DearchiveRegion(DEFAULT_OAR_BACKUP_FILENAME, mergeOar, Guid.Empty);
}
}
}
/// <summary>
/// Save a region to a file, including all the assets needed to restore it.

2
OpenSim/Region/CoreModules/World/Land/LandChannel.cs
View File

@@ -105,7 +105,7 @@ namespace OpenSim.Region.CoreModules.World.Land
ILandObject obj = new LandObject(UUID.Zero, false, m_scene);
obj.LandData.Name = "NO LAND";
return obj;
}
}
public List<ILandObject> AllParcels()
{

2
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@@ -627,7 +627,7 @@ namespace OpenSim.Region.CoreModules.World.Land
return null;
}
}
}
}
#endregion

2
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
View File

@@ -817,7 +817,7 @@ namespace OpenSim.Region.CoreModules.World.Permissions
}
protected bool GenericParcelOwnerPermission(UUID user, ILandObject parcel, ulong groupPowers)
{
{
if (parcel.LandData.OwnerID == user)
{
// Returning immediately so that group deeded objects on group deeded land don't trigger a NRE on