ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 11:57:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mantis #2133

Browse Source 
Thank you, Xugu Madison and ChrisDown, for a patch that
fixes linux filename extensions from .Xml back to .xml
This commit is contained in:
Melanie Thielker
2008-09-06 14:58:23 +00:00
parent f342bd1e96
commit 9e545c9984
28 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/Application/OpenSimBase.cs
View File

@@ -64,7 +64,7 @@ namespace OpenSim
/// <summary>
/// The file used to load and save prim backup xml if no filename has been specified
/// </summary>
protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.Xml";
protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml";
/// <summary>
/// The file used to load and save an opensim archive if no filename has been specified
@@ -178,17 +178,17 @@ namespace OpenSim
}
else
{
if (File.Exists("OpenSim.Xml"))
if (File.Exists("OpenSim.xml"))
{
//check for a xml config file
Application.iniFilePath = "OpenSim.Xml";
Application.iniFilePath = "OpenSim.xml";
m_config.Source = new XmlConfigSource();
m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath));
m_config.Source.Merge(configSource);
}
else
{
//Application.iniFilePath = "OpenSim.Xml";
//Application.iniFilePath = "OpenSim.xml";
// m_config.ConfigSource = new XmlConfigSource();
// no default config files, so set default values, and save it
m_config.Source.Merge(DefaultConfig());

2
OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
View File

@@ -136,7 +136,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// Return new port
// This because in Grid mode it is not really important what port the region listens to as long as it is correctly registered.
// So the option allow_alternate_ports="true" was added to default.Xml
// So the option allow_alternate_ports="true" was added to default.xml
port = (uint)(listenPort - proxyPortOffset);
}

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

@@ -211,7 +211,7 @@ namespace OpenSim.Region.DataSnapshot
private string DataFileNameScene(Scene scene)
{
return Path.Combine(m_directory, Path.ChangeExtension(scene.RegionInfo.RegionName, "xml"));
//return (m_snapsDir + Path.DirectorySeparatorChar + scene.RegionInfo.RegionName + ".Xml");
//return (m_snapsDir + Path.DirectorySeparatorChar + scene.RegionInfo.RegionName + ".xml");
}
private XmlNode MakeRegionNode(Scene scene, XmlDocument basedoc)

4
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs
View File

@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// <summary>
/// The location of the archive control file
/// </summary>
public static readonly string CONTROL_FILE_PATH = "archive.Xml";
public static readonly string CONTROL_FILE_PATH = "archive.xml";
/// <summary>
/// Path for the assets held in an archive
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// <summary>
/// Path for the assets metadata file
/// </summary>
//public static readonly string ASSETS_METADATA_PATH = "assets.Xml";
//public static readonly string ASSETS_METADATA_PATH = "assets.xml";
/// <summary>
/// Path for the prims file

2
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs
View File

@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
string serializedObject = m_serialiser.SaveGroupToXml2(sceneObject);
string filename
= string.Format(
"{0}{1}_{2:000}-{3:000}-{4:000}__{5}.Xml",
"{0}{1}_{2:000}-{3:000}-{4:000}__{5}.xml",
ArchiveConstants.OBJECTS_PATH, sceneObject.Name,
Math.Round(position.X), Math.Round(position.Y), Math.Round(position.Z),
sceneObject.UUID);

2
OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs
View File

@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
xtw.WriteEndDocument();
archive.AddFile("assets.Xml", sw.ToString());
archive.AddFile("assets.xml", sw.ToString());
}
/// <summary>

4
OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs
View File

@@ -40,11 +40,11 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser
public string WriteToFile(Scene scene, string dir)
{
string targetFileName = dir + "objects.Xml";
string targetFileName = dir + "objects.xml";
SaveSerialisedToFile(targetFileName, scene);
return "objects.Xml";
return "objects.xml";
}
#endregion

2
OpenSim/Region/Environment/Scenes/AvatarAnimations.cs
View File

@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Scenes
public AvatarAnimations()
{
using (XmlTextReader reader = new XmlTextReader("data/avataranimations.Xml"))
using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
{
XmlDocument doc = new XmlDocument();
doc.Load(reader);

2
OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs
View File

@@ -117,7 +117,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser
public void LoadRegion(Scene scene)
{
scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
Slash.DirectorySeparatorChar + "objects.Xml");
Slash.DirectorySeparatorChar + "objects.xml");
scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
Slash.DirectorySeparatorChar + "heightmap.r32");
m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ").");

3
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp
View File

@@ -24,11 +24,10 @@
<File name="./ScriptBase.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
</Contents>
<References>
<ProjectReference type="Assembly" refto="../../../../../../bin/Axiom.MathLib.dll" localcopy="False" />
<ProjectReference type="Assembly" refto="../../../../../../bin/libsecondlife.dll" localcopy="False" />
<ProjectReference type="Assembly" refto="../../../../../../bin/log4net.dll" localcopy="False" />
<ProjectReference type="Assembly" refto="../../../../../../bin/Nini.dll" localcopy="False" />
<ProjectReference type="Assembly" refto="../../../../../../bin/Nini.dll" localcopy="False" />
<ProjectReference type="Assembly" refto="../../../../../../bin/OpenMetaverseTypes.dll" localcopy="False" />
<ProjectReference type="Project" localcopy="False" refto="OpenSim" />
<ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework" />
<ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" />