OpenSimMirror/OpenSim
Melanie 4275d7a839 Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
	bin/Regions/Regions.ini.example
2013-04-28 19:03:39 +02:00
..
Addons Switched to using the other Util function with a default value. 2013-02-27 20:59:16 -08:00
ApplicationPlugins Merge branch 'master' into careminster 2013-03-27 01:17:59 +00:00
Capabilities Merge branch 'avination' into careminster 2013-03-03 13:24:37 +00:00
ConsoleClient Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already. 2013-02-27 00:21:02 +00:00
Data Merge branch 'master' into careminster 2013-03-15 23:45:32 +00:00
Framework Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. 2013-04-25 21:37:40 +01:00
Region Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 2013-04-28 19:03:39 +02:00
Server Merge branch 'master' into careminster 2013-03-15 23:45:32 +00:00
Services Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 2013-03-26 03:40:06 +00:00
Tests Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:24:41 +02:00
Tools Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 2013-03-26 03:40:06 +00:00