Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-06-27 | 1 | -11/+12 |
|\ | |||||
| * | Fix more perms weirdness. Preserve "Locked" status across gives and rez/take. | Melanie | 2010-06-27 | 1 | -8/+9 |
| | | | | | | | | Preserve "Anyone can move" flag in most cases. | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-27 | 2 | -1/+17 |
| |\ | |||||
| * | | Fix permission propagation to prevent permanently locked objects from being | Melanie | 2010-06-27 | 1 | -3/+3 |
| | | | | | | | | | | | | created. | ||||
* | | | Fixed Robust.32BitLaunch.exe | Diva Canto | 2010-06-27 | 2 | -2/+2 |
| |/ |/| | |||||
* | | Same patch as before but for SQLite. | Diva Canto | 2010-06-27 | 1 | -0/+8 |
| | | |||||
* | | Added checks to XInventory DB layer to truncate names and descriptions. | Diva Canto | 2010-06-27 | 1 | -1/+9 |
|/ | |||||
* | don't report the null uuid as a missing asset on saving oars/iars | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -3/+5 |
| | |||||
* | minor: fix spelling mistake interupt -> interrupt in migrations | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -6/+3 |
| | | | | This is for mantis 4783 | ||||
* | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-06-25 | 2 | -14/+14 |
| | |||||
* | fix web request exception reporting properly this time | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| | |||||
* | Revert "Report http server onRequest() exception properly." | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| | | | | This reverts commit c09451a034babe6de7a2ffec44852a19946ec76d. | ||||
* | Report http server onRequest() exception properly. | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -1/+1 |
| | |||||
* | stop KeyNotFoundException() being thrown in RemoveScenePresence if the agent ↵ | Justin Clark-Casey (justincc) | 2010-06-25 | 1 | -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 resolved | Justin Clark-Casey (justincc) | 2010-06-25 | 2 | -10/+14 |
| | |||||
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-06-25 | 9 | -29/+96 |
|\ | |||||
| * | * SimianAssetServiceConnector Delete() was expecting the wrong type of ↵ | John Hurliman | 2010-06-24 | 2 | -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 functions | Melanie | 2010-06-24 | 1 | -3/+3 |
| | | | | | | | | can fail if no land is loaded | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-06-23 | 1 | -4/+13 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-06-23 | 5 | -18/+59 |
| | |\ | |||||
| | * | | add new [RemoteAdmin] settings from Snoopy's create/update, etc user patch ↵ | Justin Clark-Casey (justincc) | 2010-06-23 | 1 | -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 usage | Melanie | 2010-06-23 | 1 | -10/+12 |
| | |/ | |/| | |||||
| * | | 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 |
| |/ | |||||
* | | This file wants to be committed. Line endings mess up. | Diva Canto | 2010-06-25 | 1 | -14/+14 |
|/ | |||||
* | 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. |