ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-07 09:45:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Data/MySQL/MySQLXAssetData.cs
This commit is contained in:
Melanie
2012-03-20 02:48:11 +00:00
parent 618244f285 a3abd65e3d
commit 5768a151ff
18 changed files with 197 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -540,7 +540,7 @@ namespace OpenSim.Services.UserAccountService
else
{
m_log.DebugFormat(
"[USER ACCOUNT SERVICE]; Created user inventory for {0} {1}", firstName, lastName);
"[USER ACCOUNT SERVICE]: Created user inventory for {0} {1}", firstName, lastName);
}
if (m_CreateDefaultAvatarEntries)