aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch ↵Justin Clark-Casey (justincc)2010-06-231-4/+13
| | | | | | to OpenSim.ini.exmaple Also tidies up and comments some existing entries
* 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.
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-06-190-0/+0
|\ | | | | | | | | Conflicts: OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
| * Reinstated the behavior of AddPrimShape as it was as of December. Trying to ↵Diva Canto2010-06-191-0/+1
| | | | | | | | fix mantis #4777
* | Reinstated the behavior of AddPrimShape *exactly* as it was as of December. ↵Diva Canto2010-06-191-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-191-1/+0
| | | | misleading
* minor: correct a spelling mistakeJustin Clark-Casey (justincc)2010-06-191-1/+1
|
* Overhaul basic README.txt for new estate setup options on first run.Justin Clark-Casey (justincc)2010-06-191-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-181-2/+4
| | | | TrustBinaries settings in OpenSim.ini.example clearer
* eliminate SimianGrid [Groups] section from GridCommon.ini.example as per NebadonJustin Clark-Casey (justincc)2010-06-181-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.exeJustin Clark-Casey2010-06-181-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/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
|
* Typo corrected in Robust.HG.ini.exampleDiva Canto2010-06-141-4/+4
|
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-150-0/+0
|\
| * Readusr master version and flavorMelanie2010-06-151-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
| | | | | | | | * 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-1310-82/+143
|\ \ | |/
| * Added Old Guids=true to all MySql connection strings.Diva Canto2010-06-124-4/+4
| |
| * 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
| |