diff options
| author | Melanie | 2013-03-15 23:45:32 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-15 23:45:32 +0000 |
| commit | b9146a79220c7e15ff0241fb6216028ddf15bee8 (patch) | |
| tree | 18e3342a99e448b19a1a5bb29d9579ef9d9bb817 /OpenSim/Server/ServerMain.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Change the table and field names of XAssetService mysql db tables to be capit... (diff) | |
| download | opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.zip opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.gz opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.bz2 opensim-SC_OLD-b9146a79220c7e15ff0241fb6216028ddf15bee8.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/BaseOpenSimServer.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Server/ServerMain.cs')
| -rw-r--r-- | OpenSim/Server/ServerMain.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs index 8be69a9..65e9287 100644 --- a/OpenSim/Server/ServerMain.cs +++ b/OpenSim/Server/ServerMain.cs | |||
| @@ -145,7 +145,7 @@ namespace OpenSim.Server | |||
| 145 | } | 145 | } |
| 146 | else | 146 | else |
| 147 | { | 147 | { |
| 148 | m_log.InfoFormat("[SERVER]: Failed to load {0}", conn); | 148 | m_log.ErrorFormat("[SERVER]: Failed to load {0}", conn); |
| 149 | } | 149 | } |
| 150 | } | 150 | } |
| 151 | 151 | ||