Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor ...

This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.

2010-01-16 00:05:08 +00:00

..

ApplicationPlugins

Fixed a couple of bugs with Appearance. Appearance is all good now.

2010-01-11 17:30:05 -08:00

Client

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

ConsoleClient

Change ConsoleClient to allow quoted values to be passed through. This

2010-01-08 11:02:39 +00:00

Data

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

Framework

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

Region

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

Server

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

Services

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

Tests

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

TestSuite

* Fixes issue #4329 "llDialog fails silently" by updating OpenMetaverse.dll

2009-10-30 00:08:41 -07:00

Tools

minor: remove some mono compiler warnings

2009-11-24 17:32:14 +00:00