aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/PluginManager.cs
diff options
context:
space:
mode:
authorBlueWall2012-12-11 17:03:42 -0500
committerBlueWall2012-12-11 17:03:42 -0500
commitb1849e7fde2c3d0e543c8855fd4a1fd85f23fe30 (patch)
tree80970225b78b8c605c29112e004a989af2185172 /OpenSim/Framework/PluginManager.cs
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-b1849e7fde2c3d0e543c8855fd4a1fd85f23fe30.zip
opensim-SC_OLD-b1849e7fde2c3d0e543c8855fd4a1fd85f23fe30.tar.gz
opensim-SC_OLD-b1849e7fde2c3d0e543c8855fd4a1fd85f23fe30.tar.bz2
opensim-SC_OLD-b1849e7fde2c3d0e543c8855fd4a1fd85f23fe30.tar.xz
Hide some console output when initializing addin repository
We do this in OpenSim.exe to hide output when unmanaged dll are scanned by mono addins. Libomv has hard-coded path to "." for the openjpeg libraries, causing output to the console when they are scanned. We will cover this up for now, then look at getting libomv to look for the libs outside the "." later.
Diffstat (limited to 'OpenSim/Framework/PluginManager.cs')
-rw-r--r--OpenSim/Framework/PluginManager.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs
index 23d5945..00263f5 100644
--- a/OpenSim/Framework/PluginManager.cs
+++ b/OpenSim/Framework/PluginManager.cs
@@ -92,6 +92,7 @@ namespace OpenSim.Framework
92 // Attempt to install the plugin disabled 92 // Attempt to install the plugin disabled
93 if (Install(ps, pack) == true) 93 if (Install(ps, pack) == true)
94 { 94 {
95 MainConsole.Instance.Output("Ignore the following error...");
95 PluginRegistry.Update(ps); 96 PluginRegistry.Update(ps);
96 Addin addin = PluginRegistry.GetAddin(aentry.Addin.Id); 97 Addin addin = PluginRegistry.GetAddin(aentry.Addin.Id);
97 PluginRegistry.DisableAddin(addin.Id); 98 PluginRegistry.DisableAddin(addin.Id);
@@ -479,6 +480,7 @@ namespace OpenSim.Framework
479 ConsoleProgressStatus ps = new ConsoleProgressStatus(false); 480 ConsoleProgressStatus ps = new ConsoleProgressStatus(false);
480 if (!AddinManager.AddinEngine.IsAddinLoaded(addin.Id)) 481 if (!AddinManager.AddinEngine.IsAddinLoaded(addin.Id))
481 { 482 {
483 MainConsole.Instance.Output("Ignore the following error...");
482 AddinManager.Registry.Rebuild(ps); 484 AddinManager.Registry.Rebuild(ps);
483 AddinManager.AddinEngine.LoadAddin(ps, addin.Id); 485 AddinManager.AddinEngine.LoadAddin(ps, addin.Id);
484 } 486 }