Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Added ability for GetTexture to serve multiple formats. The format may come ↵ | Diva Canto | 2010-12-08 | 2 | -42/+283 | |
| | | | | | | | | | | | | 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>. | |||||
| * | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 6 | -0/+132 | |
| |/ | | | | | | | whether or not an agent is allowed there as a root agent. | |||||
| * | Added an exception handler on CreateObject handler, just in case there's an ↵ | Diva Canto | 2010-12-07 | 1 | -20/+31 | |
| | | | | | | | | exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs) | |||||
| * | Removed extraneous left-/ on /object/ subpath. Bug introduced during region ↵ | Diva Canto | 2010-12-07 | 1 | -1/+1 | |
| | | | | | | | | URLs clean up. | |||||
| * | change doc. trivial commit to get panda to rebuild | Justin Clark-Casey (justincc) | 2010-12-08 | 1 | -1/+1 | |
| | | ||||||
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 6 | -0/+132 | |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | |||||
* | | Prevent sending of attachment data to any client if the attachment | Melanie | 2010-12-08 | 1 | -0/+21 | |
| | | | | | | | | is not actually attached to any avatar. Another stab ad fixing "HUD hair" | |||||
* | | Allow TPing multiple people in the friends list in one go. | Melanie | 2010-12-07 | 1 | -5/+10 | |
| | | ||||||
* | | Update calling card interface | Melanie | 2010-12-07 | 1 | -1/+1 | |
| | | ||||||
* | | Add the interface needed to revive calling cards | Melanie | 2010-12-07 | 2 | -0/+26 | |
| | | ||||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-12-07 | 28 | -215/+243 | |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 27 | -214/+242 | |
| |\ \ | | |/ | ||||||
| | * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 11 | -35/+47 | |
| | | | | | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | |||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 68 | -987/+2318 | |
| | |\ | ||||||
| | | * | Simplify updating of agent inventory assets. Make newly created asset IDs | Melanie | 2010-12-04 | 1 | -19/+6 | |
| | | | | | | | | | | | | | | | | random rather than using IDs known by the client ahead of time. | |||||
| | * | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 17 | -99/+307 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 65 | -1077/+1971 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 18 | -111/+167 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * \ \ \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 30 | -91/+289 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-31 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ | ||||||
| | * | | | | | | | * better semantics for link-region command | Jonathan Freedman | 2010-10-30 | 1 | -21/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * actually parse name for new link-region command | |||||
| | * | | | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 7 | -60/+168 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 2 | -5/+1 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 16 | -486/+342 | |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 9 | -70/+64 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 6 | -82/+270 | |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -23/+29 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 41 | -934/+1261 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-25 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-24 | 3 | -3/+46 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-24 | 3 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | * throw debug message when no HomeURI is set | Jonathan Freedman | 2010-10-24 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 2 | -8/+6 | |
| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'careminster-presence-refactor' of ↵ | sacha | 2010-12-04 | 19 | -295/+592 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * | | | | | | | | | | | | | | | | | | | add more detail to the log in case of FORM Timeout | sacha | 2010-12-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cause nothing relevant are in the services logs | |||||
* | | | | | | | | | | | | | | | | | | | | Cowardly refuse to keep running when no application plugins are loaded. | Melanie | 2010-12-07 | 3 | -3/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents empty instances from hanging around when Mono.Addins messes up | |||||
* | | | | | | | | | | | | | | | | | | | | Lock the attachments dict so it doesn't get out of sync when iterating | Melanie | 2010-12-06 | 1 | -35/+59 | |
| |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | Add some safeguards: DOn't send someone else's HUDs, don't send deleted prims | Melanie | 2010-12-04 | 1 | -15/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed some unneccessarily wordy core comments | |||||
* | | | | | | | | | | | | | | | | | | | Monitor the UUIDs used to create and update wearable assets. Reject any changed | Melanie | 2010-12-04 | 2 | -0/+125 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture that is not present in the user's inventory full perm. This will prevent "UUID snatching", a copybot-type of attack that can cause clothing makers to be forced to destroy and replace legit items in order to invalidate the copies. | |||||
* | | | | | | | | | | | | | | | | | | | Simplify updating of agent inventory assets. Make newly created asset IDs | Melanie | 2010-12-04 | 1 | -19/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | random rather than using IDs known by the client ahead of time. | |||||
* | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-04 | 5 | -57/+235 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-12-04 | 5 | -57/+235 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | minor: add class doc line to older region module example code pointing ↵ | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | towards newer | |||||
| | * | | | | | | | | | | | | | | | | | | comment out the extension attribute | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | add bare bones shared example module | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -0/+91 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | refactor some common code in RegionModulesControllerPlugin | Justin Clark-Casey (justincc) | 2010-12-04 | 2 | -61/+54 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | also some minor doc changes in BareBonesNonSharedModule | |||||
| | * | | | | | | | | | | | | | | | | | | correct the id of the example module | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | ||||||
| | * | | | | | | | | | | | | | | | | | | Add the most bare bones non-shared region module example. Not active unless ↵ | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -0/+83 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the correct line is uncommented. | |||||
| | * | | | | | | | | | | | | | | | | | | add warning decals and information to RegionModule.cs in probably ↵ | Justin Clark-Casey (justincc) | 2010-12-04 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | non-functional OpenSim.Region.Examples.SimpleModule project | |||||
| | * | | | | | | | | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-12-04 | 4 | -62/+123 | |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |