Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Another stab at mantis #5256 | Diva Canto | 2010-12-10 | 2 | -25/+32 | |
| |/ | ||||||
| * | Revert "A stab at mantis #5256. Separate ScenePresence updates from ↵ | Diva Canto | 2010-12-10 | 1 | -150/+128 | |
| | | | | | | | | | | | | SceneObject updates, and place them in different queues." This reverts commit f84905e2949d61239c8bff815f8061a9435c124c. | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-10 | 6 | -69/+46 | |
| |\ | ||||||
| | * | Adjust hypergrid console commands to latest changes. | Marck | 2010-12-10 | 1 | -64/+41 | |
| | | | ||||||
| | * | fix the minimap sitting avatar location bug | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 | |
| | | | | | | | | | | | | a sitting avatar should have it's offset position added to the scene object, not its absolute position | |||||
| | * | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 4 | -4/+4 | |
| | | | ||||||
| * | | A stab at mantis #5256. Separate ScenePresence updates from SceneObject ↵ | Diva Canto | 2010-12-10 | 1 | -128/+150 | |
| |/ | | | | | | | updates, and place them in different queues. | |||||
| * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 5 | -3/+9 | |
| | | | | | | | | command. mantis #5259 | |||||
| * | Minor bug fixes. Hunting down mantis #5259 | Diva Canto | 2010-12-09 | 2 | -2/+4 | |
| | | ||||||
| * | Fixed wrong comment | Diva Canto | 2010-12-08 | 1 | -1/+1 | |
| | | ||||||
| * | Fixed previous compile error -- I haven't pushed the CreatorID in AssetBase ↵ | Diva Canto | 2010-12-08 | 1 | -1/+1 | |
| | | | | | | | | yet... | |||||
* | | Fix border fence for physicals. Fix llRotLookAt() for Vehicles. | Kitto Flora | 2010-12-11 | 2 | -153/+61 | |
| | | ||||||
* | | Allow floats in the list for llSetPayPrice and silently convert them to int, | Melanie | 2010-12-11 | 1 | -4/+4 | |
| | | ||||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 5 | -64/+316 | |
|\ \ | |/ | ||||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-12-09 | 2 | -42/+283 | |
| |\ | ||||||
| | * | 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 |