Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-28 | 3 | -38/+80 |
|\ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-01-28 | 2 | -30/+58 |
| |\ | |||||
| | * | Refactor: Break out LoadObjects() and LoadParcels() from a longer method | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -28/+44 |
| | | | |||||
| | * | Put confirmation on "land clear" command to avoid nasty accidents | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -2/+14 |
| | | | |||||
| * | | Thank you, Goetz, for a patch to fix prim count display in cut regions. | Melanie | 2011-01-28 | 2 | -9/+23 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 3 | -21/+65 |
|\ \ | |/ | |||||
| * | When an oar is loaded, do not create a default parcel before loading the ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 3 | -11/+18 |
| | | | | | | | | | | | | | | | | 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-27 | 2 | -5/+11 |
| | | | | | | | | Also properly insert region name in "land clear" command | ||||
| * | Add "land clear" command | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -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-27 | 3 | -0/+29 |
| | | | | | | | | | | | | of merged. The --merge switch will still merge the old and new land parcelling. | ||||
| * | remove unused CreateBaseLand() | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -9/+0 |
| | | |||||
* | | Make landing points work on local teleports. Constrain owners and gods to | Melanie | 2011-01-27 | 1 | -0/+1 |
| | | | | | | | | | | landing points when coming from off sim (matches agni) to prevent landing in floors or other prims. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 5 | -31/+133 |
|\ \ | |/ | |||||
| * | Implement command "land show". This shows all the parcels on the currently ↵ | Justin Clark-Casey (justincc) | 2011-01-26 | 3 | -18/+121 |
| | | | | | | | | | | | | 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. | ||||
| * | Removed a few more spurious appearance saves. When an avatar | Mic Bowman | 2011-01-25 | 2 | -13/+13 |
| | | | | | | | | | | | | | | 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. | ||||
* | | Add an interface for a region's user account cache | Melanie | 2011-01-27 | 3 | -1/+3 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-27 | 1 | -1/+2 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Mostly revert the last commit with the aim of searching for a better solution | Tom | 2011-01-26 | 1 | -13/+4 |
| | | | |||||
| * | | Add a "useCached" parameter to GetUserAccount. Add a function to Scene to ↵ | Tom | 2011-01-26 | 2 | -10/+14 |
| | | | | | | | | | | | | get the user flags. It has to be here due to access restrictions :/ | ||||
| * | | Add userFlags check to isBanned. This checks bans against DenyAnonymous and ↵ | Tom | 2011-01-26 | 1 | -1/+7 |
| | | | | | | | | | | | | DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on . | ||||
* | | | Make bans work for teleport. Now teleport will complete block if the user | Melanie | 2011-01-27 | 2 | -5/+7 |
|/ / | | | | | | | | | | | | | 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. | ||||
* | | Add a careminster API to scripting again | Melanie | 2011-01-24 | 2 | -0/+24 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 12 | -59/+59 |
|\ \ | |/ | |||||
| * | Fixes mantis #5343 | Diva Canto | 2011-01-23 | 1 | -0/+1 |
| | | |||||
| * | stop extremely old region serialization commands from appearing in the console | Justin Clark-Casey (justincc) | 2011-01-22 | 1 | -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] | ||||
| * | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-21 | 8 | -18/+19 |
| | | |||||
| * | implement "show throttles" command for showing current agent throttles and ↵ | Justin Clark-Casey (justincc) | 2011-01-21 | 1 | -200/+0 |
| | | | | | | | | | | | | | | | | | | the server settings. This is in a very crude state, currently. The LindenUDPModule was renamed LindenUDPInfoModule and moved to OptionalModules OptionalModules was given a direct reference to OpenSim.Region.ClientStack.LindenUDP so that it can inspect specific LindenUDP settings without having to generalize those to all client views (some of which may have no concept of the settings involved). This might be ess messy if OpenSim.Region.ClientStack.LindenUDP were a region module instead, like MXP, IRC and NPC | ||||
| * | minor: help text adjustment for "show queues" | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -2/+2 |
| | | |||||
| * | remove reference to CoreModules from ClientStack.LindenUDP | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -2/+2 |
| | | | | | | | | client stack uses modules in the same way that scene does - through their interfaces | ||||
| * | Move "show queues" command out of OpenSim.cs and into a separate module. | Justin Clark-Casey (justincc) | 2011-01-20 | 1 | -0/+200 |
| | | |||||
| * | For now, comment out logging messages about IM sending, since these cause ↵ | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -3/+3 |
| | | | | | | | | high spam for large group messaging | ||||
| * | with mic's permission, reduce appearance, baked texture logging verbosity ↵ | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -3/+3 |
| | | | | | | | | for now | ||||
| * | With mic's permission, adjust long call time info messages to 500ms from 200ms | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -1/+1 |
| | | |||||
| * | Downgrade and comment out some other caps messages for now | Justin Clark-Casey (justincc) | 2011-01-19 | 1 | -5/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Fix build break | Melanie | 2011-01-18 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 4 | -5/+15 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-01-18 | 4 | -5/+15 |
| |\ | |||||
| | * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 3 | -4/+4 |
| | | | | | | | | | | | | Didn't touch the appearance related stuff. | ||||
| | * | Protect World Map module, RequestMapItemsAsync, from badly formed URLs. | Diva Canto | 2011-01-17 | 1 | -1/+11 |
| | | | |||||
| * | | Change gesture activation to not quash any other flags | Melanie | 2011-01-18 | 1 | -3/+3 |
| |/ | |||||
| * | Dont' trust the viewer! Fix a permission slam error caused by trusting | Melanie | 2011-01-12 | 1 | -0/+6 |
| | | | | | | | | the viewer too much. | ||||
| * | Fix direct item give permissions | Melanie | 2011-01-12 | 2 | -11/+17 |
| | | |||||
| * | Added more debug messages under the -verbose option. | Diva Canto | 2011-01-08 | 1 | -2/+6 |
| | | |||||
| * | Added a -v|verbose option to save iar. | Diva Canto | 2011-01-08 | 2 | -1/+9 |
| | | |||||
| * | Minor additional debug message. | Diva Canto | 2011-01-07 | 1 | -0/+2 |
| | | |||||
| * | Make HG map search consistent with new syntax for link-region, i.e. ↵ | Diva Canto | 2011-01-07 | 1 | -1/+1 |
| | | | | | | | | http://foo.org. Old syntax (foo.org) is still supported, but has surprising results when ppl search again, because internally the HG link names start with http. | ||||
| * | Spawn a threadlet upon receiving requests to close agents. The operation may ↵ | Diva Canto | 2011-01-07 | 1 | -1/+4 |
| | | | | | | | | take too long, and we don't need to keep the caller waiting. | ||||
| * | Map search: changed the flag sent to the client. It was 2 (???), now it's 0. ↵ | Diva Canto | 2011-01-06 | 1 | -3/+3 |
| | | | | | | | | This makes HG map tiles work on map search -- a longstanding annoyance. My map search tests were all ok, but since I don't understand these flag values, this may break something related to map search. | ||||
| * | Allow cross-scope friendships to work, and also allow other cross scope name | Melanie | 2011-01-03 | 3 | -3/+3 |
| | | | | | | | | resolution |