| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 2 | -61/+80 |
| |\ | |||||
| | * | Change name of method to better reflect what it does | Melanie | 2010-06-12 | 1 | -2/+2 |
| | | | |||||
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-06-12 | 1 | -1/+12 |
| | |\ | |||||
| | * | | * Added CHANGED_TELEPORT event trigger upon inter-sim teleports. | Diva Canto | 2010-06-12 | 2 | -59/+81 |
| | | | | | | | | | | | | | * Cleaned up NewUserConnection. | ||||
| * | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-06-12 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * \ \ | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-06-12 | 27 | -133/+322 |
| | |\ \ \ | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | | Get rid of spamming SOG debug message | Tom Grimshaw | 2010-06-12 | 1 | -2/+2 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+12 |
| |\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | | |||||
| | * | | | Log and eat sculpt meshing exceptions caused by bad jp2 data. | Melanie | 2010-06-12 | 1 | -1/+12 |
| | | |/ | |/| | |||||
| | * | | Preserving the link numbers is a serializer's highest duty. | Melanie Thielker | 2010-06-12 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | Prevent region crossings from screwing up complex attachments by preserving link numbers. | ||||
| | * | | Make local teleports send CHANGED_TELEPORT | Melanie Thielker | 2010-06-12 | 1 | -0/+3 |
| | | | | |||||
| | * | | Don't filre CHANGED_INVENTORY if a prim comes in from storage | Melanie | 2010-06-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Preserving the link numbers is a serializer's highest duty. | Melanie Thielker | 2010-06-12 | 1 | -0/+9 |
| | | | | | | | | | | | | | | | | Prevent region crossings from screwing up complex attachments by preserving link numbers. | ||||
| * | | | Make local teleports send CHANGED_TELEPORT | Melanie Thielker | 2010-06-12 | 2 | -1/+4 |
| | | | | |||||
| * | | | Don't filre CHANGED_INVENTORY if a prim comes in from storage | Melanie | 2010-06-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -0/+2 |
| |\ \ \ | |/ / | |||||
| | * | | Resume scripts that have been rezzed from a prim | Melanie | 2010-06-12 | 1 | -0/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+1 |
| |\ \ \ | |/ / | | | | | | | 0.7.1CM Dev | ||||
| | * | | Change trunk versio to 0.7.1 Dev | Melanie | 2010-06-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -21/+36 |
| |\ \ \ | |/ / | |||||
| | * | | * Tweak the StopFlying() method in LLClientView to fabricate a suitable ↵ | Teravus Ovares (Dan Olivares) | 2010-06-11 | 1 | -21/+36 |
| | | | | | | | | | | | | | landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 10 | -21/+71 |
| |\ \ \ | |/ / | |||||
| | * | | Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packet | Melanie | 2010-06-12 | 10 | -19/+71 |
| | | | | | | | | | | | | | we used to send before slimupdates and explicitly send it | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 1 | -1/+1 |
| |\ \ \ | |/ / | |||||
| | * | | Some people don't use Simian. Make the connector respect that it's disabled | Melanie | 2010-06-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | and not try to send a map tile in that case. | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-12 | 10 | -106/+215 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-06-11 | 15 | -111/+23 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-11 | 4 | -48/+100 |
| | | |\ \ | |||||
| | | | * | | Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 14 | -84/+22 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetFolder(InventoryFolderBase folder)" This reverts commit 3525195bc9b5fdfd9799411edd452981ef1f4ebd. | ||||
| | | * | | | Remove the lastmap stuff from the map module, also remove a bunch of comments | Melanie | 2010-06-11 | 1 | -27/+1 |
| | | | | | | | | | | | | | | | | | | | | | that no longer reflect actual conditions | ||||
| | * | | | | * Added a new method to IMapImageGenerator for getting the map tile before ↵ | John Hurliman | 2010-06-11 | 5 | -31/+114 |
| | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | it is JPEG2000 compressed * Aesthetically improved map tile water * SimianGrid connector now uploads a PNG tile to the AddMapTile API | ||||
| | * | | | Allow IInventoryService.GetFolder(folderId, userId) as well as ↵ | Justin Clark-Casey (justincc) | 2010-06-11 | 14 | -22/+84 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetFolder(InventoryFolderBase folder) This involves no wire changes since the methods often just construct an InventoryFolderBase under the hood. This is in line with other methods that alraedy allow requests via uuid | ||||
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-06-11 | 3 | -100/+36 |
| | |\ \ \ | | |/ / | |||||
| | * | | | create inactive test for iar folders/items merged with existing paths | Justin Clark-Casey (justincc) | 2010-06-11 | 4 | -48/+100 |
| | | | | | | | | | | | | | | | | | add various helper functions for simplifying test readability | ||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-11 | 1 | -3/+4 |
| |\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| | * | | Reinstated the check on im.binaryBucket.Length, this time on the local ↵ | Diva Canto | 2010-06-11 | 1 | -3/+4 |
| | | | | | | | | | | | | | handler for inventory offers. | ||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-11 | 3 | -99/+34 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-06-11 | 7 | -34/+67 |
| | |\ \ | | |/ | |||||
| | | * | Remove the cm* function namespace | Melanie Thielker | 2010-06-11 | 2 | -16/+1 |
| | | | | |||||
| | * | | Inventory offers and subsequent notifications of acceptance/decline now ↵ | Diva Canto | 2010-06-11 | 3 | -99/+34 |
| | | | | | | | | | | | | | working across the board. | ||||
| * | | | Revert "Remove the cm* function namespace" | Melanie Thielker | 2010-06-11 | 2 | -1/+16 |
| | | | | | | | | | | | | | This reverts commit ef93ac44528f5e3294e1674e33f100b19dee61f0. | ||||
| * | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-06-11 | 2 | -16/+1 |
| |\ \ \ | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | Remove the cm* function namespace | Melanie Thielker | 2010-06-11 | 2 | -16/+1 |
| | | | | | |||||
| | * | | | Rename CM files to LS | Melanie Thielker | 2010-06-11 | 3 | -26/+26 |
| | | | | | |||||
| | * | | | Rename cm* function set to ls* (for LightShare) | Melanie Thielker | 2010-06-11 | 3 | -15/+30 |
| | | | | | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-11 | 5 | -96/+122 |
| |\ \ \ \ | |/ / / |/| | / | | |/ | |/| | |||||
| | * | | Rename CM files to LS | Melanie Thielker | 2010-06-11 | 3 | -26/+26 |
| | | | | |||||
| | * | | Rename cm* function set to ls* (for LightShare) | Melanie Thielker | 2010-06-11 | 3 | -15/+30 |
| | | | | |||||
| | * | | Clone cmGetAvatarList into osGetAvatarList for more generic use. | Melanie Thielker | 2010-06-11 | 3 | -0/+33 |
| | |/ | |||||
| | * | Better friends notification: get rid of OnLogout and use OnClientClose for ↵ | Diva Canto | 2010-06-11 | 1 | -23/+14 |
| | | | | | | | | | sending notifications. This takes care of crashed sessions. Also, made the notifications themselves asynchronous. | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |