aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* don't report the null uuid as a missing asset on saving oars/iarsJustin Clark-Casey (justincc)2010-06-251-3/+5
|
* minor: fix spelling mistake interupt -> interrupt in migrationsJustin Clark-Casey (justincc)2010-06-251-6/+3
| | | | This is for mantis 4783
* fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
|
* stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent ↵Justin Clark-Casey (justincc)2010-06-251-6/+7
| | | | | | isn't present in the presence dictionary the code to do this was there but was being circumvented by newmap[agentID] before the check actually took place
* * SimianAssetServiceConnector Delete() was expecting the wrong type of ↵John Hurliman2010-06-242-8/+23
| | | | | | response, reporting false errors * Fixed a typo in a WebUtil error message
* * Fixed SimianGrid map tile uploads not having any objects in the imagesJohn Hurliman2010-06-222-4/+30
|
* 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. ↵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
| |
* | 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
* | Merge branch '0.7-post-fixes' of ssh://opensimulator.org/var/git/opensim ↵Justin Clark-Casey2010-06-181-1/+1
|\ \ | | | | | | | | | into 0.7-post-fixes
| * | Remove an error in meshing error reporting. Now doesn't double-bombMelanie2010-06-181-1/+1
| | | | | | | | | | | | anymore on a bad sculpt
* | | 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
* | 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
* | Merge branch '0.7-post-fixes' of ↵Diva Canto2010-06-150-0/+0
|\ \ | | | | | | | | | ssh://diva@opensimulator.org/var/git/opensim into 0.7-post-fixes
| * | * Support salted and unsalted password hashes in ↵John Hurliman2010-06-151-7/+46
| | | | | | | | | | | | SimianAuthenticationServiceConnector
* | | Merge branch 'master' into 0.7-post-fixesDiva Canto2010-06-152-8/+49
|\ \ \ | |/ / |/| / | |/
| * * 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
| |
* | Fixed version info again.Diva Canto2010-06-141-2/+2
|/
* 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.