diff options
| author | Diva Canto | 2010-06-29 06:37:39 -0700 |
|---|---|---|
| committer | Diva Canto | 2010-06-29 06:37:39 -0700 |
| commit | 1cd9118c7a72a6e80aafe56134630682f2bb04d0 (patch) | |
| tree | 09f953b9b6150ea29153917b2c159fa621a1cf66 /OpenSim/Region/CoreModules/Scripting | |
| parent | don't report the null uuid as a missing asset on saving oars/iars (diff) | |
| parent | This file wants to be committed. (diff) | |
| download | opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.zip opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.gz opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.bz2 opensim-SC_OLD-1cd9118c7a72a6e80aafe56134630682f2bb04d0.tar.xz | |
Merge branch 'master' into 0.7-post-fixes
Conflicts:
OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Scripting')
| -rw-r--r-- | OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs index 83f004d..c0975ea 100644 --- a/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs +++ b/OpenSim/Region/CoreModules/Scripting/EMailModules/EmailModule.cs | |||
| @@ -40,7 +40,7 @@ using OpenSim.Region.Framework.Scenes; | |||
| 40 | 40 | ||
| 41 | namespace OpenSim.Region.CoreModules.Scripting.EmailModules | 41 | namespace OpenSim.Region.CoreModules.Scripting.EmailModules |
| 42 | { | 42 | { |
| 43 | public class EmailModule : IEmailModule | 43 | public class EmailModule : IRegionModule, IEmailModule |
| 44 | { | 44 | { |
| 45 | // | 45 | // |
| 46 | // Log | 46 | // Log |