aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorCharles Krinke2008-06-28 19:04:28 +0000
committerCharles Krinke2008-06-28 19:04:28 +0000
commit1091f78e049943037f9fdd11fd6a98f4e7b846ac (patch)
tree48fb0a6b0ef0c132127496201d2dd7be8243e81f
parentAltered prim description/debugging message code to be more warning friendly (diff)
downloadopensim-SC_OLD-1091f78e049943037f9fdd11fd6a98f4e7b846ac.zip
opensim-SC_OLD-1091f78e049943037f9fdd11fd6a98f4e7b846ac.tar.gz
opensim-SC_OLD-1091f78e049943037f9fdd11fd6a98f4e7b846ac.tar.bz2
opensim-SC_OLD-1091f78e049943037f9fdd11fd6a98f4e7b846ac.tar.xz
Mantis#1626. Thank you kindly, Melanie for a patch that:
Fixes IAvatarService for grid and standalone modes
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs4
-rw-r--r--OpenSim/Region/Communications/OGS1/OGS1UserServices.cs2
2 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index fe09b03..1e059fe 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Communications
41 /// <summary> 41 /// <summary>
42 /// Base class for user management (create, read, etc) 42 /// Base class for user management (create, read, etc)
43 /// </summary> 43 /// </summary>
44 public abstract class UserManagerBase : IUserService 44 public abstract class UserManagerBase : IUserService, IAvatarService
45 { 45 {
46 private static readonly ILog m_log 46 private static readonly ILog m_log
47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 47 = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -703,4 +703,4 @@ namespace OpenSim.Framework.Communications
703 return new List<LLUUID>(); 703 return new List<LLUUID>();
704 } 704 }
705 } 705 }
706} \ No newline at end of file 706}
diff --git a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
index 0ffc4b2..7afec37 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1UserServices.cs
@@ -39,7 +39,7 @@ using OpenSim.Framework.Communications;
39 39
40namespace OpenSim.Region.Communications.OGS1 40namespace OpenSim.Region.Communications.OGS1
41{ 41{
42 public class OGS1UserServices : IUserService 42 public class OGS1UserServices : IUserService, IAvatarService
43 { 43 {
44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
45 45