diff options
Merge branch 'master' into careminster-presence-refactor
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs index 61cbb90..cc51c3b 100644 --- a/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs +++ b/OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs | |||
| @@ -824,5 +824,5 @@ namespace OpenSim.Region.OptionalModules.World.MoneyModule | |||
| 824 | RegionMoneyRequest = 1, | 824 | RegionMoneyRequest = 1, |
| 825 | Gift = 2, | 825 | Gift = 2, |
| 826 | Purchase = 3 | 826 | Purchase = 3 |
| 827 | } | 827 | } |
| 828 | } \ No newline at end of file | 828 | } \ No newline at end of file |