| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-29 | 1 | -2/+2 |
|\ |
|
| * | minor: remove a few mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-28 | 1 | -2/+2 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 2 | -14/+13 |
|\ \
| |/ |
|
| * | Removed a few more spurious appearance saves. When an avatar | Mic Bowman | 2011-01-25 | 2 | -13/+13 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 6 | -20/+20 |
|\ \
| |/ |
|
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-21 | 4 | -10/+11 |
| * | For now, comment out logging messages about IM sending, since these cause hig... | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -3/+3 |
| * | with mic's permission, reduce appearance, baked texture logging verbosity for... | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -3/+3 |
| * | With mic's permission, adjust long call time info messages to 500ms from 200ms | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -1/+1 |
| * | Downgrade and comment out some other caps messages for now | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -5/+4 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 1 | -1/+1 |
|\ \
| |/ |
|
| * | Fix build break | Melanie | 2011-01-18 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 3 | -4/+4 |
|\ \
| |/ |
|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-01-18 | 3 | -4/+4 |
| |\ |
|
| | * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 3 | -4/+4 |
| * | | Change gesture activation to not quash any other flags | Melanie | 2011-01-18 | 1 | -3/+3 |
| |/ |
|
| * | Added a -v|verbose option to save iar. | Diva Canto | 2011-01-08 | 2 | -1/+9 |
| * | Allow cross-scope friendships to work, and also allow other cross scope name | Melanie | 2011-01-03 | 2 | -2/+2 |
* | | Change gesture activation to not quash any other flags | Melanie | 2011-01-17 | 1 | -3/+3 |
* | | Implement nonlocal god kicks and freezes | Melanie | 2011-01-14 | 1 | -4/+35 |
* | | Implement kicking, freezing and unfreezing users in the same sim via | Melanie | 2011-01-13 | 1 | -58/+117 |
* | | Allow cross-scope friendships to work, and also allow other cross scope name | Melanie | 2011-01-02 | 2 | -2/+2 |
* | | Add MessageKey to section Messaging, a key that prevents injection of | Melanie | 2010-12-30 | 1 | -6/+25 |
* | | Remove the restriction on communication across scopes. This will allow | Melanie | 2010-12-29 | 1 | -1/+1 |
* | | Remove some code that was meant to fool the viewer into thinking SLT. It never | Melanie | 2010-12-26 | 1 | -18/+19 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -2/+1 |
|\ \
| |/ |
|
| * | Fix a broken format on an error message. Also replace yet another e.Message | Melanie | 2010-12-22 | 1 | -2/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-20 | 2 | -9/+7 |
|\ \
| |/ |
|
| * | uncomment "load iar" help lines which added the --merge option | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -5/+3 |
| * | minor: add [-p|--profile=<url>] to usage line that pops up if save iar consol... | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -3/+3 |
| * | Raise maximum iar version that master can load to 1.x, so that it can load it... | Justin Clark-Casey (justincc) | 2010-12-18 | 1 | -1/+1 |
| * | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being u... | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -0/+16 |
* | | Prevent objects that are worn from ground from vanishing from the scene | Melanie | 2010-12-12 | 1 | -9/+0 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 4 | -78/+93 |
|\ \
| |/ |
|
| * | Remove the restriction that you have to be logged in when loading/saving iars | Justin Clark-Casey (justincc) | 2010-12-11 | 2 | -72/+70 |
| * | If we're saving an IAR with --profile information, then label this a version ... | Justin Clark-Casey (justincc) | 2010-12-11 | 1 | -5/+22 |
| * | Fixed wrong comment | Diva Canto | 2010-12-08 | 1 | -1/+1 |
| * | Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase y... | Diva Canto | 2010-12-08 | 1 | -1/+1 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -42/+202 |
|\ \
| |/ |
|
| * | Added ability for GetTexture to serve multiple formats. The format may come a... | Diva Canto | 2010-12-08 | 1 | -42/+202 |
* | | Add the interface needed to revive calling cards | Melanie | 2010-12-07 | 1 | -0/+13 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -3/+3 |
|\ \
| |/ |
|
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 5 | -101/+145 |
| |\ |
|
| * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 1 | -55/+50 |
| |\ \ |
|
| * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 3 | -77/+94 |
| |\ \ \ |
|
| * \ \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 2 | -36/+39 |
| |\ \ \ \ |
|
| * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -5/+10 |
| |\ \ \ \ \ |
|
| * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 2 | -32/+5 |
| |\ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -29/+18 |
| |\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -43/+62 |
| |\ \ \ \ \ \ \ \ |
|