OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

user_profiles
Melanie 2013-04-27 17:57:22 +01:00
parent cbb3bb62da 90a6891a7d
commit 12599c34e2
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenSim/Server/Base/ServerUtils.cs
View File

@ -286,6 +286,7 @@ namespace OpenSim.Server.Base
e.InnerException == null ? e.Message : e.InnerException.Message, e.InnerException == null ? e.Message : e.InnerException.Message,
e.StackTrace); e.StackTrace);
} }
m_log.ErrorFormat("[SERVER UTILS]: Error loading plugin {0}: {1}", dllName, e.Message);
return null; return null;
} }

2
OpenSim/Services/UserAccountService/GridUserService.cs
View File

@ -73,7 +73,7 @@ namespace OpenSim.Services.UserAccountService
return info; return info;
} }
public GridUserInfo[] GetGridUserInfo(string[] userIDs) public virtual GridUserInfo[] GetGridUserInfo(string[] userIDs)
{ {
List<GridUserInfo> ret = new List<GridUserInfo>(); List<GridUserInfo> ret = new List<GridUserInfo>();