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

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
This commit is contained in:
Melanie
2013-02-06 02:22:12 +00:00
parent 364a4604c3 9ebad38c34
commit f567ff9f51
24 changed files with 370 additions and 459 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -564,7 +564,7 @@ namespace OpenSim.Services.UserAccountService
return account;
}
private void CreateDefaultAppearanceEntries(UUID principalID)
protected void CreateDefaultAppearanceEntries(UUID principalID)
{
m_log.DebugFormat("[USER ACCOUNT SERVICE]: Creating default appearance items for {0}", principalID);