diff options
| author | Melanie | 2013-08-17 03:23:45 +0100 |
|---|---|---|
| committer | Melanie | 2013-08-17 03:23:45 +0100 |
| commit | bef03fb30be67dbe671dcc330558daf8a6c4bb22 (patch) | |
| tree | 6d221db8af5bdb1a09190527a79aae3dfe3116d9 /OpenSim/Server/Handlers/Profiles | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove mono compiler warnings from UserProfilesModule (diff) | |
| download | opensim-SC_OLD-bef03fb30be67dbe671dcc330558daf8a6c4bb22.zip opensim-SC_OLD-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.gz opensim-SC_OLD-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.bz2 opensim-SC_OLD-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs index f9a520a..28dbbc2 100644 --- a/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs +++ b/OpenSim/Server/Handlers/Profiles/UserProfilesConnector.cs | |||
| @@ -39,8 +39,7 @@ namespace OpenSim.Server.Handlers.Profiles | |||
| 39 | { | 39 | { |
| 40 | public class UserProfilesConnector: ServiceConnector | 40 | public class UserProfilesConnector: ServiceConnector |
| 41 | { | 41 | { |
| 42 | static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 42 | // static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
| 43 | |||
| 44 | 43 | ||
| 45 | // Our Local Module | 44 | // Our Local Module |
| 46 | public IUserProfilesService ServiceModule | 45 | public IUserProfilesService ServiceModule |
| @@ -110,5 +109,4 @@ namespace OpenSim.Server.Handlers.Profiles | |||
| 110 | Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData); | 109 | Server.AddJsonRPCHandler("user_data_update", handler.UpdateUserAppData); |
| 111 | } | 110 | } |
| 112 | } | 111 | } |
| 113 | } | 112 | } \ No newline at end of file |
| 114 | |||