Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs
This commit is contained in:
Melanie
2011-10-11 21:28:23 +01:00
5 changed files with 69 additions and 93 deletions

View File

@@ -1871,6 +1871,8 @@
<Reference name="OpenSim.Region.ClientStack"/>
<Reference name="OpenSim.Framework.Communications"/>
<Reference name="OpenSim.Server.Base"/>
<Reference name="OpenSim.Services.Interfaces"/>
<Reference name="OpenSim.Services.UserAccountService"/>
<Reference name="XMLRPC" path="../../../bin/"/>
<Reference name="Nini" path="../../../bin/"/>
<Reference name="log4net" path="../../../bin/"/>