diff options
author | Melanie Thielker | 2016-06-21 01:46:38 +0200 |
---|---|---|
committer | Melanie Thielker | 2016-06-21 01:46:38 +0200 |
commit | 8e40bb6fb7d0d25b1c2f808bb326db858da2bb65 (patch) | |
tree | 3b101e2c31aa1dacb232a8f708869683baa8646b /OpenSim | |
parent | Split IM handling so an inheriting module can cange names if required. (diff) | |
download | opensim-SC_OLD-8e40bb6fb7d0d25b1c2f808bb326db858da2bb65.zip opensim-SC_OLD-8e40bb6fb7d0d25b1c2f808bb326db858da2bb65.tar.gz opensim-SC_OLD-8e40bb6fb7d0d25b1c2f808bb326db858da2bb65.tar.bz2 opensim-SC_OLD-8e40bb6fb7d0d25b1c2f808bb326db858da2bb65.tar.xz |
Make some more modules inheritable
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | 6 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs | 26 |
2 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs index f7f9da9..6665947 100644 --- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | |||
@@ -55,9 +55,9 @@ namespace OpenSim.Capabilities.Handlers | |||
55 | { | 55 | { |
56 | private static readonly ILog m_log = | 56 | private static readonly ILog m_log = |
57 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 57 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
58 | private IUserManagement m_UserManagement; | 58 | protected IUserManagement m_UserManagement; |
59 | 59 | ||
60 | public GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description) | 60 | public virtual GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description) |
61 | : base("GET", path, name, description) | 61 | : base("GET", path, name, description) |
62 | { | 62 | { |
63 | m_UserManagement = umService; | 63 | m_UserManagement = umService; |
@@ -120,4 +120,4 @@ namespace OpenSim.Capabilities.Handlers | |||
120 | } | 120 | } |
121 | 121 | ||
122 | } | 122 | } |
123 | } \ No newline at end of file | 123 | } |
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs b/OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs index 6617bbc..eabacb4 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/GetDisplayNamesModule.cs | |||
@@ -57,16 +57,16 @@ namespace OpenSim.Region.ClientStack.Linden | |||
57 | private static readonly ILog m_log = | 57 | private static readonly ILog m_log = |
58 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 58 | LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
59 | 59 | ||
60 | private Scene m_scene; | 60 | protected Scene m_scene; |
61 | private IUserManagement m_UserManager; | 61 | protected IUserManagement m_UserManager; |
62 | 62 | ||
63 | private bool m_Enabled = false; | 63 | protected bool m_Enabled = false; |
64 | 64 | ||
65 | private string m_URL; | 65 | protected string m_URL; |
66 | 66 | ||
67 | #region ISharedRegionModule Members | 67 | #region ISharedRegionModule Members |
68 | 68 | ||
69 | public void Initialise(IConfigSource source) | 69 | public virtual void Initialise(IConfigSource source) |
70 | { | 70 | { |
71 | IConfig config = source.Configs["ClientStack.LindenCaps"]; | 71 | IConfig config = source.Configs["ClientStack.LindenCaps"]; |
72 | if (config == null) | 72 | if (config == null) |
@@ -77,7 +77,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
77 | m_Enabled = true; | 77 | m_Enabled = true; |
78 | } | 78 | } |
79 | 79 | ||
80 | public void AddRegion(Scene s) | 80 | public virtual void AddRegion(Scene s) |
81 | { | 81 | { |
82 | if (!m_Enabled) | 82 | if (!m_Enabled) |
83 | return; | 83 | return; |
@@ -85,7 +85,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
85 | m_scene = s; | 85 | m_scene = s; |
86 | } | 86 | } |
87 | 87 | ||
88 | public void RemoveRegion(Scene s) | 88 | public virtual void RemoveRegion(Scene s) |
89 | { | 89 | { |
90 | if (!m_Enabled) | 90 | if (!m_Enabled) |
91 | return; | 91 | return; |
@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden | |||
94 | m_scene = null; | 94 | m_scene = null; |
95 | } | 95 | } |
96 | 96 | ||
97 | public void RegionLoaded(Scene s) | 97 | public virtual void RegionLoaded(Scene s) |
98 | { | 98 | { |
99 | if (!m_Enabled) | 99 | if (!m_Enabled) |
100 | return; | 100 | return; |
@@ -103,22 +103,22 @@ namespace OpenSim.Region.ClientStack.Linden | |||
103 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; | 103 | m_scene.EventManager.OnRegisterCaps += RegisterCaps; |
104 | } | 104 | } |
105 | 105 | ||
106 | public void PostInitialise() | 106 | public virtual void PostInitialise() |
107 | { | 107 | { |
108 | } | 108 | } |
109 | 109 | ||
110 | public void Close() { } | 110 | public virtual void Close() { } |
111 | 111 | ||
112 | public string Name { get { return "GetDisplayNamesModule"; } } | 112 | public virtual string Name { get { return "GetDisplayNamesModule"; } } |
113 | 113 | ||
114 | public Type ReplaceableInterface | 114 | public virtual Type ReplaceableInterface |
115 | { | 115 | { |
116 | get { return null; } | 116 | get { return null; } |
117 | } | 117 | } |
118 | 118 | ||
119 | #endregion | 119 | #endregion |
120 | 120 | ||
121 | public void RegisterCaps(UUID agentID, Caps caps) | 121 | public virtual void RegisterCaps(UUID agentID, Caps caps) |
122 | { | 122 | { |
123 | UUID capID = UUID.Random(); | 123 | UUID capID = UUID.Random(); |
124 | 124 | ||