diff options
| author | Diva Canto | 2016-06-21 20:28:44 -0700 |
|---|---|---|
| committer | Diva Canto | 2016-06-21 20:28:44 -0700 |
| commit | 74c79d1f88508990dcc77cbf1e3d1341fb1a7e32 (patch) | |
| tree | 126c6a7c404d4f21d35ae49d95da801b7e08e48d /OpenSim/Capabilities | |
| parent | Mantis #7932: Some objects were being serialized with PCode=9 and State != 0 ... (diff) | |
| parent | Fix a dumb mistake (diff) | |
| download | opensim-SC_OLD-74c79d1f88508990dcc77cbf1e3d1341fb1a7e32.zip opensim-SC_OLD-74c79d1f88508990dcc77cbf1e3d1341fb1a7e32.tar.gz opensim-SC_OLD-74c79d1f88508990dcc77cbf1e3d1341fb1a7e32.tar.bz2 opensim-SC_OLD-74c79d1f88508990dcc77cbf1e3d1341fb1a7e32.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Capabilities')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs index f7f9da9..155196c 100644 --- a/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs +++ b/OpenSim/Capabilities/Handlers/GetDisplayNames/GetDisplayNamesHandler.cs | |||
| @@ -55,7 +55,7 @@ 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 GetDisplayNamesHandler(string path, IUserManagement umService, string name, string description) |
| 61 | : base("GET", path, name, description) | 61 | : base("GET", path, name, description) |
| @@ -120,4 +120,4 @@ namespace OpenSim.Capabilities.Handlers | |||
| 120 | } | 120 | } |
| 121 | 121 | ||
| 122 | } | 122 | } |
| 123 | } \ No newline at end of file | 123 | } |