diff options
| author | Melanie | 2012-11-12 23:27:47 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-12 23:27:47 +0000 |
| commit | 2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc (patch) | |
| tree | 308caeac8741ef507a3f02f41d4403a29d06b06e /OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Completely remove the IRegionModule interface (diff) | |
| download | opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.zip opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.gz opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.bz2 opensim-SC-2e0ce70e639391ecec9d63d88c6d8910e3b0ebfc.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/ModuleLoader.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs')
| -rw-r--r-- | OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs index 5d57f70..5c7a3ac 100644 --- a/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs +++ b/OpenSim/Region/OptionalModules/Avatar/XmlRpcGroups/SimianGroupsServicesConnectorModule.cs | |||
| @@ -176,7 +176,7 @@ namespace OpenSim.Region.OptionalModules.Avatar.XmlRpcGroups | |||
| 176 | // private IUserAccountService m_accountService = null; | 176 | // private IUserAccountService m_accountService = null; |
| 177 | 177 | ||
| 178 | 178 | ||
| 179 | #region IRegionModuleBase Members | 179 | #region Region Module interfaceBase Members |
| 180 | 180 | ||
| 181 | public string Name | 181 | public string Name |
| 182 | { | 182 | { |