BlueWall 92849c5cc3 missed some conflict markup

2012-10-09 07:59:44 -04:00

..

ApplicationPlugins

Get rid of some unnecessary casts in RemoteAdminPlugin.

2012-09-29 02:57:28 +01:00

Capabilities

If the GetTexture capability receives a request for a range of data beyond that of an otherwise valid asset, return HTTP PartialContent rather than RequestedRangeNotSatisfiable.

2012-09-06 00:11:47 +01:00

ConsoleClient

Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."

2012-09-30 07:48:03 -07:00

Data

Removed the bits about the TOSModule. That module doesn't go into core. WARNING: migration on GridUser withdrawn too, but left the migration number there.

2012-09-27 16:43:18 -07:00

Framework

On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates.

2012-10-06 02:34:49 +01:00

Region

refactor: Rename UserSessioNID -> UserSession in WebStatsModule since this is what it actually represents

2012-10-06 04:06:27 +01:00

Server

missed some conflict markup

2012-10-09 07:59:44 -04:00

Services

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

2012-10-04 15:33:17 -07:00

Tests

Renaming existing 'torture' tests to 'performance' tests instead, since this better matches what they really do.

2012-08-29 23:19:21 +01:00

Tools

Fix a bug in pCampbot grabbing behaviour where an exception would be thrown if the bot was not yet aware of any objects.

2012-08-01 22:30:34 +01:00