aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-272-1/+17
|\
| * Same patch as before but for SQLite.Diva Canto2010-06-271-0/+8
| |
| * Added checks to XInventory DB layer to truncate names and descriptions.Diva Canto2010-06-271-1/+9
| |
* | Fix permission propagation to prevent permanently locked objects from beingMelanie2010-06-271-3/+3
|/ | | | created.
* 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
* minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-06-252-14/+14
|
* fix web request exception reporting properly this timeJustin Clark-Casey (justincc)2010-06-251-1/+1
|
* Revert "Report http server onRequest() exception properly."Justin Clark-Casey (justincc)2010-06-251-1/+1
| | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d.
* Report http server onRequest() exception properly.Justin 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
* minor: Move log information about SYSTEMIP to the place where it's resolvedJustin Clark-Casey (justincc)2010-06-252-10/+14
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-06-259-29/+96
|\
| * * 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
| * Move loading of parcels to before script start. Scripts using parcel functionsMelanie2010-06-241-3/+3
| | | | | | | | can fail if no land is loaded
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-231-4/+13
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-06-235-18/+59
| | |\
| | * | 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
| * | | Thank you, Snoopy, for a patch to reduce sim script startup CPU usageMelanie2010-06-231-10/+12
| | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-06-221-14/+14
| |\ \
| | * | Line ending fixJohn Hurliman2010-06-221-14/+14
| | | |
| * | | Guard prioritizer agains null values as those produced by a bullet dyingMelanie Thielker2010-06-221-0/+3
| | | | | | | | | | | | | | | | before it can be updated
| * | | 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
| |/
* | This file wants to be committed. Line endings mess up.Diva Canto2010-06-251-14/+14
|/
* 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