OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

0.7.5-pf-bulletsim
Justin Clark-Casey (justincc) 2012-12-08 01:37:10 +00:00
parent 63cff49bce 77e88fab06
commit 8de9f9dd4a
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/PluginManager.cs
View File

@ -54,7 +54,7 @@ namespace OpenSim.Framework
} }
/// <summary> /// <summary>
/// Installs the plugin. /// Installs the plugin.
/// </summary> /// </summary>
/// <returns> /// <returns>

2
OpenSim/Server/Base/CommandManager.cs
View File

@ -32,8 +32,8 @@ using System.Linq;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel; using System.Collections.ObjectModel;
using Mono.Addins.Setup;
using Mono.Addins; using Mono.Addins;
// using Mono.Addins.Setup;
using Mono.Addins.Description; using Mono.Addins.Description;
using OpenSim.Framework; using OpenSim.Framework;

1
prebuild.xml
View File

@ -739,6 +739,7 @@
<Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/> <Reference name="OpenMetaverse.StructuredData" path="../../../bin/"/>
<Reference name="OpenMetaverse" path="../../../bin/"/> <Reference name="OpenMetaverse" path="../../../bin/"/>
<Reference name="Mono.Addins" path="../../../bin/"/> <Reference name="Mono.Addins" path="../../../bin/"/>
<Reference name="Mono.Addins.Setup" path="../../../bin/"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>
<Reference name="OpenSim.Framework.Servers"/> <Reference name="OpenSim.Framework.Servers"/>