diff options
| author | Melanie | 2010-03-09 22:44:14 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-09 22:44:14 +0000 |
| commit | c7590bfd507fa6f07dc1e4625ba032ed5d1201b4 (patch) | |
| tree | 8f0f03d099d9ab4f1408a9cf8a1e50a4f81de1ae /OpenSim/Services | |
| parent | - parcel blocking, region crossing blocking, teleport blocking (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-c7590bfd507fa6f07dc1e4625ba032ed5d1201b4.zip opensim-SC-c7590bfd507fa6f07dc1e4625ba032ed5d1201b4.tar.gz opensim-SC-c7590bfd507fa6f07dc1e4625ba032ed5d1201b4.tar.bz2 opensim-SC-c7590bfd507fa6f07dc1e4625ba032ed5d1201b4.tar.xz | |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to '')
3 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs index 6847852..a5c157d 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs | |||
| @@ -68,7 +68,7 @@ namespace OpenSim.Services.Connectors | |||
| 68 | IConfig assetConfig = source.Configs["AssetService"]; | 68 | IConfig assetConfig = source.Configs["AssetService"]; |
| 69 | if (assetConfig == null) | 69 | if (assetConfig == null) |
| 70 | { | 70 | { |
| 71 | m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpanSim.ini"); | 71 | m_log.Error("[ASSET CONNECTOR]: AssetService missing from OpenSim.ini"); |
| 72 | throw new Exception("Asset connector init error"); | 72 | throw new Exception("Asset connector init error"); |
| 73 | } | 73 | } |
| 74 | 74 | ||
diff --git a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs index f36fe5b..6f77a2d 100644 --- a/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs +++ b/OpenSim/Services/Connectors/Authentication/AuthenticationServiceConnector.cs | |||
| @@ -67,7 +67,7 @@ namespace OpenSim.Services.Connectors | |||
| 67 | IConfig assetConfig = source.Configs["AuthenticationService"]; | 67 | IConfig assetConfig = source.Configs["AuthenticationService"]; |
| 68 | if (assetConfig == null) | 68 | if (assetConfig == null) |
| 69 | { | 69 | { |
| 70 | m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpanSim.ini"); | 70 | m_log.Error("[AUTH CONNECTOR]: AuthenticationService missing from OpenSim.ini"); |
| 71 | throw new Exception("Authentication connector init error"); | 71 | throw new Exception("Authentication connector init error"); |
| 72 | } | 72 | } |
| 73 | 73 | ||
diff --git a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs index 3309d16..9821dd4 100644 --- a/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs +++ b/OpenSim/Services/Connectors/Inventory/XInventoryConnector.cs | |||
| @@ -68,7 +68,7 @@ namespace OpenSim.Services.Connectors | |||
| 68 | IConfig assetConfig = source.Configs["InventoryService"]; | 68 | IConfig assetConfig = source.Configs["InventoryService"]; |
| 69 | if (assetConfig == null) | 69 | if (assetConfig == null) |
| 70 | { | 70 | { |
| 71 | m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpanSim.ini"); | 71 | m_log.Error("[INVENTORY CONNECTOR]: InventoryService missing from OpenSim.ini"); |
| 72 | throw new Exception("Inventory connector init error"); | 72 | throw new Exception("Inventory connector init error"); |
| 73 | } | 73 | } |
| 74 | 74 | ||