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

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-01-11 02:13:10 +00:00

..

Agent

Merge branch 'avination' into careminster

2012-11-17 02:58:14 +00:00

Asset

Merge branch 'avination' into careminster

2012-12-18 09:48:12 +00:00

Avatar

On baked texture save, replace any HG ID with an ordinary asset ID so the HGAssetBroker doesn't try to save back to the avatar's originating region

2013-01-10 01:45:56 +00:00

Framework

Merge branch 'master' into careminster

2012-12-16 21:19:30 +00:00

Hypergrid

Merge branch 'master' into careminster

2012-11-13 10:49:24 +00:00

Properties

Updated all existing AssemblyVersions's to 0.7.5.*. Many DLLs still don't have an AssemblyInfo file.

2012-11-13 19:26:43 -08:00

Scripting

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

ServiceConnectorsIn

Another 11 modules' directions moved out of .addin.xml

2012-11-13 08:36:44 -08:00

ServiceConnectorsOut

Merge branch 'master' into careminster

2012-12-07 03:49:04 +00:00

World

Merge branch 'master' into careminster

2013-01-11 02:13:10 +00:00