aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Security fix: Allow only textures to be fetched using HTTP texture capMelanie Thielker2010-06-221-0/+12
|
* * Fixed SimianGrid map tile uploads not having any objects in the imagesJohn Hurliman2010-06-222-4/+30
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-191-6/+16
|\
| * fix faulty profile cut parameter checking in llSetPrimitiveParams() - see ↵dahlia2010-06-191-6/+16
| | | | | | | | Mantis #4510
* | Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"Melanie2010-06-191-7/+0
|/ | | | | | Didn't do what it said on the package! This reverts commit 8643db3ef0c4dca709d85fc37240a18fd9049520.
* This is a HACK! Downright nasty. For some reason, the devs of the mysqlMelanie2010-06-191-0/+7
| | | | | connector have decided that their vision of timeouts is the only valid one. This uses reflection to show them the finger. Please test.
* 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. ↵Diva Canto2010-06-191-1/+10
| | | | Doesn't solve #4777.
* Reinstated the behavior of AddPrimShape *exactly* as it was as of December. ↵Diva Canto2010-06-191-10/+1
| | | | Trying to fix mantis #4777
* 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
| | | | | | | | | | This was http://opensimulator.org/mantis/view.php?id=4770 Extend unit tests to check for this scenario too
| * change TestPartExistingIarPath() to check appropriate folder creationJustin Clark-Casey (justincc)2010-06-182-32/+45
| | | | | | | | change some names in InventoryArchiveReadRequest in an effort to make the code more comprehendable
| * in IAR utils, return all folders that match a particular path rather than ↵Justin Clark-Casey (justincc)2010-06-184-27/+36
| | | | | | | | just the first one
* | Remove an error in meshing error reporting. Now doesn't double-bombMelanie2010-06-181-1/+1
|/ | | | anymore on a bad sculpt
* Revert "Set command timeout to infinity on migrations"Melanie2010-06-171-1/+0
| | | | This reverts commit 51d30fd34a950e0cd71d61ce0666a6d1e90bf233.
* Set command timeout to infinity on migrationsMelanie2010-06-171-0/+1
|
* Force newly connecting remote consoles to display a promptMelanie2010-06-171-0/+7
|
* * Support salted and unsalted password hashes in ↵John Hurliman2010-06-151-7/+46
| | | | SimianAuthenticationServiceConnector
* Fixes creation date issue on user accounts.Diva Canto2010-06-151-1/+3
|
* 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
| | | | | | | | * Added an error message in initial estate owner creation that makes it clear what needs to happen.
| * osGetAvatarList: Use AbsolutePosition instead of the position of the physics ↵Tom Grimshaw2010-06-141-6/+3
| | | | | | | | actor, or the avatar disappears when they sit down.
* | Merge branch 'master' into 0.7-post-fixesMelanie2010-06-1417-428/+678
|\ \ | |/
| * Fixes attachments coming back upon being detached in neighbouring regions ↵Diva Canto2010-06-131-0/+1
| | | | | | | | and crossing.
| * Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵Diva Canto2010-06-1313-79/+55
| | | | | | | | neighbours.
| * 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
| | | | | | | | | | | | | | changes: - Start location is NOT optional. The signature was defined with it being mandataory and there is no reason to change it - Adjusted comments to remove misleading or no longer true comments. Default is neuter, according to the code, not male, as the comment stated.
* | 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
| |/ | | | | | | * Cleaned up NewUserConnection.
| * Preserving the link numbers is a serializer's highest duty.Melanie Thielker2010-06-121-0/+9
| | | | | | | | | | Prevent region crossings from screwing up complex attachments by preserving link numbers.
| * 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 ↵Teravus Ovares (Dan Olivares)2010-06-111-21/+36
| | | | landing collision plane regardless of the actual physics situation. position.Z - AvatarHeight / 6f
* 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
* 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' 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