aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-01-286-39/+85
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-01-282-30/+58
| |\
| | * Refactor: Break out LoadObjects() and LoadParcels() from a longer methodJustin Clark-Casey (justincc)2011-01-271-28/+44
| | |
| | * Put confirmation on "land clear" command to avoid nasty accidentsJustin Clark-Casey (justincc)2011-01-271-2/+14
| | |
| * | Thank you, Goetz, for a patch to fix prim count display in cut regions.Melanie2011-01-285-10/+28
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-276-21/+83
|\ \ | |/
| * When an oar is loaded, do not create a default parcel before loading the ↵Justin Clark-Casey (justincc)2011-01-276-15/+25
| | | | | | | | | | | | | | | | parcels from the OAR. The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one. Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event).
| * Show local IDs in "land show" output.Justin Clark-Casey (justincc)2011-01-272-5/+11
| | | | | | | | Also properly insert region name in "land clear" command
| * Add "land clear" commandJustin Clark-Casey (justincc)2011-01-271-3/+13
| | | | | | | | This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner
| * Fix OAR parcel loading so that old parcels are replaced by the new instead ↵Justin Clark-Casey (justincc)2011-01-276-0/+44
| | | | | | | | | | | | of merged. The --merge switch will still merge the old and new land parcelling.
| * remove unused CreateBaseLand()Justin Clark-Casey (justincc)2011-01-271-9/+0
| |
| * Make it workMelanie2011-01-271-4/+6
| |
| * Add a TeleportFlags member to SP so we can tell how we got there.Melanie2011-01-272-0/+15
| |
| * Also set Godlike flag. Might be usefulMelanie2011-01-271-0/+2
| |
| * Add TeleportFlags.ViaRegionID to the flags sent on login when the regionMelanie2011-01-271-8/+13
| | | | | | | | | | was entered by hand to determine whether or not to honor the landing point
* | Make the estate setting "Allow direct teleport" override the constraintMelanie2011-01-271-0/+3
| | | | | | | | of local tepeports to landing points like it is meant to
* | Let gods TP in wherever they like while in god modeMelanie2011-01-271-0/+1
| |
* | Implement "Cannot teleport closer to destination" messageMelanie2011-01-271-1/+5
| |
* | Make landing points work on local teleports. Constrain owners and gods toMelanie2011-01-272-5/+27
| | | | | | | | | | landing points when coming from off sim (matches agni) to prevent landing in floors or other prims.
* | Change the way landing points are honoredMelanie2011-01-271-6/+13
| |
* | Make it workMelanie2011-01-271-4/+6
| |
* | Fix build breakMelanie2011-01-271-0/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-2710-106/+178
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2011-01-265-19/+136
| |\
| | * Add some comments on ILandObject.StartPoint and EndPointJustin Clark-Casey (justincc)2011-01-261-0/+10
| | |
| | * Implement command "land show". This shows all the parcels on the currently ↵Justin Clark-Casey (justincc)2011-01-265-19/+126
| | | | | | | | | | | | | | | | | | selected region/s This is useful for diagnostics. The command is "land show" rather than "show land" because it's implemented as a module specific subcommand.
| * | Remove the RestorePresences functions (which don't seem to be doingMic Bowman2011-01-262-69/+12
| |/ | | | | | | | | anything) and clean up the code in AddNewClient (so Appearance only gets assigned once, not three times).
| * Removed a few more spurious appearance saves. When an avatarMic Bowman2011-01-253-18/+31
| | | | | | | | | | | | | | enters a region the attachments module tries to update the appearance with attachments that are already part of the appearance. Just added a check to only save if the attachments weren't there before.
| * Fix script data not being reset as it should beMelanie2011-01-241-0/+4
| |
* | Add a TeleportFlags member to SP so we can tell how we got there.Melanie2011-01-272-0/+14
| |
* | Also set Godlike flag. Might be usefulMelanie2011-01-271-0/+2
| |
* | Add TeleportFlags.ViaRegionID to the flags sent on login when the regionMelanie2011-01-271-8/+13
| | | | | | | | | | was entered by hand to determine whether or not to honor the landing point
* | Clear user account cache before checking flags on login. This will make AVMelanie2011-01-271-0/+3
| | | | | | | | and other bannable flags work in this case.
* | Add an interface for a region's user account cacheMelanie2011-01-274-1/+16
| |
* | Fix merge artifactsMelanie2011-01-271-3/+3
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-01-277-19/+93
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Mostly revert the last commit with the aim of searching for a better solutionTom2011-01-267-35/+5
| | |
| * | Add a "useCached" parameter to GetUserAccount. Add a function to Scene to ↵Tom2011-01-268-32/+55
| | | | | | | | | | | | get the user flags. It has to be here due to access restrictions :/
| * | Add userFlags check to isBanned. This checks bans against DenyAnonymous and ↵Tom2011-01-265-10/+78
| | | | | | | | | | | | DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on .
| * | Revert my previous SHA1 commit in favour of a better implementationTom2011-01-262-6/+10
| | |
| * | Provide an SL compatible llMD5String function across all platformsTom2011-01-262-5/+11
| | |
| * | Make llSHA1Hash SL compatible when using characters like the euro symbol (€)Tom2011-01-261-1/+3
| | |
* | | Make bans work for teleport. Now teleport will complete block if the userMelanie2011-01-274-57/+56
|/ / | | | | | | | | | | | | is not allowed on the estate. If the user is allowed on no parcel, the teleport will also be blocked. If the user is allowed on a parcel, but not the desired one, the user will be shifted to the closest allowed location.
* | Reproduce a corner case behavior for llListReplaceListMelanie2011-01-251-6/+9
| |
* | Complete country supportMelanie2011-01-241-0/+8
| |
* | Fix script data not being reset as it should beMelanie2011-01-241-0/+4
| |
* | Add a careminster API to scripting againMelanie2011-01-244-0/+32
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-2331-383/+519
|\ \ | |/
| * Fixes mantis #5343Diva Canto2011-01-231-0/+1
| |
| * stop extremely old region serialization commands from appearing in the consoleJustin Clark-Casey (justincc)2011-01-221-27/+26
| | | | | | | | as far as I know these are unused and unsupported. Please re-enable if this is not the case. This does not effect save-xml[2]/load-xml[2]