diff options
| author | Melanie | 2010-05-10 15:57:32 +0100 |
|---|---|---|
| committer | Melanie | 2010-05-10 15:57:32 +0100 |
| commit | 5814d16b588103193174ae63195339cfed275e9d (patch) | |
| tree | 1bfeeb9ca3146592442795b47cb329f9363c170d /OpenSim | |
| parent | Fix overlooked readLock which was left open (diff) | |
| parent | Fixed a typo in the Friends packaging (Pricipal -> Principal) that was making... (diff) | |
| download | opensim-SC-5814d16b588103193174ae63195339cfed275e9d.zip opensim-SC-5814d16b588103193174ae63195339cfed275e9d.tar.gz opensim-SC-5814d16b588103193174ae63195339cfed275e9d.tar.bz2 opensim-SC-5814d16b588103193174ae63195339cfed275e9d.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Services/Interfaces/IFriendsService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IFriendsService.cs b/OpenSim/Services/Interfaces/IFriendsService.cs index 2692c48..0ddd5e5 100644 --- a/OpenSim/Services/Interfaces/IFriendsService.cs +++ b/OpenSim/Services/Interfaces/IFriendsService.cs | |||
| @@ -62,7 +62,7 @@ namespace OpenSim.Services.Interfaces | |||
| 62 | public Dictionary<string, object> ToKeyValuePairs() | 62 | public Dictionary<string, object> ToKeyValuePairs() |
| 63 | { | 63 | { |
| 64 | Dictionary<string, object> result = new Dictionary<string, object>(); | 64 | Dictionary<string, object> result = new Dictionary<string, object>(); |
| 65 | result["PricipalID"] = PrincipalID.ToString(); | 65 | result["PrincipalID"] = PrincipalID.ToString(); |
| 66 | result["Friend"] = Friend; | 66 | result["Friend"] = Friend; |
| 67 | result["MyFlags"] = MyFlags.ToString(); | 67 | result["MyFlags"] = MyFlags.ToString(); |
| 68 | result["TheirFlags"] = TheirFlags.ToString(); | 68 | result["TheirFlags"] = TheirFlags.ToString(); |