aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-0/+2
|\
| * Resume scripts that have been rezzed from a primMelanie2010-06-121-0/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+1
|\ \ | |/ | | | | 0.7.1CM Dev
| * Change trunk versio to 0.7.1 DevMelanie2010-06-121-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-21/+36
|\ \ | |/
| * * Tweak the StopFlying() method in LLClientView to fabricate a suitable ↵Teravus Ovares (Dan Olivares)2010-06-111-21/+36
| | | | | | | | landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-1210-21/+71
|\ \ | |/
| * Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packetMelanie2010-06-1210-19/+71
| | | | | | | | we used to send before slimupdates and explicitly send it
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-121-1/+1
|\ \ | |/
| * Some people don't use Simian. Make the connector respect that it's disabledMelanie2010-06-121-1/+1
| | | | | | | | and not try to send a map tile in that case.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-1210-106/+215
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-06-1115-111/+23
| |\
| | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-114-48/+100
| | |\
| | | * Revert "Allow IInventoryService.GetFolder(folderId, userId) as well as ↵Justin Clark-Casey (justincc)2010-06-1114-84/+22
| | | | | | | | | | | | | | | | | | | | | | | | GetFolder(InventoryFolderBase folder)" This reverts commit 3525195bc9b5fdfd9799411edd452981ef1f4ebd.
| | * | Remove the lastmap stuff from the map module, also remove a bunch of commentsMelanie2010-06-111-27/+1
| | | | | | | | | | | | | | | | that no longer reflect actual conditions
| * | | * Added a new method to IMapImageGenerator for getting the map tile before ↵John Hurliman2010-06-115-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-1114-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/opensimJustin Clark-Casey (justincc)2010-06-113-100/+36
| |\ \ | | |/
| * | create inactive test for iar folders/items merged with existing pathsJustin Clark-Casey (justincc)2010-06-114-48/+100
| | | | | | | | | | | | add various helper functions for simplifying test readability
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-111-3/+4
|\ \ \ | | |/ | |/|
| * | Reinstated the check on im.binaryBucket.Length, this time on the local ↵Diva Canto2010-06-111-3/+4
| | | | | | | | | | | | handler for inventory offers.
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-113-99/+34
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-06-117-34/+67
| |\ \ | | |/
| | * Remove the cm* function namespaceMelanie Thielker2010-06-112-16/+1
| | |
| * | Inventory offers and subsequent notifications of acceptance/decline now ↵Diva Canto2010-06-113-99/+34
| | | | | | | | | | | | working across the board.
* | | Revert "Remove the cm* function namespace"Melanie Thielker2010-06-112-1/+16
| | | | | | | | | | | | This reverts commit ef93ac44528f5e3294e1674e33f100b19dee61f0.
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-06-112-16/+1
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Remove the cm* function namespaceMelanie Thielker2010-06-112-16/+1
| | | |
| * | | Rename CM files to LSMelanie Thielker2010-06-113-26/+26
| | | |
| * | | Rename cm* function set to ls* (for LightShare)Melanie Thielker2010-06-113-15/+30
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-115-96/+122
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Rename CM files to LSMelanie Thielker2010-06-113-26/+26
| | |
| * | Rename cm* function set to ls* (for LightShare)Melanie Thielker2010-06-113-15/+30
| | |
| * | Clone cmGetAvatarList into osGetAvatarList for more generic use.Melanie Thielker2010-06-113-0/+33
| |/
| * Better friends notification: get rid of OnLogout and use OnClientClose for ↵Diva Canto2010-06-111-23/+14
| | | | | | | | sending notifications. This takes care of crashed sessions. Also, made the notifications themselves asynchronous.
| * Bug fix on friends notifications. OnClientClose and OnLogout ordering are ↵Diva Canto2010-06-101-8/+33
| | | | | | | | unpredictable; when OnClientClosed happened first, it was removing the friends list, which would prevent OnLogout notifications to go out.
| * Added more debug messages to try to pinpoint where login is failing for nebadon.Diva Canto2010-06-101-14/+45
| |
* | Remove cmGetAvatarList()Melanie Thielker2010-06-113-30/+0
| |
* | Clone cmGetAvatarList into osGetAvatarList for more generic use.Melanie Thielker2010-06-113-0/+33
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-093-21/+34
|\ \ | |/
| * Bug fix on attachments: attach->drop->attach works now.Diva Canto2010-06-092-21/+30
| |
| * Reverting that last permissions check upon drop. Looks like all dropped ↵Diva Canto2010-06-091-10/+5
| | | | | | | | attachments are deleted from inventory.
| * Bug fix on attachments: don't delete the item from inventory when it's ↵Diva Canto2010-06-091-4/+9
| | | | | | | | dropped on the ground.
| * Bug fix in attachments: when attaching from inworld the item's ↵Diva Canto2010-06-091-1/+5
| | | | | | | | parentFolderID was wrong.
| * Give attachments the same priority as other avatars in BestAvatarResponsivenessMelanie2010-06-091-1/+4
| | | | | | | | policy
* | Give attachments the same priority as other avatars in BestAvatarResponsivenessMelanie2010-06-091-1/+4
| | | | | | | | policy
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-0917-123/+147
|\ \ | |/
| * Add the BEGIN; I had missedMelanie2010-06-091-0/+1
| |
| * Re-add Migration version 32, which apparently got dropped completely.Melanie2010-06-091-0/+72
| |
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-0916-123/+128
| |\