Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-22 | 1 | -14/+14 |
|\ | |||||
| * | Line ending fix | John Hurliman | 2010-06-22 | 1 | -14/+14 |
| | | |||||
* | | Guard prioritizer agains null values as those produced by a bullet dying | Melanie Thielker | 2010-06-22 | 1 | -0/+3 |
| | | | | | | | | before it can be updated | ||||
* | | Security fix: Allow only textures to be fetched using HTTP texture cap | Melanie Thielker | 2010-06-22 | 1 | -0/+12 |
|/ | |||||
* | * Fixed SimianGrid map tile uploads not having any objects in the images | John Hurliman | 2010-06-22 | 2 | -4/+30 |
| | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-19 | 1 | -6/+16 |
|\ | |||||
| * | fix faulty profile cut parameter checking in llSetPrimitiveParams() - see ↵ | dahlia | 2010-06-19 | 1 | -6/+16 |
| | | | | | | | | Mantis #4510 | ||||
* | | Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql" | Melanie | 2010-06-19 | 1 | -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 mysql | Melanie | 2010-06-19 | 1 | -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 Canto | 2010-06-19 | 1 | -1/+4 |
| | |||||
* | Hunting for the problem in #4777 | Diva Canto | 2010-06-19 | 2 | -0/+5 |
| | |||||
* | Reverting my last two commits, putting back Melanie's exception handler. ↵ | Diva Canto | 2010-06-19 | 1 | -1/+10 |
| | | | | Doesn't solve #4777. | ||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-06-19 | 0 | -0/+0 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | ||||
| * | Reinstated the behavior of AddPrimShape as it was as of December. Trying to ↵ | Diva Canto | 2010-06-19 | 1 | -0/+1 |
| | | | | | | | | fix mantis #4777 | ||||
* | | Reinstated the behavior of AddPrimShape *exactly* as it was as of December. ↵ | Diva Canto | 2010-06-19 | 1 | -10/+1 |
|/ | | | | Trying to fix mantis #4777 | ||||
* | remove link to wiki mysql-config since the page was out-of-date and actively ↵ | Justin Clark-Casey (justincc) | 2010-06-19 | 1 | -1/+0 |
| | | | | misleading | ||||
* | minor: correct a spelling mistake | Justin Clark-Casey (justincc) | 2010-06-19 | 1 | -1/+1 |
| | |||||
* | Overhaul basic README.txt for new estate setup options on first run. | Justin Clark-Casey (justincc) | 2010-06-19 | 1 | -17/+41 |
| | | | | Also make some minor changes for clarity. | ||||
* | minor: try and make the explanations for the AllowScriptCrossing and ↵ | Justin Clark-Casey (justincc) | 2010-06-18 | 1 | -2/+4 |
| | | | | TrustBinaries settings in OpenSim.ini.example clearer | ||||
* | eliminate SimianGrid [Groups] section from GridCommon.ini.example as per Nebadon | Justin Clark-Casey (justincc) | 2010-06-18 | 1 | -8/+0 |
| | | | | this is only used by SimianGrid and is now in SimianGrid.ini | ||||
* | Change Opensim.Servers.exe comment at top of Robust.HG.ini to Robust.exe | Justin Clark-Casey | 2010-06-18 | 1 | -1/+1 |
| | | | | | This addresses http://opensimulator.org/mantis/view.php?id=4772 Thanks to aiaustin for pointing this out | ||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-18 | 5 | -84/+129 |
|\ | |||||
| * | Fix problem where iar load would duplicate huge number of folders | Justin Clark-Casey (justincc) | 2010-06-18 | 3 | -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 creation | Justin Clark-Casey (justincc) | 2010-06-18 | 2 | -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-18 | 4 | -27/+36 |
| | | | | | | | | just the first one | ||||
* | | Remove an error in meshing error reporting. Now doesn't double-bomb | Melanie | 2010-06-18 | 1 | -1/+1 |
|/ | | | | anymore on a bad sculpt | ||||
* | Revert "Set command timeout to infinity on migrations" | Melanie | 2010-06-17 | 1 | -1/+0 |
| | | | | This reverts commit 51d30fd34a950e0cd71d61ce0666a6d1e90bf233. | ||||
* | Set command timeout to infinity on migrations | Melanie | 2010-06-17 | 1 | -0/+1 |
| | |||||
* | Force newly connecting remote consoles to display a prompt | Melanie | 2010-06-17 | 1 | -0/+7 |
| | |||||
* | * Support salted and unsalted password hashes in ↵ | John Hurliman | 2010-06-15 | 1 | -7/+46 |
| | | | | SimianAuthenticationServiceConnector | ||||
* | Fixes creation date issue on user accounts. | Diva Canto | 2010-06-15 | 1 | -1/+3 |
| | |||||
* | Typo corrected in Robust.HG.ini.example | Diva Canto | 2010-06-14 | 1 | -4/+4 |
| | |||||
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-15 | 0 | -0/+0 |
|\ | |||||
| * | Readusr master version and flavor | Melanie | 2010-06-15 | 1 | -2/+2 |
| | | |||||
* | | Readjust master version and flavor | Melanie | 2010-06-15 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'master' into 0.7-post-fixes | Diva Canto | 2010-06-14 | 3 | -8/+5 |
|\ | |||||
| * | * Deleted duplicated migration that was failing anyway. | Diva Canto | 2010-06-14 | 2 | -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 Grimshaw | 2010-06-14 | 1 | -6/+3 |
| | | | | | | | | actor, or the avatar disappears when they sit down. | ||||
* | | Merge branch 'master' into 0.7-post-fixes | Melanie | 2010-06-14 | 17 | -428/+678 |
|\ \ | |/ | |||||
| * | Fixes attachments coming back upon being detached in neighbouring regions ↵ | Diva Canto | 2010-06-13 | 1 | -0/+1 |
| | | | | | | | | and crossing. | ||||
| * | Fixes the long-standing RegionUp bug! Plus lots of other cleanups related to ↵ | Diva Canto | 2010-06-13 | 13 | -79/+55 |
| | | | | | | | | neighbours. | ||||
| * | Fox my changes to radmin | Melanie | 2010-06-13 | 1 | -2/+2 |
| | | |||||
| * | Thank you, Snoopy2, for a patch to fix RemoteAdmin. Committed with the following | Melanie | 2010-06-13 | 3 | -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-fixes | Melanie | 2010-06-13 | 10 | -82/+143 |
|\ \ | |/ | |||||
| * | Added Old Guids=true to all MySql connection strings. | Diva Canto | 2010-06-12 | 4 | -4/+4 |
| | | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-06-12 | 1 | -2/+2 |
| |\ | |||||
| | * | Change name of method to better reflect what it does | Melanie | 2010-06-12 | 1 | -2/+2 |
| | | | |||||
| * | | Added checks for failed UpdateAgent calls. | Diva Canto | 2010-06-12 | 2 | -17/+31 |
| |/ | |||||
| * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim | Diva Canto | 2010-06-12 | 1 | -1/+12 |
| |\ | |||||
| | * | Log and eat sculpt meshing exceptions caused by bad jp2 data. | Melanie | 2010-06-12 | 1 | -1/+12 |
| | | |