Melanie b9146a7922 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2013-03-15 23:45:32 +00:00

..

Linden

Merge branch 'master' into careminster

2013-03-15 23:45:32 +00:00

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00:00

ClientStackManager.cs

Adds the ability to load more then one IClientNetworkServer thereby allowing additional client network servers at the same time. Use comma separated values in clientstack_plugin in your config. Additional plugins lying around shouldn't be picked up because the loader only loads configured dll assemblies and breaks at the first IClientNetworkServer found in the assembly. (the only new functionality is the ability to specify more in config). Note: The existing functionality also passes in a nini config.. and has a boolean to determine if the client network server should be initialized for a specific scene.

2013-02-03 08:13:52 -05:00

IClientNetworkServer.cs

Beginning work on the new LLUDP implementation

2009-10-05 17:38:14 -07:00

RegionApplicationBase.cs

Revert "Merge master into teravuswork", it should have been avination, not master.

2012-11-15 10:05:16 -05:00