aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Resolve merge issuesMelanie2010-08-101-22/+46
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-08-1011-132/+153
|\
| * Changing prim color generates event CHANGED_COLOR.Marck2010-08-101-0/+2
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Removed abstract SetText method from EntityBase to make cleaner API.Mikko Pallari2010-08-103-8/+1
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-108-114/+145
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-08-103-60/+42
| | |\
| | | * This file wants to be committedDiva Canto2010-08-101-37/+37
| | | |
| | | * Enforce DB limits on region name to 32 chars, or else (not good). Removed a ↵Diva Canto2010-08-102-23/+5
| | | | | | | | | | | | | | | | piece of code from Hyperlinker that didn't work anyway. Shortened the hyperlink region name.
| | * | On shift-copy of an object, set up a new physics actor (as appropriate) for ↵Justin Clark-Casey (justincc)2010-08-104-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-101-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 objectJustin Clark-Casey (justincc)2010-08-101-7/+9
| | | |
| | * | extend TestDuplicateObject() to a two prim objectJustin Clark-Casey (justincc)2010-08-101-10/+19
| | | |
| | * | Handle incoming ObjectImage (TextureEntry) updates synchronously rather than ↵Justin Clark-Casey (justincc)2010-08-101-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.
| | * Even if all data migratios are up to date, still print the current revision ↵Justin Clark-Casey (justincc)2010-08-091-3/+2
| | | | | | | | | | | | to the log
| * | Avoid truncation of error message during region creation.Marck2010-08-101-1/+1
| |/ | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | Remove 4000+ DOS line endings. Grrr!Melanie2010-08-101-4332/+4332
| |
* | Remove windows line endingeMelanie2010-08-102-118/+118
| |
* | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-092-6/+5
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Change prejump from hardcoded true to default true so it can be disabled.Melanie Thielker2010-08-101-2/+1
| | | | | | | | | | | | It completely destroys roleplay jumping
| * | Whitespace conflictMelanie Thielker2010-08-092-5/+1
| | |
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-091-2/+6
| |\ \ | | |/
| | * Make fallbacks work, the destination was never actually updated with the ↵meta72010-08-091-4/+5
| | | | | | | | | | | | | | | | | | fallback details. Signed-off-by: Melanie <melanie@t-data.com>
* | | Add a DebuggerSafe option to the ini to help with debugging in visual ↵meta72010-08-092-3/+16
| | | | | | | | | | | | studio. This essentially silences exceptions in the script engine. Disabled by default, naturally.
* | | For my own sanity, fix a bug in xenginemeta72010-08-091-1/+2
|/ /
* | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-082-5/+1
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'careminster-presence-refactor' of ↵Melanie2010-08-092-23/+23
| |\ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-092-5/+1
| |\ \ \ | | | |/ | | |/|
| | * | Remove "Could not authorize your session into the region" message in favorMelanie2010-08-092-5/+1
| | | | | | | | | | | | | | | | of sending back the actual error message provided by the sim.
* | | | Make fallbacks work, the destination was never actually updated with the ↵meta72010-08-081-6/+7
| |_|/ |/| | | | | | | | fallback details.
* | | Print a console message when we deny access because of no valid parcel found.meta72010-08-081-1/+2
| | |
* | | Fix minimap issues. This addresses mantis #228.meta72010-08-081-21/+2
| | |
* | | Add debug messages to attachment receiving and cowardly refuse to createMelanie Thielker2010-08-081-1/+19
|/ / | | | | | | them if the owner can't be determined.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-087-11/+112
|\ \ | |/
| * Add distance sort for null, tooMelanie2010-08-081-2/+5
| |
| * Tests for distance-sorted fallback regions.Marck2010-08-081-7/+57
| | | | | | | | With some extensions to existing grid service tests.
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-08-083-0/+46
| |\
| | * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-08-083-0/+33
| | |\
| | * | Enabled GridInfoServiceInConnector for standalones.Diva Canto2010-08-083-0/+46
| | | |
| * | | Thank you, Marck00, for a patch that implemented region distance sortingMelanie Thielker2010-08-083-4/+31
| | |/ | |/| | | | | | | for fallback regions. Applied with changes.
| * | In my crusade against facelights, I am striking the killing blow. Add aMelanie2010-08-083-0/+33
| |/ | | | | | | | | | | 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.
| * Add search URL to Login ServiceMelanie2010-08-072-2/+20
| |
| * minor: Remove overly verbose schedule full update log message for attachmentsJustin Clark-Casey (justincc)2010-08-071-2/+2
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-08-082-1020/+1051
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | The real fix for unscripted sit positions. This one doesn't fuck everything ↵meta72010-08-071-1/+4
| | | | | | | | | | | | else up. Promise.
| * | Reverted: * Fix the unscripted sit rotation being incorrect .. will commit ↵meta72010-08-071-7/+3
| | | | | | | | | | | | a proper fix now.
| * | Merge branch 'careminster-presence-refactor' of ↵meta72010-08-073-0/+27
| |\ \ | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Implement parcel group access control. This addresses mantis #158.meta72010-08-071-1013/+1045
| | | |
* | | | Thank you, Marck00, for a patch that implemented region distance sortingMelanie Thielker2010-08-083-4/+31
| |/ / |/| | | | | | | | for fallback regions. Applied with changes.
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie Thielker2010-08-084-617/+636
|\ \ \ | |/ / | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Increase sit distance to 256 meters, but leave the initial autopilot process ↵meta72010-08-071-1/+1
| | | | | | | | | | | | in the picture so sit position can still be raycast by the existing code.