| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -9/+6 |
|\ |
|
| * | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 4 | -13/+7 |
| |\ |
|
| * | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -9/+6 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 5 | -13/+12 |
|\ \ \ |
|
| * \ \ | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 3 | -11/+11 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 3 | -11/+11 |
| | |\ \
| | | |/ |
|
| | | * | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 3 | -11/+11 |
| * | | | Formatting cleanup. | Jeff Ames | 2010-10-28 | 2 | -2/+1 |
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 2 | -9/+6 |
|\ \ \ \
| |/ / / |
|
| * | | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 2 | -9/+6 |
| |/ / |
|
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -2/+0 |
|\ \ \
| |/ / |
|
| * | | Remove a bit of dead code relating to ObjectCapacity | Melanie | 2010-10-21 | 1 | -2/+0 |
| |/ |
|
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 3 | -14/+18 |
|\ \
| |/ |
|
| * | Pass in requesting agent ID when GetGroupMembers is called in the XMLRPC grou... | Justin Clark-Casey (justincc) | 2010-10-19 | 2 | -3/+6 |
| * | Display more information when xmlrpcgroupsserver comms fails | Justin Clark-Casey (justincc) | 2010-10-19 | 2 | -13/+14 |
* | | Make SendKillObject send multiple localIDs in one packet. This avoids the | Melanie | 2010-10-08 | 5 | -7/+8 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 2 | -3/+7 |
|\ \
| |/ |
|
| * | Add and plumb the usetex URL parameter to worldview. Required but not yet | Melanie | 2010-10-06 | 2 | -3/+7 |
| * | Convert worldview to GET | Melanie | 2010-10-06 | 1 | -7/+11 |
* | | Convert worldview to GET | Melanie | 2010-10-06 | 1 | -7/+11 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 3 | -0/+263 |
|\ \
| |/ |
|
| * | Change the URL /worldview to /worldview/<region id> to support multiregion | Melanie | 2010-10-06 | 2 | -3/+4 |
| * | Convert the BMP to a JPEG image and return it. This should be testable. | Melanie | 2010-10-06 | 1 | -1/+7 |
| * | Add the parameter plumbing and image generation | Melanie | 2010-10-06 | 2 | -2/+22 |
| * | Add WOrldView request handler and plumbing | Melanie | 2010-10-06 | 2 | -0/+155 |
| * | Add WorldView module skeleton | Melanie | 2010-10-06 | 2 | -0/+81 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-06 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Formatting cleanup. | Jeff Ames | 2010-10-04 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-02 | 1 | -0/+24 |
|\ \
| |/ |
|
| * | So, the client can have an old idea of the object properties for the object w... | Melanie | 2010-10-02 | 1 | -0/+24 |
| * | Reapplying the parts of the prior revert that were not derived from the | Melanie | 2010-10-02 | 1 | -2/+2 |
| * | Revert "Forward-port 0.6 fix" | Melanie | 2010-10-02 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 1 | -2/+2 |
|\ \
| |/ |
|
| * | Forward-port 0.6 fix | Melanie | 2010-09-30 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-21 | 1 | -9/+2 |
|\ \
| |/ |
|
| * | For all Flotasm group module XMLRPC calls, correct parameter requestingAgentI... | Justin Clark-Casey (justincc) | 2010-09-17 | 1 | -9/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 6 | -159/+124 |
|\ \
| |/ |
|
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA... | John Hurliman | 2010-09-16 | 6 | -159/+124 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-16 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | rename SceneObjectGroup.DeleteGroup() to DeleteGroupFromScene() to improve co... | Justin Clark-Casey (justincc) | 2010-09-15 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 12 | -42/+38 |
|\ \
| |/ |
|
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 6 | -28/+25 |
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 6 | -14/+13 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 2 | -2/+2 |
|\ \
| |/ |
|
| * | Make console backup command do a forced backup rather than non-forced | Justin Clark-Casey (justincc) | 2010-09-06 | 2 | -2/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-30 | 1 | -10/+12 |
|\ \
| |/ |
|
| * | Improve liveness by operating on list copies of SOG.Children where appropriate | Justin Clark-Casey (justincc) | 2010-08-28 | 1 | -10/+12 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-26 | 6 | -123/+170 |
|\ \
| |/ |
|
| * | Improve consistency of locking for SOG.m_parts in order to avoid race conditi... | Justin Clark-Casey (justincc) | 2010-08-26 | 6 | -123/+170 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-18 | 4 | -13/+18 |
|\ \
| |/ |
|