| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-02-18 | 1 | -2/+4 |
|\ |
|
| * | Remove some debugging output form the logger | BlueWall | 2012-02-16 | 1 | -2/+4 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-21 | 1 | -1/+5 |
|\ \
| |/ |
|
| * | RegionReady: | BlueWall | 2012-01-18 | 1 | -1/+5 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-16 | 1 | -2/+5 |
|\ \
| |/ |
|
| * | protect the region ready alerts for loading oarfiles if no post URI is set | Mic Bowman | 2012-01-14 | 1 | -2/+5 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-14 | 1 | -6/+51 |
|\ \
| |/ |
|
| * | Update RegionReadyModule | BlueWall | 2012-01-13 | 1 | -6/+51 |
* | | Merge branch 'master' into careminster | Melanie | 2012-01-06 | 1 | -3/+2 |
|\ \
| |/ |
|
| * | Move simulator asset info commands to an optional module from the connector. ... | Justin Clark-Casey (justincc) | 2012-01-05 | 1 | -3/+2 |
| * | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 1 | -5/+5 |
* | | Fix CHANGED_TEXTURE and CHANGED_COLOR. | Melanie | 2011-12-05 | 1 | -5/+5 |
* | | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge | Melanie | 2011-10-25 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Get OdeScene to use passed in time step rather than hard-coded 0.089 | Justin Clark-Casey (justincc) | 2011-10-20 | 1 | -1/+1 |
* | | Resolve merge commits, stage 1 | Tom | 2011-09-04 | 2 | -2/+7 |
|\ \
| |/ |
|
| * | Add "shutdown" message to RegionReady | BlueWall | 2011-08-15 | 1 | -0/+5 |
| * | refactor: Move all callers of the obsoleted SychronousRestObjectPoster.BeginP... | Justin Clark-Casey (justincc) | 2011-07-13 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-07-09 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Rename SetSculptData() to SetSculptProperties(), since this is what it does (... | Justin Clark-Casey (justincc) | 2011-07-09 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | root | 2011-06-30 | 1 | -0/+2 |
|\ \
| |/ |
|
| * | RegionReady Module: | BlueWall | 2011-06-24 | 1 | -0/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-06-09 | 1 | -2/+90 |
|\ \
| |/ |
|
| * | Adding an event to signal that logins are enabled | BlueWall | 2011-05-28 | 1 | -11/+76 |
| * | Add option to disable logins | BlueWall | 2011-05-28 | 1 | -1/+24 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-03 | 1 | -9/+1 |
|\ \
| |/ |
|
| * | Comment out some startup logging lines to make up for the one I added earlier... | Justin Clark-Casey (justincc) | 2011-04-02 | 1 | -9/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-04-01 | 1 | -0/+1 |
|\ \
| |/ |
|
| * | Start using IPrimCounts populated by PrimCountModule instead of LandData coun... | Justin Clark-Casey (justincc) | 2011-03-25 | 1 | -0/+1 |
* | | 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 | 2 | -9/+5 |
| |\ |
|
| * | | 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 | 2 | -2/+1 |
|\ \ \
| | |/
| |/| |
|
| * | | Formatting cleanup. | Jeff Ames | 2010-10-28 | 2 | -2/+1 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 1 | -7/+4 |
|\ \ \
| |/ / |
|
| * | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 1 | -7/+4 |
| |/ |
|
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-17 | 1 | -5/+1 |
|\ \
| |/ |
|
| * | Changed SceneObjectGroup to store parts with the fast and thread-safe MapAndA... | John Hurliman | 2010-09-16 | 1 | -5/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 3 | -6/+8 |
|\ \
| |/ |
|
| * | Formatting cleanup. | Jeff Ames | 2010-09-12 | 1 | -2/+2 |
| * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 2 | -4/+6 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-07 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Make console backup command do a forced backup rather than non-forced | Justin Clark-Casey (justincc) | 2010-09-06 | 1 | -1/+1 |
* | | 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 | 1 | -7/+12 |
|\ \
| |/ |
|
| * | Improve consistency of locking for SOG.m_parts in order to avoid race conditi... | Justin Clark-Casey (justincc) | 2010-08-26 | 1 | -7/+12 |
| * | Fix a nullref in EventManager caused by RegionReady not setting the scene | Melanie Thielker | 2010-05-30 | 1 | -0/+1 |
* | | Fix the XmlRpcRouterModule so it reads from the correct config section ([XMLR... | Tom | 2010-08-01 | 1 | -2/+2 |
* | | Add an m_enabled flag to XmlRpcRouterModule so it won't try to bind the xmlrp... | Tom | 2010-08-01 | 1 | -2/+10 |
* | | Fix a nullref in EventManager caused by RegionReady not setting the scene | Melanie Thielker | 2010-05-31 | 1 | -0/+1 |
|/ |
|