Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Note to self: don't break the build | meta7 | 2010-08-10 | 1 | -1/+1 |
| | |||||
* | Resolve merge failure | meta7 | 2010-08-10 | 7 | -4385/+4449 |
|\ | |||||
| * | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-08-10 | 1 | -2/+4 |
| |\ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Resolve merge issues | Melanie | 2010-08-10 | 1 | -22/+46 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-10 | 8 | -106/+146 |
| |\ \ | |||||
| | * | | Changing prim color generates event CHANGED_COLOR. | Marck | 2010-08-10 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | Removed abstract SetText method from EntityBase to make cleaner API. | Mikko Pallari | 2010-08-10 | 3 | -8/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-08-10 | 5 | -88/+138 |
| | |\ \ | |||||
| | | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-08-10 | 1 | -37/+37 |
| | | |\ \ | |||||
| | | | * | | This file wants to be committed | Diva Canto | 2010-08-10 | 1 | -37/+37 |
| | | | | | | |||||
| | | * | | | On shift-copy of an object, set up a new physics actor (as appropriate) for ↵ | Justin Clark-Casey (justincc) | 2010-08-10 | 4 | -23/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | every copied prim, not just the root This addresses http://opensimulator.org/mantis/view.php?id=4295 | ||||
| | | * | | | Reduce number of paths in SOP code by setting flags via Flags property ↵ | Justin Clark-Casey (justincc) | 2010-08-10 | 1 | -15/+25 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rather than _flags Both ObjectFlags and Flags are effectively exactly the same property, except that ObjectFlags is uint and Flags is PrimFlags Both reference the PrimFlags _flags underneath, so you couldn't set a non PrimFlags uint anyway. Deprecated ObjectFlags in favour of Flags. | ||||
| | | * | | | Extend DuplicateObject() test to check flags on the duplicated object | Justin Clark-Casey (justincc) | 2010-08-10 | 1 | -7/+9 |
| | | | | | | |||||
| | | * | | | extend TestDuplicateObject() to a two prim object | Justin Clark-Casey (justincc) | 2010-08-10 | 1 | -10/+19 |
| | | | | | | |||||
| | | * | | | Handle incoming ObjectImage (TextureEntry) updates synchronously rather than ↵ | Justin Clark-Casey (justincc) | 2010-08-10 | 1 | -1/+5 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | asynchronously At least on stock Linden clients, updating the texture on all faces of the prim will actually send an ObjectImage packet for each update. There is a race condition if these are handled async, meaning that occasionally not all of the faces are correctly updated. | ||||
| | * | | | Avoid truncation of error message during region creation. | Marck | 2010-08-10 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| * | | | Remove 4000+ DOS line endings. Grrr! | Melanie | 2010-08-10 | 1 | -4332/+4332 |
| | | | | |||||
| * | | | Remove windows line endinge | Melanie | 2010-08-10 | 2 | -118/+118 |
| | | | | |||||
* | | | | Add a stack trace to the error output on the recursive read lock warning on ↵ | meta7 | 2010-08-10 | 1 | -104/+114 |
| |_|/ |/| | | | | | | | | my RWlocks. Whilst recursive locks are safe, coupled with other issues we're experiencing with the TaskInventoryDictionary it implies that somewhere the lock is not being freed possibly due to a merge error somewhere, and thus it needs to be looked into. | ||||
* | | | remoning debug messages | sacha | 2010-08-10 | 1 | -5/+0 |
| | | | |||||
* | | | fixed ground texture issues ( it seems ) | sacha | 2010-08-10 | 1 | -2/+9 |
|/ / | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-09 | 1 | -3/+2 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Change prejump from hardcoded true to default true so it can be disabled. | Melanie Thielker | 2010-08-10 | 1 | -2/+1 |
| | | | | | | | | | | | | It completely destroys roleplay jumping | ||||
| * | | Whitespace conflict | Melanie Thielker | 2010-08-09 | 1 | -1/+1 |
| | | | |||||
* | | | Add a DebuggerSafe option to the ini to help with debugging in visual ↵ | meta7 | 2010-08-09 | 2 | -3/+16 |
| | | | | | | | | | | | | studio. This essentially silences exceptions in the script engine. Disabled by default, naturally. | ||||
* | | | For my own sanity, fix a bug in xengine | meta7 | 2010-08-09 | 1 | -1/+2 |
|/ / | |||||
* | | Print a console message when we deny access because of no valid parcel found. | meta7 | 2010-08-08 | 1 | -1/+2 |
| | | |||||
* | | Fix minimap issues. This addresses mantis #228. | meta7 | 2010-08-08 | 1 | -21/+2 |
| | | |||||
* | | Add debug messages to attachment receiving and cowardly refuse to create | Melanie Thielker | 2010-08-08 | 1 | -1/+19 |
| | | | | | | | | them if the owner can't be determined. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-08-08 | 3 | -9/+61 |
|\ \ | |/ | |||||
| * | Tests for distance-sorted fallback regions. | Marck | 2010-08-08 | 1 | -7/+57 |
| | | | | | | | | With some extensions to existing grid service tests. | ||||
| * | In my crusade against facelights, I am striking the killing blow. Add a | Melanie | 2010-08-08 | 2 | -0/+26 |
| | | | | | | | | | | | | DisableFacelights option to OpenSim.ini to finally kill those immersion- breaking, silly vanity lights that destroy nighttime RP. Girls, you look just fine without them. Guys, you too. Thank you. Melanie has left the building. | ||||
| * | minor: Remove overly verbose schedule full update log message for attachments | Justin Clark-Casey (justincc) | 2010-08-07 | 1 | -2/+2 |
| | | |||||
* | | The real fix for unscripted sit positions. This one doesn't fuck everything ↵ | meta7 | 2010-08-07 | 1 | -1/+4 |
| | | | | | | | | else up. Promise. | ||||
* | | Reverted: * Fix the unscripted sit rotation being incorrect .. will commit ↵ | meta7 | 2010-08-07 | 1 | -7/+3 |
| | | | | | | | | a proper fix now. | ||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-07 | 2 | -0/+20 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-08-08 | 4 | -617/+636 |
| |\ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | In my crusade against facelights, I am striking the killing blow. Add a | Melanie Thielker | 2010-08-08 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | DisableFacelights option to OpenSim.ini to finally kill those immersion- breaking, silly vanity lights that destroy nighttime RP. Girls, you look just fine without them. Guys, you too. Thank you. Melanie has left the building. | ||||
* | | | | Implement parcel group access control. This addresses mantis #158. | meta7 | 2010-08-07 | 1 | -1013/+1045 |
| |/ / |/| | | |||||
* | | | Increase sit distance to 256 meters, but leave the initial autopilot process ↵ | meta7 | 2010-08-07 | 1 | -1/+1 |
| | | | | | | | | | | | | in the picture so sit position can still be raycast by the existing code. | ||||
* | | | Get rid of some debug chatter that someone who can't spell left behind. ;) | meta7 | 2010-08-07 | 1 | -2/+1 |
| | | | |||||
* | | | Fix the unscripted sit rotation being incorrect (relative to the prim). Note ↵ | meta7 | 2010-08-07 | 1 | -3/+7 |
| | | | | | | | | | | | | that unscripted sit offset is still really poor but this is not something i'm prepared to spend time on fixing. | ||||
* | | | Fix a rather nasty issue where the Backup() process causes objects and ↵ | meta7 | 2010-08-07 | 2 | -104/+120 |
| | | | | | | | | | | | | avatars sitting on them to be pushed to the corner of the sim. | ||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | meta7 | 2010-08-07 | 2 | -5/+5 |
|\ \ \ | |/ / | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Dumb error in fix | Melanie | 2010-08-07 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie Thielker | 2010-08-07 | 1 | -3/+3 |
| |\ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * \ | Merge branch 'careminster-presence-refactor' of ↵ | sacha | 2010-08-07 | 6 | -4721/+4745 |
| | |\ \ | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| | * | | | removing more stains ... | sacha | 2010-08-07 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Mantis #229. Fix Global sim ccordinates | Melanie Thielker | 2010-08-07 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
* | | | | Repair lsGetWindlightScene, the constant was added to the list as a uint, ↵ | meta7 | 2010-08-07 | 1 | -507/+507 |
|/ / / | | | | | | | | | | which is bad - convert to LSL_Integer first. |