| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-25 | 1 | -80/+14 |
|\ |
|
| * | One more pass at object inventory. This time, fix SceneObjectPartInventory so... | Diva Canto | 2010-12-24 | 1 | -80/+14 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-24 | 1 | -35/+49 |
|\ \
| |/ |
|
| * | Hopefully this fixes all prim inventory issues. No more abort, no more keepin... | Diva Canto | 2010-12-23 | 1 | -35/+49 |
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 4 | -866/+0 |
|\ \
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-23 | 1 | -6/+5 |
| |\ |
|
| * | | Removed unused code -- this was the previous version of UDP texture sending, ... | Diva Canto | 2010-12-23 | 4 | -866/+0 |
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 1 | -6/+5 |
|\ \ \
| | |/
| |/| |
|
| * | | Put back a commented section of code. With some viewers, object inventory | Melanie | 2010-12-23 | 1 | -6/+5 |
| |/ |
|
* | | Revert "reactivating some traces to track a dead thread" | Melanie | 2010-12-23 | 1 | -2/+2 |
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | sacha | 2010-12-23 | 2 | -19/+106 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-23 | 2 | -18/+43 |
| |\ \
| | |/ |
|
| | * | Added a counter to NewFiles in Xfers to account for simultaneous object inven... | Diva Canto | 2010-12-22 | 1 | -16/+42 |
| | * | 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-21 | 1 | -4/+66 |
| |\ \
| | |/ |
|
| | * | * Adds AbortXfer to the ClientAPI mix | Teravus Ovares (Dan Olivares) | 2010-12-21 | 1 | -4/+66 |
* | | | reactivating some traces to track a dead thread | sacha | 2010-12-23 | 1 | -2/+2 |
|/ / |
|
* | | 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 |
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2010-12-15 | 4 | -34/+165 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 3 | -34/+161 |
| |\ \
| | |/ |
|
| | * | Made the map thread request the map items asynchronously, as the name suggest... | Diva Canto | 2010-12-14 | 1 | -9/+71 |
| | * | Fixes mantis #5270 -- Map tiles for hyperlinks not showing in world map for g... | Diva Canto | 2010-12-14 | 3 | -25/+90 |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-12-14 | 3 | -120/+172 |
| | |\ |
|
| | | * | Fix a small bug in ban list handling | Melanie | 2010-12-13 | 1 | -0/+2 |
| | | * | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 3 | -120/+170 |
| | * | | reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being u... | Justin Clark-Casey (justincc) | 2010-12-14 | 1 | -0/+16 |
| | |/ |
|
| * | | Workaround to allow llHTTPRequest to POST data to Lighthttpd which doesn't su... | Tom | 2010-12-14 | 1 | -0/+4 |
* | | | Fix casts in llSetPayPrice | Melanie | 2010-12-15 | 1 | -1/+10 |
|/ / |
|
* | | Fix a small bug in ban list handling | Melanie | 2010-12-13 | 1 | -0/+2 |
* | | Revamp the viewer -> banlist packet processing so fix a number of bugs. | Melanie | 2010-12-13 | 3 | -123/+173 |
* | | Change some lookups in he Land Management module to make group permissions | Melanie | 2010-12-13 | 1 | -4/+4 |
* | | 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 | 9 | -125/+140 |
|\ \
| |/ |
|
| * | 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 |
| * | Drop current OAR version back to 0.5 since these are currently now compatible... | Justin Clark-Casey (justincc) | 2010-12-11 | 3 | -35/+34 |
| * | Normalization of OSSL function names. | Marck | 2010-12-10 | 1 | -11/+12 |
| * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks comman... | Diva Canto | 2010-12-09 | 1 | -1/+1 |
| * | 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 |
|\ \
| |/ |
|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | 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 |
| * | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 2 | -0/+34 |
| |/ |
|
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 2 | -0/+34 |
* | | Add the interface needed to revive calling cards | Melanie | 2010-12-07 | 1 | -0/+13 |
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca... | Melanie | 2010-12-07 | 5 | -52/+29 |
|\ \ |
|