diff options
author | Melanie Thielker | 2008-09-06 14:58:23 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-09-06 14:58:23 +0000 |
commit | 9e545c9984790ddeabba0bf86e229af90da09ad6 (patch) | |
tree | bf305b155bcd2aadc1fb8a209d262a86f676fca3 /OpenSim | |
parent | * Replace a Try/catch I commented out while testing/fixing issues. (diff) | |
download | opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.zip opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.gz opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.bz2 opensim-SC_OLD-9e545c9984790ddeabba0bf86e229af90da09ad6.tar.xz |
Mantis #2133
Thank you, Xugu Madison and ChrisDown, for a patch that
fixes linux filename extensions from .Xml back to .xml
Diffstat (limited to 'OpenSim')
28 files changed, 36 insertions, 37 deletions
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs index fa5b33c..4e4d32c 100644 --- a/OpenSim/Data/MySQL/MySQLGridData.cs +++ b/OpenSim/Data/MySQL/MySQLGridData.cs | |||
@@ -121,7 +121,7 @@ namespace OpenSim.Data.MySQL | |||
121 | } | 121 | } |
122 | else | 122 | else |
123 | { | 123 | { |
124 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead"); | 124 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); |
125 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 125 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
126 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); | 126 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); |
127 | string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database"); | 127 | string settingDatabase = GridDataMySqlFile.ParseFileReadValue("database"); |
diff --git a/OpenSim/Data/MySQL/MySQLLogData.cs b/OpenSim/Data/MySQL/MySQLLogData.cs index 07ef916..c02016c 100644 --- a/OpenSim/Data/MySQL/MySQLLogData.cs +++ b/OpenSim/Data/MySQL/MySQLLogData.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSim.Data.MySQL | |||
63 | } | 63 | } |
64 | else | 64 | else |
65 | { | 65 | { |
66 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.Xml and we'll use that instead"); | 66 | m_log.Warn("Using deprecated mysql_connection.ini. Please update database_connect in GridServer_Config.xml and we'll use that instead"); |
67 | 67 | ||
68 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); | 68 | IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); |
69 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); | 69 | string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); |
diff --git a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs index 73489ec..cf601f1 100644 --- a/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs +++ b/OpenSim/Framework/AssetLoader/Filesystem/AssetLoaderFileSystem.cs | |||
@@ -88,7 +88,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
88 | 88 | ||
89 | public void ForEachDefaultXmlAsset(Action<AssetBase> action) | 89 | public void ForEachDefaultXmlAsset(Action<AssetBase> action) |
90 | { | 90 | { |
91 | string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.Xml"); | 91 | string assetSetFilename = Path.Combine(Util.assetsDir(), "AssetSets.xml"); |
92 | 92 | ||
93 | ForEachDefaultXmlAsset(assetSetFilename, action); | 93 | ForEachDefaultXmlAsset(assetSetFilename, action); |
94 | } | 94 | } |
@@ -118,7 +118,7 @@ namespace OpenSim.Framework.AssetLoader.Filesystem | |||
118 | } | 118 | } |
119 | else | 119 | else |
120 | { | 120 | { |
121 | m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.Xml does not exist! No assets loaded."); | 121 | m_log.Error("[ASSETS]: Asset set control file assets/AssetSets.xml does not exist! No assets loaded."); |
122 | } | 122 | } |
123 | 123 | ||
124 | assets.ForEach(action); | 124 | assets.ForEach(action); |
diff --git a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs index 7e561b5..88047c2 100644 --- a/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs +++ b/OpenSim/Framework/Communications/Cache/LibraryRootFolder.cs | |||
@@ -66,7 +66,7 @@ namespace OpenSim.Framework.Communications.Cache | |||
66 | 66 | ||
67 | libraryFolders.Add(ID, this); | 67 | libraryFolders.Add(ID, this); |
68 | 68 | ||
69 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.Xml")); | 69 | LoadLibraries(Path.Combine(Util.inventoryDir(), "Libraries.xml")); |
70 | 70 | ||
71 | // CreateLibraryItems(); | 71 | // CreateLibraryItems(); |
72 | } | 72 | } |
diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs index 3239268..e9dc3c4 100644 --- a/OpenSim/Framework/Communications/InventoryServiceBase.cs +++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs | |||
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Communications | |||
57 | new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); | 57 | new PluginLoader<IInventoryDataPlugin> (new InventoryDataInitialiser (connect)); |
58 | 58 | ||
59 | // loader will try to load all providers (MySQL, MSSQL, etc) | 59 | // loader will try to load all providers (MySQL, MSSQL, etc) |
60 | // unless it is constrainted to the correct "Provider" entry in the addin.Xml | 60 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
61 | loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); | 61 | loader.Add ("/OpenSim/InventoryData", new PluginProviderFilter (provider)); |
62 | loader.Load(); | 62 | loader.Load(); |
63 | 63 | ||
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs index 5a63e70..b6564bf 100644 --- a/OpenSim/Framework/Communications/UserManagerBase.cs +++ b/OpenSim/Framework/Communications/UserManagerBase.cs | |||
@@ -59,7 +59,7 @@ namespace OpenSim.Framework.Communications | |||
59 | new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); | 59 | new PluginLoader<IUserDataPlugin> (new UserDataInitialiser (connect)); |
60 | 60 | ||
61 | // loader will try to load all providers (MySQL, MSSQL, etc) | 61 | // loader will try to load all providers (MySQL, MSSQL, etc) |
62 | // unless it is constrainted to the correct "Provider" entry in the addin.Xml | 62 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
63 | loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); | 63 | loader.Add ("/OpenSim/UserData", new PluginProviderFilter (provider)); |
64 | loader.Load(); | 64 | loader.Load(); |
65 | 65 | ||
diff --git a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs index 0929172..4770017 100644 --- a/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs +++ b/OpenSim/Framework/Configuration/HTTP/HTTPConfiguration.cs | |||
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Configuration.HTTP | |||
47 | 47 | ||
48 | public HTTPConfiguration() | 48 | public HTTPConfiguration() |
49 | { | 49 | { |
50 | remoteConfigSettings = new RemoteConfigSettings("remoteconfig.Xml"); | 50 | remoteConfigSettings = new RemoteConfigSettings("remoteconfig.xml"); |
51 | xmlConfig = new XmlConfiguration(); | 51 | xmlConfig = new XmlConfiguration(); |
52 | } | 52 | } |
53 | 53 | ||
diff --git a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs index e3da962..89f52cf 100644 --- a/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs +++ b/OpenSim/Framework/Configuration/XML/XmlConfiguration.cs | |||
@@ -48,7 +48,7 @@ namespace OpenSim.Framework.Configuration.XML | |||
48 | { | 48 | { |
49 | rootNode = doc.SelectSingleNode("Root"); | 49 | rootNode = doc.SelectSingleNode("Root"); |
50 | if (null == rootNode) | 50 | if (null == rootNode) |
51 | throw new Exception("Error: Invalid .Xml File. Missing <Root>"); | 51 | throw new Exception("Error: Invalid .xml File. Missing <Root>"); |
52 | 52 | ||
53 | configNode = rootNode.SelectSingleNode("Config"); | 53 | configNode = rootNode.SelectSingleNode("Config"); |
54 | if (null == configNode) | 54 | if (null == configNode) |
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index 83f911d..8921c6d 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
@@ -281,7 +281,7 @@ namespace OpenSim.Framework | |||
281 | // | 281 | // |
282 | configMember = | 282 | configMember = |
283 | new ConfigurationMember(Path.Combine(Util.configDir(), | 283 | new ConfigurationMember(Path.Combine(Util.configDir(), |
284 | "estate_settings.Xml"), "ESTATE SETTINGS", | 284 | "estate_settings.xml"), "ESTATE SETTINGS", |
285 | loadConfigurationOptions, | 285 | loadConfigurationOptions, |
286 | handleIncomingConfiguration, true); | 286 | handleIncomingConfiguration, true); |
287 | 287 | ||
diff --git a/OpenSim/Framework/PluginLoader.cs b/OpenSim/Framework/PluginLoader.cs index 366552f..cabce1b 100644 --- a/OpenSim/Framework/PluginLoader.cs +++ b/OpenSim/Framework/PluginLoader.cs | |||
@@ -342,7 +342,7 @@ namespace OpenSim.Framework | |||
342 | } | 342 | } |
343 | 343 | ||
344 | /// <summary> | 344 | /// <summary> |
345 | /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.Xml | 345 | /// Filters out which plugin to load based on its "Provider", which is name given by in the addin.xml |
346 | /// </summary> | 346 | /// </summary> |
347 | public class PluginProviderFilter : IPluginFilter | 347 | public class PluginProviderFilter : IPluginFilter |
348 | { | 348 | { |
diff --git a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs index c7d317f..a371851 100644 --- a/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs +++ b/OpenSim/Framework/RegionLoader/Filesystem/RegionLoaderFileSystem.cs | |||
@@ -59,12 +59,12 @@ namespace OpenSim.Framework.RegionLoader.Filesystem | |||
59 | Directory.CreateDirectory(regionConfigPath); | 59 | Directory.CreateDirectory(regionConfigPath); |
60 | } | 60 | } |
61 | 61 | ||
62 | string[] configFiles = Directory.GetFiles(regionConfigPath, "*.Xml"); | 62 | string[] configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); |
63 | 63 | ||
64 | if (configFiles.Length == 0) | 64 | if (configFiles.Length == 0) |
65 | { | 65 | { |
66 | new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.Xml"), false); | 66 | new RegionInfo("DEFAULT REGION CONFIG", Path.Combine(regionConfigPath, "default.xml"), false); |
67 | configFiles = Directory.GetFiles(regionConfigPath, "*.Xml"); | 67 | configFiles = Directory.GetFiles(regionConfigPath, "*.xml"); |
68 | } | 68 | } |
69 | 69 | ||
70 | RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; | 70 | RegionInfo[] regionInfos = new RegionInfo[configFiles.Length]; |
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 525a3f0..5eb7209 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -45,7 +45,7 @@ namespace OpenSim.Framework | |||
45 | { | 45 | { |
46 | if (configMember == null) | 46 | if (configMember == null) |
47 | { | 47 | { |
48 | configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.Xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); | 48 | configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); |
49 | configMember.performConfigurationRetrieve(); | 49 | configMember.performConfigurationRetrieve(); |
50 | } | 50 | } |
51 | } | 51 | } |
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs index 3787c38..72c9ca1 100644 --- a/OpenSim/Framework/Servers/BaseHttpServer.cs +++ b/OpenSim/Framework/Servers/BaseHttpServer.cs | |||
@@ -709,7 +709,7 @@ namespace OpenSim.Framework.Servers | |||
709 | // We'd like to put this into a text file parhaps that's easily editable. | 709 | // We'd like to put this into a text file parhaps that's easily editable. |
710 | // | 710 | // |
711 | // For this test to work, I used the following secondlife.exe parameters | 711 | // For this test to work, I used the following secondlife.exe parameters |
712 | // "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 | 712 | // "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 |
713 | // | 713 | // |
714 | // Even after all that, there's still an error, but it's a start. | 714 | // Even after all that, there's still an error, but it's a start. |
715 | // | 715 | // |
diff --git a/OpenSim/Grid/AssetServer/Main.cs b/OpenSim/Grid/AssetServer/Main.cs index bded875..3f85691 100644 --- a/OpenSim/Grid/AssetServer/Main.cs +++ b/OpenSim/Grid/AssetServer/Main.cs | |||
@@ -119,7 +119,7 @@ namespace OpenSim.Grid.AssetServer | |||
119 | new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect)); | 119 | new PluginLoader<IAssetProviderPlugin> (new AssetDataInitialiser (connect)); |
120 | 120 | ||
121 | // loader will try to load all providers (MySQL, MSSQL, etc) | 121 | // loader will try to load all providers (MySQL, MSSQL, etc) |
122 | // unless it is constrainted to the correct "Provider" entry in the addin.Xml | 122 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
123 | loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider)); | 123 | loader.Add ("/OpenSim/AssetData", new PluginProviderFilter (provider)); |
124 | loader.Load(); | 124 | loader.Load(); |
125 | 125 | ||
diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs index 6fbfc71..2e0767e 100644 --- a/OpenSim/Grid/GridServer/GridManager.cs +++ b/OpenSim/Grid/GridServer/GridManager.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Grid.GridServer | |||
68 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); | 68 | new PluginLoader<ILogDataPlugin> (new LogDataInitialiser (connect)); |
69 | 69 | ||
70 | // loader will try to load all providers (MySQL, MSSQL, etc) | 70 | // loader will try to load all providers (MySQL, MSSQL, etc) |
71 | // unless it is constrainted to the correct "Provider" entry in the addin.Xml | 71 | // unless it is constrainted to the correct "Provider" entry in the addin.xml |
72 | gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider)); | 72 | gridloader.Add ("/OpenSim/GridData", new PluginProviderFilter (provider)); |
73 | logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider)); | 73 | logloader.Add ("/OpenSim/LogData", new PluginProviderFilter (provider)); |
74 | 74 | ||
diff --git a/OpenSim/Grid/MessagingServer/Main.cs b/OpenSim/Grid/MessagingServer/Main.cs index f9be780..c73facb 100644 --- a/OpenSim/Grid/MessagingServer/Main.cs +++ b/OpenSim/Grid/MessagingServer/Main.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Grid.MessagingServer | |||
84 | { | 84 | { |
85 | base.Startup(); | 85 | base.Startup(); |
86 | 86 | ||
87 | Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.Xml"))); | 87 | Cfg = new MessageServerConfig("MESSAGING SERVER", (Path.Combine(Util.configDir(), "MessagingServer_Config.xml"))); |
88 | 88 | ||
89 | m_log.Info("[REGION]: Starting HTTP process"); | 89 | m_log.Info("[REGION]: Starting HTTP process"); |
90 | m_httpServer = new BaseHttpServer(Cfg.HttpPort); | 90 | m_httpServer = new BaseHttpServer(Cfg.HttpPort); |
diff --git a/OpenSim/Grid/UserServer/Main.cs b/OpenSim/Grid/UserServer/Main.cs index 6441b7a..94e0728 100644 --- a/OpenSim/Grid/UserServer/Main.cs +++ b/OpenSim/Grid/UserServer/Main.cs | |||
@@ -92,7 +92,7 @@ namespace OpenSim.Grid.UserServer | |||
92 | { | 92 | { |
93 | base.Startup(); | 93 | base.Startup(); |
94 | 94 | ||
95 | Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.Xml"))); | 95 | Cfg = new UserConfig("USER SERVER", (Path.Combine(Util.configDir(), "UserServer_Config.xml"))); |
96 | 96 | ||
97 | m_stats = StatsManager.StartCollectingUserStats(); | 97 | m_stats = StatsManager.StartCollectingUserStats(); |
98 | 98 | ||
diff --git a/OpenSim/Region/Application/OpenSimBase.cs b/OpenSim/Region/Application/OpenSimBase.cs index 99584da..e2b2bbc 100644 --- a/OpenSim/Region/Application/OpenSimBase.cs +++ b/OpenSim/Region/Application/OpenSimBase.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim | |||
64 | /// <summary> | 64 | /// <summary> |
65 | /// The file used to load and save prim backup xml if no filename has been specified | 65 | /// The file used to load and save prim backup xml if no filename has been specified |
66 | /// </summary> | 66 | /// </summary> |
67 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.Xml"; | 67 | protected const string DEFAULT_PRIM_BACKUP_FILENAME = "prim-backup.xml"; |
68 | 68 | ||
69 | /// <summary> | 69 | /// <summary> |
70 | /// The file used to load and save an opensim archive if no filename has been specified | 70 | /// The file used to load and save an opensim archive if no filename has been specified |
@@ -178,17 +178,17 @@ namespace OpenSim | |||
178 | } | 178 | } |
179 | else | 179 | else |
180 | { | 180 | { |
181 | if (File.Exists("OpenSim.Xml")) | 181 | if (File.Exists("OpenSim.xml")) |
182 | { | 182 | { |
183 | //check for a xml config file | 183 | //check for a xml config file |
184 | Application.iniFilePath = "OpenSim.Xml"; | 184 | Application.iniFilePath = "OpenSim.xml"; |
185 | m_config.Source = new XmlConfigSource(); | 185 | m_config.Source = new XmlConfigSource(); |
186 | m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath)); | 186 | m_config.Source.Merge(new XmlConfigSource(Application.iniFilePath)); |
187 | m_config.Source.Merge(configSource); | 187 | m_config.Source.Merge(configSource); |
188 | } | 188 | } |
189 | else | 189 | else |
190 | { | 190 | { |
191 | //Application.iniFilePath = "OpenSim.Xml"; | 191 | //Application.iniFilePath = "OpenSim.xml"; |
192 | // m_config.ConfigSource = new XmlConfigSource(); | 192 | // m_config.ConfigSource = new XmlConfigSource(); |
193 | // no default config files, so set default values, and save it | 193 | // no default config files, so set default values, and save it |
194 | m_config.Source.Merge(DefaultConfig()); | 194 | m_config.Source.Merge(DefaultConfig()); |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs index 2d57d7f..92321b6 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | |||
@@ -136,7 +136,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
136 | 136 | ||
137 | // Return new port | 137 | // Return new port |
138 | // This because in Grid mode it is not really important what port the region listens to as long as it is correctly registered. | 138 | // This because in Grid mode it is not really important what port the region listens to as long as it is correctly registered. |
139 | // So the option allow_alternate_ports="true" was added to default.Xml | 139 | // So the option allow_alternate_ports="true" was added to default.xml |
140 | port = (uint)(listenPort - proxyPortOffset); | 140 | port = (uint)(listenPort - proxyPortOffset); |
141 | } | 141 | } |
142 | 142 | ||
diff --git a/OpenSim/Region/DataSnapshot/SnapshotStore.cs b/OpenSim/Region/DataSnapshot/SnapshotStore.cs index d913cc5..a0d7c48 100644 --- a/OpenSim/Region/DataSnapshot/SnapshotStore.cs +++ b/OpenSim/Region/DataSnapshot/SnapshotStore.cs | |||
@@ -211,7 +211,7 @@ namespace OpenSim.Region.DataSnapshot | |||
211 | private string DataFileNameScene(Scene scene) | 211 | private string DataFileNameScene(Scene scene) |
212 | { | 212 | { |
213 | return Path.Combine(m_directory, Path.ChangeExtension(scene.RegionInfo.RegionName, "xml")); | 213 | return Path.Combine(m_directory, Path.ChangeExtension(scene.RegionInfo.RegionName, "xml")); |
214 | //return (m_snapsDir + Path.DirectorySeparatorChar + scene.RegionInfo.RegionName + ".Xml"); | 214 | //return (m_snapsDir + Path.DirectorySeparatorChar + scene.RegionInfo.RegionName + ".xml"); |
215 | } | 215 | } |
216 | 216 | ||
217 | private XmlNode MakeRegionNode(Scene scene, XmlDocument basedoc) | 217 | private XmlNode MakeRegionNode(Scene scene, XmlDocument basedoc) |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs index 8d74160..b2e006a 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
38 | /// <summary> | 38 | /// <summary> |
39 | /// The location of the archive control file | 39 | /// The location of the archive control file |
40 | /// </summary> | 40 | /// </summary> |
41 | public static readonly string CONTROL_FILE_PATH = "archive.Xml"; | 41 | public static readonly string CONTROL_FILE_PATH = "archive.xml"; |
42 | 42 | ||
43 | /// <summary> | 43 | /// <summary> |
44 | /// Path for the assets held in an archive | 44 | /// Path for the assets held in an archive |
@@ -48,7 +48,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
48 | /// <summary> | 48 | /// <summary> |
49 | /// Path for the assets metadata file | 49 | /// Path for the assets metadata file |
50 | /// </summary> | 50 | /// </summary> |
51 | //public static readonly string ASSETS_METADATA_PATH = "assets.Xml"; | 51 | //public static readonly string ASSETS_METADATA_PATH = "assets.xml"; |
52 | 52 | ||
53 | /// <summary> | 53 | /// <summary> |
54 | /// Path for the prims file | 54 | /// Path for the prims file |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs index 6276d34..784e137 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestExecution.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
105 | string serializedObject = m_serialiser.SaveGroupToXml2(sceneObject); | 105 | string serializedObject = m_serialiser.SaveGroupToXml2(sceneObject); |
106 | string filename | 106 | string filename |
107 | = string.Format( | 107 | = string.Format( |
108 | "{0}{1}_{2:000}-{3:000}-{4:000}__{5}.Xml", | 108 | "{0}{1}_{2:000}-{3:000}-{4:000}__{5}.xml", |
109 | ArchiveConstants.OBJECTS_PATH, sceneObject.Name, | 109 | ArchiveConstants.OBJECTS_PATH, sceneObject.Name, |
110 | Math.Round(position.X), Math.Round(position.Y), Math.Round(position.Z), | 110 | Math.Round(position.X), Math.Round(position.Y), Math.Round(position.Z), |
111 | sceneObject.UUID); | 111 | sceneObject.UUID); |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs index b49b2a4..75ae474 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/AssetsArchiver.cs | |||
@@ -105,7 +105,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
105 | 105 | ||
106 | xtw.WriteEndDocument(); | 106 | xtw.WriteEndDocument(); |
107 | 107 | ||
108 | archive.AddFile("assets.Xml", sw.ToString()); | 108 | archive.AddFile("assets.xml", sw.ToString()); |
109 | } | 109 | } |
110 | 110 | ||
111 | /// <summary> | 111 | /// <summary> |
diff --git a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs index ffd90bf..1fb78b6 100644 --- a/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs +++ b/OpenSim/Region/Environment/Modules/World/Serialiser/SerialiseObjects.cs | |||
@@ -40,11 +40,11 @@ namespace OpenSim.Region.Environment.Modules.World.Serialiser | |||
40 | 40 | ||
41 | public string WriteToFile(Scene scene, string dir) | 41 | public string WriteToFile(Scene scene, string dir) |
42 | { | 42 | { |
43 | string targetFileName = dir + "objects.Xml"; | 43 | string targetFileName = dir + "objects.xml"; |
44 | 44 | ||
45 | SaveSerialisedToFile(targetFileName, scene); | 45 | SaveSerialisedToFile(targetFileName, scene); |
46 | 46 | ||
47 | return "objects.Xml"; | 47 | return "objects.xml"; |
48 | } | 48 | } |
49 | 49 | ||
50 | #endregion | 50 | #endregion |
diff --git a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs index 6bb5525..5417c8d 100644 --- a/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs +++ b/OpenSim/Region/Environment/Scenes/AvatarAnimations.cs | |||
@@ -38,7 +38,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
38 | 38 | ||
39 | public AvatarAnimations() | 39 | public AvatarAnimations() |
40 | { | 40 | { |
41 | using (XmlTextReader reader = new XmlTextReader("data/avataranimations.Xml")) | 41 | using (XmlTextReader reader = new XmlTextReader("data/avataranimations.xml")) |
42 | { | 42 | { |
43 | XmlDocument doc = new XmlDocument(); | 43 | XmlDocument doc = new XmlDocument(); |
44 | doc.Load(reader); | 44 | doc.Load(reader); |
diff --git a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs index 4bab7c9..b87954c 100644 --- a/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs +++ b/OpenSim/Region/Modules/SvnSerialiser/SvnBackupModule.cs | |||
@@ -117,7 +117,7 @@ namespace OpenSim.Region.Modules.SvnSerialiser | |||
117 | public void LoadRegion(Scene scene) | 117 | public void LoadRegion(Scene scene) |
118 | { | 118 | { |
119 | scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + | 119 | scene.LoadPrimsFromXml2(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + |
120 | Slash.DirectorySeparatorChar + "objects.Xml"); | 120 | Slash.DirectorySeparatorChar + "objects.xml"); |
121 | scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + | 121 | scene.RequestModuleInterface<ITerrainModule>().LoadFromFile(m_svndir + Slash.DirectorySeparatorChar + scene.RegionInfo.RegionID + |
122 | Slash.DirectorySeparatorChar + "heightmap.r32"); | 122 | Slash.DirectorySeparatorChar + "heightmap.r32"); |
123 | m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ")."); | 123 | m_log.Info("[SVNBACKUP]: Region load successful (" + scene.RegionInfo.RegionName + ")."); |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp index 87904bb..baabe65 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Runtime/OpenSim.Region.ScriptEngine.Shared.Api.Runtime.mdp | |||
@@ -24,11 +24,10 @@ | |||
24 | <File name="./ScriptBase.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> | 24 | <File name="./ScriptBase.cs" subtype="Code" buildaction="Compile" dependson="" data="" /> |
25 | </Contents> | 25 | </Contents> |
26 | <References> | 26 | <References> |
27 | <ProjectReference type="Assembly" refto="../../../../../../bin/Axiom.MathLib.dll" localcopy="False" /> | ||
28 | <ProjectReference type="Assembly" refto="../../../../../../bin/libsecondlife.dll" localcopy="False" /> | ||
29 | <ProjectReference type="Assembly" refto="../../../../../../bin/log4net.dll" localcopy="False" /> | 27 | <ProjectReference type="Assembly" refto="../../../../../../bin/log4net.dll" localcopy="False" /> |
30 | <ProjectReference type="Assembly" refto="../../../../../../bin/Nini.dll" localcopy="False" /> | 28 | <ProjectReference type="Assembly" refto="../../../../../../bin/Nini.dll" localcopy="False" /> |
31 | <ProjectReference type="Assembly" refto="../../../../../../bin/Nini.dll" localcopy="False" /> | 29 | <ProjectReference type="Assembly" refto="../../../../../../bin/Nini.dll" localcopy="False" /> |
30 | <ProjectReference type="Assembly" refto="../../../../../../bin/OpenMetaverseTypes.dll" localcopy="False" /> | ||
32 | <ProjectReference type="Project" localcopy="False" refto="OpenSim" /> | 31 | <ProjectReference type="Project" localcopy="False" refto="OpenSim" /> |
33 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework" /> | 32 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework" /> |
34 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" /> | 33 | <ProjectReference type="Project" localcopy="False" refto="OpenSim.Framework.Communications" /> |
diff --git a/OpenSim/Tools/Export/OpenSimExport.cs b/OpenSim/Tools/Export/OpenSimExport.cs index 68d4716..5c0ff52 100644 --- a/OpenSim/Tools/Export/OpenSimExport.cs +++ b/OpenSim/Tools/Export/OpenSimExport.cs | |||
@@ -63,7 +63,7 @@ namespace OpenSimExport | |||
63 | XmlConfigurator.Configure(); | 63 | XmlConfigurator.Configure(); |
64 | 64 | ||
65 | OpenSimExport export = new OpenSimExport(InitConfig(args)); | 65 | OpenSimExport export = new OpenSimExport(InitConfig(args)); |
66 | RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.Xml",false); | 66 | RegionInfo reg = new RegionInfo("Sara Jane", "Regions/1000-1000.xml",false); |
67 | 67 | ||
68 | Console.WriteLine("This application does nothing useful yet: " + reg.RegionID); | 68 | Console.WriteLine("This application does nothing useful yet: " + reg.RegionID); |
69 | foreach (SceneObjectGroup group in export.sman.DataStore.LoadObjects(reg.RegionID)) | 69 | foreach (SceneObjectGroup group in export.sman.DataStore.LoadObjects(reg.RegionID)) |