Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-11-21 23:47:28 +00:00
14 changed files with 328 additions and 766 deletions

View File

@@ -1053,6 +1053,7 @@
<ReferencePath>../../../bin/</ReferencePath>
<Reference name="System"/>
<Reference name="OpenMetaverseTypes" path="../../../bin/"/>
<Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
<Reference name="OpenMetaverse" path="../../../bin/"/>
<Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/>