aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-01-272-6/+19
|\
| * Implement command "land show". This shows all the parcels on the currently ↵Justin Clark-Casey (justincc)2011-01-261-1/+1
| | | | | | | | | | | | 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 avatarMic Bowman2011-01-251-5/+18
| | | | | | | | | | | | | | 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 userFlags check to isBanned. This checks bans against DenyAnonymous and ↵Tom2011-01-262-5/+24
| | | | | | | | 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-261-3/+9
| |
* | Provide an SL compatible llMD5String function across all platformsTom2011-01-261-4/+10
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-235-13/+43
|\ \ | |/
| * Update the "config get <section> <key>" command to "config get [<section>] ↵Justin Clark-Casey (justincc)2011-01-212-0/+19
| | | | | | | | | | | | | | | | | | [<key>]" The config get command shows a current config value on the console. Now, if <key> is omitted then all the values for the given section are printed. If <section> is ommitted then all sections and all keys are printed. Current config can also be dumped to a file using "config save <path>". This can be handy for resolving or eliminating config issues
| * make "show info" and "show version" show the same version textJustin Clark-Casey (justincc)2011-01-211-4/+7
| |
| * add current console log level to "show info"Justin Clark-Casey (justincc)2011-01-211-2/+9
| |
| * minor: make "show info" help slightly clearerJustin Clark-Casey (justincc)2011-01-201-1/+1
| |
| * with mic's permission, reduce appearance, baked texture logging verbosity ↵Justin Clark-Casey (justincc)2011-01-191-4/+4
| | | | | | | | for now
| * With mic's permission, adjust long call time info messages to 500ms from 200msJustin Clark-Casey (justincc)2011-01-192-3/+4
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-01-131-4/+24
|\ \ | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Guard against invalid light color specifiers from the databaseMelanie2011-01-131-4/+24
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-131-3/+24
|\ \ \ | |/ / |/| / | |/
| * Make FireAndForgetWrapper a singleton classBlueWall2011-01-131-3/+24
| | | | | | | | | | | | Made FireAndForgetWrapper a singleton class to allow us to drop dependancy on the BclExtras35 library. BclExtras is broken in Mono 2.8.2 and we used the library in only one function.
* | Preserve the script running flag when copying an object.Melanie2011-01-081-0/+12
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-062-28/+228
|\ \ | |/
| * Added more performance checks to the HTTP server. Each requestMic Bowman2011-01-052-48/+83
| | | | | | | | | | coming through the WebUtil fns has a request id in the header that can match the request to the actual work done by the service
| * Cleaned up debugging messages in the WebRequest handlersMic Bowman2011-01-031-5/+8
| |
| * Standardize the way WebRequests are made in the SimulationServiceConnector. ↵Mic Bowman2010-12-291-3/+165
| | | | | | | | | | | | Added debugging calls for tracking performance of web requests.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-301-3/+1
|\ \ | |/
| * Implement SendPlacesReplyMelanie2010-12-301-0/+19
| |
| * Drop the static from default wearables. It isn'tMic Bowman2010-12-271-3/+1
| | | | | | | | static.
* | Implement SendPlacesReplyMelanie2010-12-301-0/+19
| |
* | Change the mute list parts of the client interface so that all data is providedMelanie2010-12-241-2/+2
| | | | | | | | to the module
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-231-1/+3
|\ \ | |/
| * * Re-Adding Scene TimeDilation to Object Update Packets.Teravus Ovares (Dan Olivares)2010-12-231-1/+3
| | | | | | | | | | | | * Added Calculating Time Dilation in the OdePlubin * When multiple object updates are stuffed into one packet, average the time dilation between them as a compromise. * Time Dilation on the update is calculated when the EntityUpdate object is created. The pre-calc-ed TD is stored in the Entity update and used when it goes out on the wire. Previously, it was 1.0 all the time. The time dilation is tied to when the update is created, not when the update is sent.
* | Prevent a null ref when an avatar login doesn't go as plannedMelanie2010-12-221-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-211-0/+2
|\ \ | |/
| * * Adds AbortXfer to the ClientAPI mixTeravus Ovares (Dan Olivares)2010-12-211-0/+2
| | | | | | | | | | | | * Adds an item that checks to see if the top request has been there for longer then 30 seconds without an update and sends an AbortXfer if it encounters one. This allows the client to cancel the Xfer on it's side so you can re-select the prim and get the inventory when it fails the first time. * Some interesting locking... Using NewFiles to lock the rest of them. We'll see how that goes. * The goal of this is to ensure that Xfers are restartable when they fail. The client will not do that on it's own.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-212-9/+7
|\ \ | |/
| * Shooting in the dark for solutions to the appearance problemMic Bowman2010-12-202-8/+8
| |
| * Fix notecards that end with an embedded object causing an exceptionMelanie2010-12-171-2/+2
| |
| * Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-131-3/+4
| | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work.
* | Fix notecards that end with an embedded object causing an exceptionMelanie2010-12-161-2/+2
| |
* | Revamp the viewer -> banlist packet processing so fix a number of bugs.Melanie2010-12-131-3/+4
| | | | | | | | | | | | | | Remove the too coarse CanEditParcel method in favor of a CanEditParcelProperties method that takes a GroupPowers argument to specify what action is to be taken. Also, make the method to set parcel data much more granular. Permissions in a deeded setting should now work.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-1/+1
|\ \ | |/
| * minor: remove some compiler warningsJustin Clark-Casey (justincc)2010-12-101-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-0/+81
|\ \ | |/
| * Added ability for GetTexture to serve multiple formats. The format may come ↵Diva Canto2010-12-081-0/+81
| | | | | | | | as an extra query parameter in the URL format=<format> (this was tested and working) or it may come in the Accept header (code added, but not tested). The result of the conversion is placed in the asset cache, under the name <uuid>-<format>.
* | Update calling card interfaceMelanie2010-12-071-1/+1
| |
* | Add the interface needed to revive calling cardsMelanie2010-12-071-0/+13
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-12-074-8/+39
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-063-7/+38
| |\ \ | | |/
| | * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-0511-178/+438
| | |\
| | * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-232-1/+2
| | |\ \
| | * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-215-3/+123
| | |\ \ \
| | * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-214-48/+47
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs