diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Framework/PluginManager.cs | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/OpenSim/Framework/PluginManager.cs b/OpenSim/Framework/PluginManager.cs index 0117096..0c94fcb 100644 --- a/OpenSim/Framework/PluginManager.cs +++ b/OpenSim/Framework/PluginManager.cs | |||
@@ -44,17 +44,17 @@ namespace OpenSim.Framework | |||
44 | /// <summary> | 44 | /// <summary> |
45 | /// Manager for registries and plugins | 45 | /// Manager for registries and plugins |
46 | /// </summary> | 46 | /// </summary> |
47 | public class PluginManager : SetupService | 47 | public class PluginManager : SetupService |
48 | { | 48 | { |
49 | public AddinRegistry PluginRegistry; | 49 | public AddinRegistry PluginRegistry; |
50 | 50 | ||
51 | public PluginManager(AddinRegistry registry): base (registry) | 51 | public PluginManager(AddinRegistry registry): base (registry) |
52 | { | 52 | { |
53 | PluginRegistry = registry; | 53 | PluginRegistry = registry; |
54 | 54 | ||
55 | } | 55 | } |
56 | 56 | ||
57 | /// <summary> | 57 | /// <summary> |
58 | /// Installs the plugin. | 58 | /// Installs the plugin. |
59 | /// </summary> | 59 | /// </summary> |
60 | /// <returns> | 60 | /// <returns> |
@@ -97,14 +97,14 @@ namespace OpenSim.Framework | |||
97 | Addin addin = PluginRegistry.GetAddin(aentry.Addin.Id); | 97 | Addin addin = PluginRegistry.GetAddin(aentry.Addin.Id); |
98 | PluginRegistry.DisableAddin(addin.Id); | 98 | PluginRegistry.DisableAddin(addin.Id); |
99 | addin.Enabled = false; | 99 | addin.Enabled = false; |
100 | 100 | ||
101 | MainConsole.Instance.Output("Installation Success"); | 101 | MainConsole.Instance.Output("Installation Success"); |
102 | ListInstalledAddins(out res); | 102 | ListInstalledAddins(out res); |
103 | result = res; | 103 | result = res; |
104 | return true; | 104 | return true; |
105 | } | 105 | } |
106 | else | 106 | else |
107 | { | 107 | { |
108 | MainConsole.Instance.Output("Installation Failed"); | 108 | MainConsole.Instance.Output("Installation Failed"); |
109 | result = res; | 109 | result = res; |
110 | return false; | 110 | return false; |
@@ -159,11 +159,11 @@ namespace OpenSim.Framework | |||
159 | { | 159 | { |
160 | Dictionary<string, object> res = new Dictionary<string, object>(); | 160 | Dictionary<string, object> res = new Dictionary<string, object>(); |
161 | 161 | ||
162 | Addin[] addins = GetSortedAddinList("RobustPlugin"); | 162 | Addin[] addins = GetSortedAddinList("RobustPlugin"); |
163 | if(addins.Count() < 1) | 163 | if(addins.Count() < 1) |
164 | { | 164 | { |
165 | MainConsole.Instance.Output("Error!"); | 165 | MainConsole.Instance.Output("Error!"); |
166 | } | 166 | } |
167 | int count = 0; | 167 | int count = 0; |
168 | foreach (Addin addin in addins) | 168 | foreach (Addin addin in addins) |
169 | { | 169 | { |
@@ -377,7 +377,7 @@ namespace OpenSim.Framework | |||
377 | r["enabled"] = rep.Enabled == true ? true : false; | 377 | r["enabled"] = rep.Enabled == true ? true : false; |
378 | r["name"] = rep.Name; | 378 | r["name"] = rep.Name; |
379 | r["url"] = rep.Url; | 379 | r["url"] = rep.Url; |
380 | 380 | ||
381 | res.Add(count.ToString(), r); | 381 | res.Add(count.ToString(), r); |
382 | count++; | 382 | count++; |
383 | } | 383 | } |
@@ -493,7 +493,7 @@ namespace OpenSim.Framework | |||
493 | } | 493 | } |
494 | 494 | ||
495 | 495 | ||
496 | 496 | ||
497 | #region Util | 497 | #region Util |
498 | private void Testing() | 498 | private void Testing() |
499 | { | 499 | { |
@@ -537,15 +537,15 @@ namespace OpenSim.Framework | |||
537 | 537 | ||
538 | ArrayList xlist = new ArrayList(); | 538 | ArrayList xlist = new ArrayList(); |
539 | ArrayList list = new ArrayList(); | 539 | ArrayList list = new ArrayList(); |
540 | try | 540 | try |
541 | { | 541 | { |
542 | list.AddRange(PluginRegistry.GetAddins()); | 542 | list.AddRange(PluginRegistry.GetAddins()); |
543 | } | 543 | } |
544 | catch (Exception) | 544 | catch (Exception) |
545 | { | 545 | { |
546 | Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[]; | 546 | Addin[] x = xlist.ToArray(typeof(Addin)) as Addin[]; |
547 | return x; | 547 | return x; |
548 | } | 548 | } |
549 | 549 | ||
550 | foreach (Addin addin in list) | 550 | foreach (Addin addin in list) |
551 | { | 551 | { |
@@ -559,5 +559,5 @@ namespace OpenSim.Framework | |||
559 | return addins; | 559 | return addins; |
560 | } | 560 | } |
561 | #endregion Util | 561 | #endregion Util |
562 | } | 562 | } |
563 | } | 563 | } |