Melanie Thielker 4468aa0dcf Merge branch 'master' of opensimulator.org:/var/git/opensim

2016-07-04 03:37:45 +01:00

..

Agent

Allow default permissions from the viewer to be applied to uploaded objects.

2016-04-29 21:23:32 +02:00

Asset

bad merge?

2015-09-01 14:54:35 +01:00

Avatar

Finally remove the requirement for an InventoryItem/FolderBase object to

2016-07-04 03:35:48 +01:00

Framework

Finally remove the requirement for an InventoryItem/FolderBase object to

2016-07-04 03:35:48 +01:00

Hypergrid

bad merge?

2015-09-01 14:54:35 +01:00

Properties

Pushed AssemblyVersion up to VersionInfo, so that we don't need to do global replace anymore.

2016-02-21 11:14:02 -08:00

Scripting

Mantis #7919: fatal exception on LoadImageURLModule

2016-06-06 09:55:25 -07:00

ServiceConnectorsIn

add missing handlers for preferences

2015-09-28 13:22:32 +01:00

ServiceConnectorsOut

Finally remove the requirement for an InventoryItem/FolderBase object to

2016-07-04 03:35:48 +01:00

World

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

2016-07-04 03:37:45 +01:00