Merge branch 'master' into diva-textures

This commit is contained in:
Melanie
2009-10-02 08:23:38 +01:00
356 changed files with 8423 additions and 5997 deletions

View File

@@ -601,7 +601,7 @@ namespace OpenSim.Region.OptionalModules.Agent.InternetRelayClientView.Server
if (names.Length > 1)
return names[1];
return names[0];
}
}
}
public IScene Scene