aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/PluginManager.cs2
-rw-r--r--OpenSim/Server/Base/ServerUtils.cs27
-rwxr-xr-xbin/Mono.Addins.CecilReflector.dllbin218112 -> 294912 bytes
-rwxr-xr-xbin/Mono.Addins.Setup.dllbin123904 -> 135168 bytes
-rwxr-xr-xbin/Mono.Addins.dllbin221184 -> 233472 bytes
-rw-r--r--bin/Robust.HG.ini.example25
-rw-r--r--bin/Robust.ini.example26
7 files changed, 54 insertions, 26 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 }
diff --git a/OpenSim/Server/Base/ServerUtils.cs b/OpenSim/Server/Base/ServerUtils.cs
index 31b0446..d06d612 100644
--- a/OpenSim/Server/Base/ServerUtils.cs
+++ b/OpenSim/Server/Base/ServerUtils.cs
@@ -89,12 +89,39 @@ namespace OpenSim.Server.Base
89 Config = config; 89 Config = config;
90 90
91 Registry = new AddinRegistry(registryPath, "."); 91 Registry = new AddinRegistry(registryPath, ".");
92 suppress_console_output_(true);
92 AddinManager.Initialize(registryPath); 93 AddinManager.Initialize(registryPath);
94 suppress_console_output_(false);
93 AddinManager.Registry.Update(); 95 AddinManager.Registry.Update();
94 CommandManager commandmanager = new CommandManager(Registry); 96 CommandManager commandmanager = new CommandManager(Registry);
95 AddinManager.AddExtensionNodeHandler("/Robust/Connector", OnExtensionChanged); 97 AddinManager.AddExtensionNodeHandler("/Robust/Connector", OnExtensionChanged);
96 } 98 }
97 99
100 private static TextWriter prev_console_;
101 // Temporarily masking the errors reported on start
102 // This is caused by a non-managed dll in the ./bin dir
103 // when the registry is initialized. The dll belongs to
104 // libomv, which has a hard-coded path to "." for pinvoke
105 // to load the openjpeg dll
106 //
107 // Will look for a way to fix, but for now this keeps the
108 // confusion to a minimum. this was copied from our region
109 // plugin loader, we have been doing this in there for a long time.
110 //
111 public void suppress_console_output_(bool save)
112 {
113 if (save)
114 {
115 prev_console_ = System.Console.Out;
116 System.Console.SetOut(new StreamWriter(Stream.Null));
117 }
118 else
119 {
120 if (prev_console_ != null)
121 System.Console.SetOut(prev_console_);
122 }
123 }
124
98 private void OnExtensionChanged(object s, ExtensionNodeEventArgs args) 125 private void OnExtensionChanged(object s, ExtensionNodeEventArgs args)
99 { 126 {
100 IRobustConnector connector = (IRobustConnector)args.ExtensionObject; 127 IRobustConnector connector = (IRobustConnector)args.ExtensionObject;
diff --git a/bin/Mono.Addins.CecilReflector.dll b/bin/Mono.Addins.CecilReflector.dll
index 96a6877..94ba30a 100755
--- a/bin/Mono.Addins.CecilReflector.dll
+++ b/bin/Mono.Addins.CecilReflector.dll
Binary files differ
diff --git a/bin/Mono.Addins.Setup.dll b/bin/Mono.Addins.Setup.dll
index 84699b5..6f0fe51 100755
--- a/bin/Mono.Addins.Setup.dll
+++ b/bin/Mono.Addins.Setup.dll
Binary files differ
diff --git a/bin/Mono.Addins.dll b/bin/Mono.Addins.dll
index 951dee7..aa8a0d0 100755
--- a/bin/Mono.Addins.dll
+++ b/bin/Mono.Addins.dll
Binary files differ
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 55b6f90..c7d4b7f 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -22,6 +22,18 @@
22; * 22; *
23[Startup] 23[Startup]
24 24
25; Plugin Registry Location
26; Set path to directory for plugin registry. Information
27; about the registered repositories and installed plugins
28; will be stored here
29; The Robust.exe process must hvae R/W access to the location
30RegistryLocation = "."
31
32; Modular configurations
33; Set path to directory for modular ini files...
34; The Robust.exe process must hvae R/W access to the location
35ConfigDirectory = "/home/opensim/etc/Configs"
36
25[ServiceList] 37[ServiceList]
26 38
27AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" 39AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
@@ -53,19 +65,6 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
53;; Additions for other add-on modules. For example: 65;; Additions for other add-on modules. For example:
54;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector" 66;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector"
55 67
56
57; Plugin Registry Location
58; Set path to directory for plugin registry. Information
59; about the registered repositories and installed plugins
60; will be stored here
61; The Robust.exe process must hvae R/W access to the location
62RegistryLocation = "."
63
64; Modular configurations
65; Set path to directory for modular ini files...
66; The Robust.exe process must hvae R/W access to the location
67ConfigDirectory = "/home/opensim/etc/Configs"
68
69; * This is common for all services, it's the network setup for the entire 68; * This is common for all services, it's the network setup for the entire
70; * server instance, if none is specified above 69; * server instance, if none is specified above
71; * 70; *
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 8ec6d75..bc5cbcc 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -14,6 +14,19 @@
14; * 14; *
15[Startup] 15[Startup]
16 16
17; Plugin Registry Location
18; Set path to directory for plugin registry. Information
19; about the registered repositories and installed plugins
20; will be stored here
21; The Robust.exe process must hvae R/W access to the location
22RegistryLocation = "."
23
24
25; Modular configurations
26; Set path to directory for modular ini files...
27; The Robust.exe process must hvae R/W access to the location
28ConfigDirectory = "/home/opensim/etc/Configs"
29
17[ServiceList] 30[ServiceList]
18AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector" 31AssetServiceConnector = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector"
19InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector" 32InventoryInConnector = "8003/OpenSim.Server.Handlers.dll:XInventoryInConnector"
@@ -31,19 +44,6 @@ FriendsServiceConnector = "8003/OpenSim.Server.Handlers.dll:FriendsServiceConnec
31MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector" 44MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnector"
32MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector" 45MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
33 46
34; Plugin Registry Location
35; Set path to directory for plugin registry. Information
36; about the registered repositories and installed plugins
37; will be stored here
38; The Robust.exe process must hvae R/W access to the location
39RegistryLocation = "."
40
41
42; Modular configurations
43; Set path to directory for modular ini files...
44; The Robust.exe process must hvae R/W access to the location
45ConfigDirectory = "/home/opensim/etc/Configs"
46
47; * This is common for all services, it's the network setup for the entire 47; * This is common for all services, it's the network setup for the entire
48; * server instance, if none is specified above 48; * server instance, if none is specified above
49; * 49; *