Merge branch 'avination' into careminster

This commit is contained in:
Melanie
2013-02-14 07:45:30 +00:00
2 changed files with 77 additions and 20 deletions

View File

@@ -94,6 +94,8 @@ namespace OpenSim.Region.ClientStack.Linden
{
m_scene = s;
m_scene.EventManager.OnRegisterCaps += RegisterCaps;
m_scene.RegisterModuleInterface<ISimulatorFeaturesModule>(this);
}
public void RemoveRegion(Scene s)