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

user_profiles
dahlia 2013-04-21 00:21:42 -07:00
commit 46e4ecadc8
2 changed files with 3 additions and 3 deletions

View File

@ -18,13 +18,13 @@
; Set path to directory for plugin registry. Information
; about the registered repositories and installed plugins
; will be stored here
; The Robust.exe process must hvae R/W access to the location
; The Robust.exe process must have R/W access to the location
RegistryLocation = "."
; Modular configurations
; Set path to directory for modular ini files...
; The Robust.exe process must hvae R/W access to the location
; The Robust.exe process must have R/W access to the location
ConfigDirectory = "/home/opensim/etc/Configs"
[ServiceList]

View File

@ -1635,7 +1635,7 @@
<Reference name="System.Xml"/>
<Reference name="System.Drawing"/>
<Reference name="System.Web"/>
<Reference name="Ionic.Zip"/>
<Reference name="Ionic.Zip" path="../../../bin/"/>
<Reference name="NDesk.Options" path="../../../bin/"/>
<Reference name="OpenMetaverseTypes" path="../../../bin/"/>
<Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>