diff options
| author | BlueWall | 2012-11-25 17:03:14 -0500 |
|---|---|---|
| committer | BlueWall | 2012-11-25 17:03:14 -0500 |
| commit | c754003944d0166bf50b4f94b0c0eea642503bb0 (patch) | |
| tree | dfa1c2020d5500d510519d5b2b3236600692f277 /OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |
| parent | Merge branch 'master' into connector_plugin (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.zip opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.gz opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.bz2 opensim-SC-c754003944d0166bf50b4f94b0c0eea642503bb0.tar.xz | |
Merge branch 'master' into connector_plugin
Conflicts:
OpenSim/Server/Base/ServicesServerBase.cs
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs index 6aefc38..bd8069f 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianProfiles.cs | |||
| @@ -59,7 +59,7 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
| 59 | /// Connects avatar profile and classified queries to the SimianGrid | 59 | /// Connects avatar profile and classified queries to the SimianGrid |
| 60 | /// backend | 60 | /// backend |
| 61 | /// </summary> | 61 | /// </summary> |
| 62 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule")] | 62 | [Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "SimianProfiles")] |
| 63 | public class SimianProfiles : INonSharedRegionModule | 63 | public class SimianProfiles : INonSharedRegionModule |
| 64 | { | 64 | { |
| 65 | private static readonly ILog m_log = | 65 | private static readonly ILog m_log = |