diff options
| author | Melanie | 2010-12-03 02:36:13 +0000 |
|---|---|---|
| committer | Melanie | 2010-12-03 02:36:13 +0000 |
| commit | 342dc532ec64642d5997f23050a9776f663facdf (patch) | |
| tree | b0be3997967aa6e4d79873281f535ad436b841e4 /OpenSim/Region/Framework/Interfaces | |
| parent | Change the way sim health reporting reports sim startup (diff) | |
| parent | Only force prim persistence before delete if the prim is the result of an unp... (diff) | |
| download | opensim-SC-342dc532ec64642d5997f23050a9776f663facdf.zip opensim-SC-342dc532ec64642d5997f23050a9776f663facdf.tar.gz opensim-SC-342dc532ec64642d5997f23050a9776f663facdf.tar.bz2 opensim-SC-342dc532ec64642d5997f23050a9776f663facdf.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Also prevent god takes from ending up in Lost and Found
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IUserManagement.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs index 1a5cb7e..2904ee8 100644 --- a/OpenSim/Region/Framework/Interfaces/IUserManagement.cs +++ b/OpenSim/Region/Framework/Interfaces/IUserManagement.cs | |||
| @@ -9,5 +9,6 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 9 | { | 9 | { |
| 10 | string GetUserName(UUID uuid); | 10 | string GetUserName(UUID uuid); |
| 11 | void AddUser(UUID uuid, string userData); | 11 | void AddUser(UUID uuid, string userData); |
| 12 | void AddUser(UUID uuid, string firstName, string lastName, string profileURL); | ||
| 12 | } | 13 | } |
| 13 | } | 14 | } |