aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2012-10-02 00:06:02 +0100
committerMelanie2012-10-02 00:06:02 +0100
commite40cc46712b938696d9d8575c53021cd14c1398c (patch)
tree2a67c34c4ea8796cf7a25adc426399e8a0663aa8 /OpenSim
parentMerge branch 'master' into careminster (diff)
parentOn more virtual method (diff)
downloadopensim-SC-e40cc46712b938696d9d8575c53021cd14c1398c.zip
opensim-SC-e40cc46712b938696d9d8575c53021cd14c1398c.tar.gz
opensim-SC-e40cc46712b938696d9d8575c53021cd14c1398c.tar.bz2
opensim-SC-e40cc46712b938696d9d8575c53021cd14c1398c.tar.xz
Merge branch 'master' into careminster
Diffstat (limited to '')
-rw-r--r--OpenSim/Services/Interfaces/IGridUserService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IGridUserService.cs b/OpenSim/Services/Interfaces/IGridUserService.cs
index 8b738ab..2e7237e 100644
--- a/OpenSim/Services/Interfaces/IGridUserService.cs
+++ b/OpenSim/Services/Interfaces/IGridUserService.cs
@@ -80,7 +80,7 @@ namespace OpenSim.Services.Interfaces
80 80
81 } 81 }
82 82
83 public Dictionary<string, object> ToKeyValuePairs() 83 public virtual Dictionary<string, object> ToKeyValuePairs()
84 { 84 {
85 Dictionary<string, object> result = new Dictionary<string, object>(); 85 Dictionary<string, object> result = new Dictionary<string, object>();
86 result["UserID"] = UserID; 86 result["UserID"] = UserID;