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

Mantis #2133 

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

2
OpenSim/Data/MySQL/MySQLGridData.cs
View File

@ -121,7 +121,7 @@ namespace OpenSim.Data.MySQL
} }
else else
{ {
m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead"); m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead");
IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database"); string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database");

2
OpenSim/Data/MySQL/MySQLLogData.cs
View File

@ -63,7 +63,7 @@ namespace OpenSim.Data.MySQL
} }
else else
{ {
m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead"); m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead");
IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");

4
OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs
View File

@ -88,7 +88,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
public void ForEachDefaultXmlAsset(Action<AssetBase> action) public void ForEachDefaultXmlAsset(Action<AssetBase> action)
{ {
string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.Xml"); string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.xml");
ForEachDefaultXmlAsset(assetSetFilename, action); ForEachDefaultXmlAsset(assetSetFilename, action);
} }
@ -118,7 +118,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem
} }
else else
{ {
m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.Xml does not exist! No assets loaded."); m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.xml does not exist! No assets loaded.");
} }
assets.ForEach(action); assets.ForEach(action);

2
OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs
View File

@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Cache
libraryFolders.Add(ID, this); libraryFolders.Add(ID, this);
LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.Xml")); LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml"));
// CreateLibraryItems(); // CreateLibraryItems();
} }

2
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications
new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect));
// loader will try to load all providers (MySQL, MSSQL, etc) // loader will try to load all providers (MySQL, MSSQL, etc)
// unless it is constrainted to the correct "Provider" entry in the addin.Xml // unless it is constrainted to the correct "Provider" entry in the addin.xml
loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider));
loader.Load(); loader.Load();

2
OpenSim/Framework/Communications/UserManagerBase.cs
View File

@ -59,7 +59,7 @@ namespace OpenSim.Framework.Communications
new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect));
// loader will try to load all providers (MySQL, MSSQL, etc) // loader will try to load all providers (MySQL, MSSQL, etc)
// unless it is constrainted to the correct "Provider" entry in the addin.Xml // unless it is constrainted to the correct "Provider" entry in the addin.xml
loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider));
loader.Load(); loader.Load();

2
OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs
View File

@ -47,7 +47,7 @@ namespace OpenSim.Framework.Configuration.HTTP
public HTTPConfiguration() public HTTPConfiguration()
{ {
remoteConfigSettings = new RemoteConfigSettings("remoteconfig.Xml"); remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml");
xmlConfig = new XmlConfiguration(); xmlConfig = new XmlConfiguration();
} }

2
OpenSim/Framework/Configuration/XML/XmlConfiguration.cs
View File

@ -48,7 +48,7 @@ namespace OpenSim.Framework.Configuration.XML
{ {
rootNode = doc.SelectSingleNode("Root"); rootNode = doc.SelectSingleNode("Root");
if (null == rootNode) if (null == rootNode)
throw new Exception("Error: Invalid .Xml File. Missing <Root>"); throw new Exception("Error: Invalid .xml File. Missing <Root>");
configNode = rootNode.SelectSingleNode("Config"); configNode = rootNode.SelectSingleNode("Config");
if (null == configNode) if (null == configNode)

2
OpenSim/Framework/EstateSettings.cs
View File

@ -281,7 +281,7 @@ namespace OpenSim.Framework
// //
configMember = configMember =
new ConfigurationMember(Path.Combine(Util.configDir(), new ConfigurationMember(Path.Combine(Util.configDir(),
"estate_settings.Xml"), "ESTATE SETTINGS", "estate_settings.xml"), "ESTATE SETTINGS",
loadConfigurationOptions, loadConfigurationOptions,
handleIncomingConfiguration, true); handleIncomingConfiguration, true);

2
OpenSim/Framework/PluginLoader.cs
View File

@ -342,7 +342,7 @@ namespace OpenSim.Framework
} }
/// <summary> /// <summary>
/// Filters out which plugin to load based on its "Provider", which is name given by in the addin.Xml /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.xml
/// </summary> /// </summary>
public class PluginProviderFilter : IPluginFilter public class PluginProviderFilter : IPluginFilter
{ {

6
OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs
View File

@ -59,12 +59,12 @@ namespace OpenSim.Framework.RegionLoader.Filesystem
Directory.CreateDirectory(regionConfigPath); Directory.CreateDirectory(regionConfigPath);
} }
string[] configFiles = Directory.GetFiles(regionConfigPath, "*.Xml"); string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
if (configFiles.Length == 0) if (configFiles.Length == 0)
{ {
new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.Xml"), false); new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"), false);
configFiles = Directory.GetFiles(regionConfigPath, "*.Xml"); configFiles = Directory.GetFiles(regionConfigPath, "*.xml");
} }
RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; RegionInfo[] regionInfos = new RegionInfo[configFiles.Length];

2
OpenSim/Framework/RegionSettings.cs
View File

@ -45,7 +45,7 @@ namespace OpenSim.Framework
{ {
if (configMember == null) if (configMember == null)
{ {
configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.Xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true);
configMember.performConfigurationRetrieve(); configMember.performConfigurationRetrieve();
} }
} }

2
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@ -709,7 +709,7 @@ namespace OpenSim.Framework.Servers
// We'd like to put this into a text file parhaps that's easily editable. // We'd like to put this into a text file parhaps that's easily editable.
// //
// For this test to work, I used the following secondlife.exe parameters // For this test to work, I used the following secondlife.exe parameters
// "C:\Program Files\SecondLifeWindLight\SecondLifeWindLight.exe" -settings settings_windlight.Xml -channel "Second Life WindLight" -set SystemLanguage en-us -loginpage http://10.1.1.2:8002/?show_login_form=TRUE -loginuri http://10.1.1.2:8002 -user 10.1.1.2 // "C:\Program Files\SecondLifeWindLight\SecondLifeWindLight.exe" -settings settings_windlight.xml -channel "Second Life WindLight" -set SystemLanguage en-us -loginpage http://10.1.1.2:8002/?show_login_form=TRUE -loginuri http://10.1.1.2:8002 -user 10.1.1.2
// //
// Even after all that, there's still an error, but it's a start. // Even after all that, there's still an error, but it's a start.
// //

2
OpenSim/Grid/AssetServer/Main.cs
View File

@ -119,7 +119,7 @@ namespace OpenSim.Grid.AssetServer
new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect)); new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect));
// loader will try to load all providers (MySQL, MSSQL, etc) // loader will try to load all providers (MySQL, MSSQL, etc)
// unless it is constrainted to the correct "Provider" entry in the addin.Xml // unless it is constrainted to the correct "Provider" entry in the addin.xml
loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider)); loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider));
loader.Load(); loader.Load();

2
OpenSim/Grid/GridServer/GridManager.cs
View File

@ -68,7 +68,7 @@ namespace OpenSim.Grid.GridServer
new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect));
// loader will try to load all providers (MySQL, MSSQL, etc) // loader will try to load all providers (MySQL, MSSQL, etc)
// unless it is constrainted to the correct "Provider" entry in the addin.Xml // unless it is constrainted to the correct "Provider" entry in the addin.xml
gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider)); gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider));
logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider)); logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider));

2
OpenSim/Grid/MessagingServer/Main.cs
View File

@ -84,7 +84,7 @@ namespace OpenSim.Grid.MessagingServer
{ {
base.Startup(); base.Startup();
Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.Xml"))); Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml")));
m_log.Info("[REGION]: Starting HTTP process"); m_log.Info("[REGION]: Starting HTTP process");
m_httpServer = new BaseHttpServer(Cfg.HttpPort); m_httpServer = new BaseHttpServer(Cfg.HttpPort);

2
OpenSim/Grid/UserServer/Main.cs
View File

@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer
{ {
base.Startup(); base.Startup();
Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.Xml"))); Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml")));
m_stats = StatsManager.StartCollectingUserStats(); m_stats = StatsManager.StartCollectingUserStats();

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

@ -64,7 +64,7 @@ namespace OpenSim
/// <summary> /// <summary>
/// The file used to load and save prim backup xml if no filename has been specified /// The file used to load and save prim backup xml if no filename has been specified
/// </summary> /// </summary>
protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.Xml"; protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml";
/// <summary> /// <summary>
/// The file used to load and save an opensim archive if no filename has been specified /// The file used to load and save an opensim archive if no filename has been specified
@ -178,17 +178,17 @@ namespace OpenSim
} }
else else
{ {
if (File.Exists("OpenSim.Xml")) if (File.Exists("OpenSim.xml"))
{ {
//check for a xml config file //check for a xml config file
Application.iniFilePath = "OpenSim.Xml"; Application.iniFilePath = "OpenSim.xml";
m_config.Source = new XmlConfigSource(); m_config.Source = new XmlConfigSource();
m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath)); m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath));
m_config.Source.Merge(configSource); m_config.Source.Merge(configSource);
} }
else else
{ {
//Application.iniFilePath = "OpenSim.Xml"; //Application.iniFilePath = "OpenSim.xml";
// m_config.ConfigSource = new XmlConfigSource(); // m_config.ConfigSource = new XmlConfigSource();
// no default config files, so set default values, and save it // no default config files, so set default values, and save it
m_config.Source.Merge(DefaultConfig()); 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 // 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. // 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); 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) private string DataFileNameScene(Scene scene)
{ {
return Path.Combine(m_directory, Path.ChangeExtension(scene.RegionInfo.RegionName, "xml")); 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) 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> /// <summary>
/// The location of the archive control file /// The location of the archive control file
/// </summary> /// </summary>
public static readonly string CONTROL_FILE_PATH = "archive.Xml"; public static readonly string CONTROL_FILE_PATH = "archive.xml";
/// <summary> /// <summary>
/// Path for the assets held in an archive /// Path for the assets held in an archive
@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
/// <summary> /// <summary>
/// Path for the assets metadata file /// Path for the assets metadata file
/// </summary> /// </summary>
//public static readonly string ASSETS_METADATA_PATH = "assets.Xml"; //public static readonly string ASSETS_METADATA_PATH = "assets.xml";
/// <summary> /// <summary>
/// Path for the prims file /// 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 serializedObject = m_serialiser.SaveGroupToXml2(sceneObject);
string filename string filename
= string.Format( = 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, ArchiveConstants.OBJECTS_PATH, sceneObject.Name,
Math.Round(position.X), Math.Round(position.Y), Math.Round(position.Z), Math.Round(position.X), Math.Round(position.Y), Math.Round(position.Z),
sceneObject.UUID); 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(); xtw.WriteEndDocument();
archive.AddFile("assets.Xml", sw.ToString()); archive.AddFile("assets.xml", sw.ToString());
} }
/// <summary> /// <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) public string WriteToFile(Scene scene, string dir)
{ {
string targetFileName = dir + "objects.Xml"; string targetFileName = dir + "objects.xml";
SaveSerialisedToFile(targetFileName, scene); SaveSerialisedToFile(targetFileName, scene);
return "objects.Xml"; return "objects.xml";
} }
#endregion #endregion

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

@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Scenes
public AvatarAnimations() public AvatarAnimations()
{ {
using (XmlTextReader reader = new XmlTextReader("data/avataranimations.Xml")) using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml"))
{ {
XmlDocument doc = new XmlDocument(); XmlDocument doc = new XmlDocument();
doc.Load(reader); 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) public void LoadRegion(Scene scene)
{ {
scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + 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 + scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID +
Slash.DirectorySeparatorChar + "heightmap.r32"); Slash.DirectorySeparatorChar + "heightmap.r32");
m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ")."); 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="" /> <File name="./ScriptBase.cs" subtype="Code" buildaction="Compile" dependson="" data="" />
</Contents> </Contents>
<References> <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/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/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" />
<ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework" /> <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework" />
<ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" /> <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" />

2
OpenSim/Tools/Export/OpenSimExport.cs
View File

@ -63,7 +63,7 @@ namespace OpenSimExport
XmlConfigurator.Configure(); XmlConfigurator.Configure();
OpenSimExport export = new OpenSimExport(InitConfig(args)); OpenSimExport export = new OpenSimExport(InitConfig(args));
RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.Xml",false); RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml",false);
Console.WriteLine("This application does nothing useful yet: " + reg.RegionID); Console.WriteLine("This application does nothing useful yet: " + reg.RegionID);
foreach (SceneObjectGroup group in export.sman.DataStore.LoadObjects(reg.RegionID)) foreach (SceneObjectGroup group in export.sman.DataStore.LoadObjects(reg.RegionID))