Melanie 1f32730798 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2012-03-03 09:58:57 +00:00

..

Access

minor: change login enable/disable messages in last commit so that they occur after the setting has been made

2011-08-12 22:50:58 +01:00

Archiver

Merge branch 'master' into careminster

2012-02-04 11:48:20 +00:00

Cloud

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00

Estate

Merge branch 'master' into careminster

2012-02-04 11:48:20 +00:00

Land

Try to resolve some problems with viewers crashing after hitting parcel banlines or freezing on the banline.

2012-02-23 22:56:42 +00:00

LegacyMap

minor: a little bit of log message correction/commenting out

2011-08-11 03:07:41 +01:00

Media/Moap

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

Objects

Merge branch 'master' into careminster

2012-02-01 10:08:45 +00:00

Permissions

Fix problem with dragging child part inventory item to user inventory.

2012-02-21 22:54:30 +00:00

Region

Add the ability to abort a pending restart using the viewer UI or a

2012-01-28 22:19:10 +01:00

Serialiser

Turn off logging on test in last commit (2b84295).

2012-02-16 03:02:11 +00:00

Sound

Rename ForEachAvatar back to ForEachScenePresence. The other changes

2011-11-03 17:53:51 -07:00

Sun

Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to

2011-11-03 17:06:08 -07:00

Terrain

Merge branch 'master' into bigmerge

2011-11-19 22:39:15 +00:00

Tests

Add copyright headers.

2009-03-07 02:11:50 +00:00

Vegetation

Fix a bug preventing region modules from creating trees at anything but the default scale.

2011-08-13 00:52:32 +01:00

Warp3DMap

match water color for warp3d map tiler and adjust lighting

2011-06-13 12:37:43 +01:00

Wind

Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to

2011-11-03 17:06:08 -07:00

WorldMap

Merge branch 'master' into careminster

2012-03-03 09:58:57 +00:00