aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 0.7-post-fixesDiva Canto2010-06-194-1/+16
|\
| * Bug fix: wrong name of requester in local friendship offer.Diva Canto2010-06-191-1/+4
| * Hunting for the problem in #4777Diva Canto2010-06-192-0/+5
| * Reverting my last two commits, putting back Melanie's exception handler. Does...Diva Canto2010-06-191-1/+10
| * Reinstated the behavior of AddPrimShape *exactly* as it was as of December. T...Diva Canto2010-06-191-10/+1
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-185-84/+129
| |\
| | * Fix problem where iar load would duplicate huge number of foldersJustin Clark-Casey (justincc)2010-06-183-35/+58
| | * change TestPartExistingIarPath() to check appropriate folder creationJustin Clark-Casey (justincc)2010-06-182-32/+45
| | * in IAR utils, return all folders that match a particular path rather than jus...Justin Clark-Casey (justincc)2010-06-184-27/+36
| * | Remove an error in meshing error reporting. Now doesn't double-bombMelanie2010-06-181-1/+1
| |/
| * Revert "Set command timeout to infinity on migrations"Melanie2010-06-171-1/+0
| * Set command timeout to infinity on migrationsMelanie2010-06-171-0/+1
| * Force newly connecting remote consoles to display a promptMelanie2010-06-171-0/+7
* | Remove an error in meshing error reporting. Now doesn't double-bombMelanie2010-06-181-1/+1
* | Fix problem where iar load would duplicate huge number of foldersJustin Clark-Casey (justincc)2010-06-183-35/+58
* | change TestPartExistingIarPath() to check appropriate folder creationJustin Clark-Casey (justincc)2010-06-182-32/+45
* | in IAR utils, return all folders that match a particular path rather than jus...Justin Clark-Casey (justincc)2010-06-184-27/+36
* | Merge branch 'master' into 0.7-post-fixesDiva Canto2010-06-152-8/+49
|\ \ | |/
| * * Support salted and unsalted password hashes in SimianAuthenticationServiceC...John Hurliman2010-06-151-7/+46
| * Fixes creation date issue on user accounts.Diva Canto2010-06-151-1/+3
* | Fixed version info again.Diva Canto2010-06-141-2/+2
|/
* Readjust master version and flavorMelanie2010-06-151-2/+2
* Merge branch 'master' into 0.7-post-fixesDiva Canto2010-06-143-8/+5
|\
| * * Deleted duplicated migration that was failing anyway.Diva Canto2010-06-142-2/+2
| * osGetAvatarList: Use AbsolutePosition instead of the position of the physics ...Tom Grimshaw2010-06-141-6/+3
* | Merge branch 'master' into 0.7-post-fixesMelanie2010-06-1417-428/+678
|\ \ | |/
| * Fixes attachments coming back upon being detached in neighbouring regions and...Diva Canto2010-06-131-0/+1
| * Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ...Diva Canto2010-06-1313-79/+55
| * Fox my changes to radminMelanie2010-06-131-2/+2
| * Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the followingMelanie2010-06-133-351/+624
* | Merge branch 'master' into 0.7-post-fixesMelanie2010-06-136-78/+139
|\ \ | |/
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-06-121-2/+2
| |\
| | * Change name of method to better reflect what it doesMelanie2010-06-121-2/+2
| * | Added checks for failed UpdateAgent calls.Diva Canto2010-06-122-17/+31
| |/
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-06-121-1/+12
| |\
| | * Log and eat sculpt meshing exceptions caused by bad jp2 data.Melanie2010-06-121-1/+12
| * | * Added CHANGED_TELEPORT event trigger upon inter-sim teleports.Diva Canto2010-06-122-59/+81
| |/
| * Preserving the link numbers is a serializer's highest duty.Melanie Thielker2010-06-121-0/+9
| * Make local teleports send CHANGED_TELEPORTMelanie Thielker2010-06-121-0/+3
| * Don't filre CHANGED_INVENTORY if a prim comes in from storageMelanie2010-06-121-1/+1
| * Resume scripts that have been rezzed from a primMelanie2010-06-121-0/+2
| * Change trunk versio to 0.7.1 DevMelanie2010-06-121-2/+2
* | Change flavor to 0.7-RC1Melanie2010-06-121-2/+2
|/
* * Tweak the StopFlying() method in LLClientView to fabricate a suitable landi...Teravus Ovares (Dan Olivares)2010-06-111-21/+36
* Move "StopFlying()" into LLSpace. Try to reinstate the carefully crafted packetMelanie2010-06-1210-19/+71
* Some people don't use Simian. Make the connector respect that it's disabledMelanie2010-06-121-1/+1
* 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 GetFol...Justin Clark-Casey (justincc)2010-06-1114-84/+22
| * | Remove the lastmap stuff from the map module, also remove a bunch of commentsMelanie2010-06-111-27/+1