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/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Remove mono compiler warnings from UserProfilesModule (diff) | |
| download | opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.zip opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.gz opensim-SC-bef03fb30be67dbe671dcc330558daf8a6c4bb22.tar.bz2 opensim-SC-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 'OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs index e85b0b7..764e71f 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianExternalCapsModule.cs | |||
| @@ -56,11 +56,8 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 56 | private Scene m_scene; | 56 | private Scene m_scene; |
| 57 | private String m_simianURL; | 57 | private String m_simianURL; |
| 58 | 58 | ||
| 59 | private IGridUserService m_GridUserService; | ||
| 60 | |||
| 61 | #region IRegionModule Members | 59 | #region IRegionModule Members |
| 62 | 60 | ||
| 63 | |||
| 64 | public string Name | 61 | public string Name |
| 65 | { | 62 | { |
| 66 | get { return this.GetType().Name; } | 63 | get { return this.GetType().Name; } |