Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'careminster-presence-refactor' of ↵ | Tom Grimshaw | 2010-06-25 | 6 | -25/+45 |
|\ | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-25 | 6 | -25/+45 |
| |\ | |||||
| | * | 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 | ||||
| | * | | This file wants to be committed. Line endings mess up. | Diva Canto | 2010-06-25 | 1 | -14/+14 |
| | | | | |||||
* | | | | Add two events: OnAttachToBackup and OnDetachFromBackup. | Tom Grimshaw | 2010-06-25 | 2 | -0/+30 |
| | | | | |||||
* | | | | Remove the prepending slash from the default git repo name | Tom Grimshaw | 2010-06-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Whoops, enabled = true not enabled = 1 | Tom Grimshaw | 2010-06-25 | 1 | -1/+1 |
| | | | | |||||
* | | | | Add [Git] section to OpenSim.ini.example for Gitminster | Tom Grimshaw | 2010-06-25 | 1 | -0/+3 |
| | | | | |||||
* | | | | Add some libraries for XGitminster | Tom Grimshaw | 2010-06-25 | 11 | -0/+9055 |
|/ / / | |||||
* | | | Make "Allow other residents to edit terrain" default to FALSE | Tom Grimshaw | 2010-06-25 | 1 | -1/+1 |
| | | | |||||
* | | | Add DwellModule interface | Melanie Thielker | 2010-06-25 | 1 | -0/+37 |
| | | | |||||
* | | | Unhook the dwell request from the land module (and therefore local storage) | Melanie Thielker | 2010-06-25 | 1 | -1/+1 |
| | | | |||||
* | | | Also make prims send the proper position. I hate it when people comment | Melanie Thielker | 2010-06-24 | 1 | -4/+4 |
| | | | | | | | | | | | | out things just because they're "not yet used". Grrrr. | ||||
* | | | Add the object owner UUID into the binary bucket of object to user IM | Melanie Thielker | 2010-06-24 | 2 | -1/+3 |
| | | | |||||
* | | | Replace the imSessionID, which is useless out of context, with the scope id | Melanie Thielker | 2010-06-24 | 1 | -0/+7 |
| | | | | | | | | | | | | in saved IMs | ||||
* | | | New viewers don't set the "save offline IM" flag anymore. Set it serverside | Melanie Thielker | 2010-06-24 | 1 | -0/+6 |
| | | | | | | | | | | | | so messages get saved | ||||
* | | | bug fix. 0,0 is a vlid sim coordinate | Melanie Thielker | 2010-06-24 | 1 | -1/+1 |
| | | | |||||
* | | | And another | Melanie Thielker | 2010-06-24 | 1 | -2/+0 |
| | | | |||||
* | | | And another conflict | Melanie | 2010-06-24 | 1 | -17/+0 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-24 | 3 | -8/+38 |
|\ \ \ | | |/ | |/| | |||||
| * | | 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' into careminster-presence-refactor | Melanie | 2010-06-22 | 1 | -14/+14 |
|\ \ \ | |/ / | |||||
| * | | 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 |
| |/ / | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-06-22 | 3 | -10/+46 |
|\ \ \ | |/ / | |||||
| * | | * 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. | ||||
* | | Security fix: Allow only textures to be fetched using HTTP texture cap | Melanie Thielker | 2010-06-22 | 1 | -0/+12 |
| | | |||||
* | | Cause collisions with the avatar to be sent to attachments. Currently | Melanie Thielker | 2010-06-22 | 1 | -0/+140 |
| | | | | | | | | | | ignores collision filter. Physics collisions are still dodgy, so we don't get the events we should be getting. | ||||
* | | 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 | ||||
* | | Correctly update the LastSeen field | Melanie Thielker | 2010-06-21 | 1 | -1/+1 |
| | | |||||
* | | Bump the migration version, ot it would never happen | Melanie Thielker | 2010-06-21 | 1 | -1/+1 |
| | | |||||
* | | Fix build break | Melanie Thielker | 2010-06-21 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-06-21 | 2 | -4/+22 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix the StandUp position to calculate as if we're still using the child prim id. | Tom Grimshaw | 2010-06-20 | 1 | -1/+1 |
| | | |