Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 5 | -64/+316 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-12-09 | 2 | -42/+283 |
| |\ | |||||
| | * | Added ability for GetTexture to serve multiple formats. The format may come a... | Diva Canto | 2010-12-08 | 2 | -42/+283 |
| * | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 6 | -0/+132 |
| |/ | |||||
| * | Added an exception handler on CreateObject handler, just in case there's an e... | Diva Canto | 2010-12-07 | 1 | -20/+31 |
| * | Removed extraneous left-/ on /object/ subpath. Bug introduced during region U... | Diva Canto | 2010-12-07 | 1 | -1/+1 |
| * | change doc. trivial commit to get panda to rebuild | Justin Clark-Casey (justincc) | 2010-12-08 | 1 | -1/+1 |
| * | Remove old Freeswitch configurations | Melanie | 2010-12-07 | 1 | -33/+0 |
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 6 | -0/+132 |
* | | Prevent sending of attachment data to any client if the attachment | Melanie | 2010-12-08 | 1 | -0/+21 |
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2010-12-07 | 1 | -33/+0 |
|\ \ | |||||
| * \ | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... | Melanie | 2010-12-07 | 6 | -38/+112 |
| |\ \ | |||||
| * | | | Remove old Freeswitch configurations | Melanie | 2010-12-07 | 1 | -33/+0 |
* | | | | Allow TPing multiple people in the friends list in one go. | Melanie | 2010-12-07 | 1 | -5/+10 |
| |/ / |/| | | |||||
* | | | Update calling card interface | Melanie | 2010-12-07 | 1 | -1/+1 |
* | | | Add the interface needed to revive calling cards | Melanie | 2010-12-07 | 2 | -0/+26 |
* | | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2010-12-07 | 28 | -215/+243 |
|\ \ \ | |/ / | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 27 | -214/+242 |
| |\ \ | | |/ | |||||
| | * | Fixed some inconsistency with trailing /. Made debug messages consistent. Cha... | Diva Canto | 2010-12-05 | 11 | -35/+47 |
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 79 | -1150/+2402 |
| | |\ | |||||
| | | * | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 1 | -19/+6 |
| | | |\ | |||||
| | | | * | Simplify updating of agent inventory assets. Make newly created asset IDs | Melanie | 2010-12-04 | 1 | -19/+6 |
| | | * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 4 | -170/+158 |
| | | |\ \ | | | | |/ | |||||
| | | * | | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 2 | -0/+93 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 2 | -61/+54 |
| | | |\ \ \ | |||||
| | | * \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 1 | -0/+83 |
| | | |\ \ \ \ | |||||
| | | * \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 2 | -2/+11 |
| | | |\ \ \ \ \ | |||||
| | | * \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 4 | -62/+123 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-03 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-02 | 4 | -8/+28 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-01 | 3 | -19/+50 |
| | | |\ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-01 | 5 | -121/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-12-01 | 4 | -1/+28 |
| | | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-29 | 33 | -410/+1080 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-28 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-28 | 1 | -6/+6 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-27 | 1 | -10/+76 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-27 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -21/+24 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -2/+27 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -0/+24 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 6 | -170/+149 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -15/+25 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 3 | -17/+18 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-26 | 1 | -2/+10 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-24 | 1 | -1/+2 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-24 | 6 | -77/+62 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-24 | 1 | -2/+60 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-11-24 | 2 | -0/+243 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |