Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-13 | 2 | -9/+5 |
|\ | |||||
| * | It turns out that the 1/2 sec burst for prims download is not a bug, but a ↵ | Diva Canto | 2010-12-13 | 1 | -11/+2 |
| | | | | | | | | | | | | | | | | feature of the client. The client sets the throttles in such a way that makes the server behave like that. The same happens in the Linden Grid. Revert "This may have been the biggest, baddest bug in OpenSim ever... confusion between bytes per second and bytes per millisecond." This reverts commit 870bbcfc6c264c515ac660837d16ccad4e59ac64. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-13 | 2 | -9/+6 |
| |\ | |||||
| | * | Trigger event with flag CHANGED_LINK when agent sits on objects that have ↵ | Marck | 2010-12-12 | 2 | -9/+6 |
| | | | | | | | | | | | | not a sit target defined. This fixes Mantis #4692. | ||||
| * | | This may have been the biggest, baddest bug in OpenSim ever... confusion ↵ | Diva Canto | 2010-12-13 | 1 | -2/+11 |
| |/ | | | | | | | between bytes per second and bytes per millisecond. | ||||
* | | Correct Sensor axis for unattached daughter prims. | Kitto Flora | 2010-12-12 | 1 | -1/+2 |
| | | |||||
* | | Prevent objects that are worn from ground from vanishing from the scene | Melanie | 2010-12-12 | 1 | -9/+0 |
| | | |||||
* | | Fix a perms issue when wearing an object from inworld | Melanie | 2010-12-12 | 1 | -10/+18 |
| | | |||||
* | | Apply the useful part of diva's patch that was skipped | Melanie | 2010-12-12 | 2 | -31/+7 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 3 | -5/+23 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-11 | 3 | -5/+23 |
| |\ | |||||
| | * | More OSSL function name normalization, this time for osParcelSetDetails. | Marck | 2010-12-11 | 3 | -5/+23 |
| | | | |||||
| * | | Fixes the nudge movements! | Diva Canto | 2010-12-11 | 3 | -47/+19 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 16 | -152/+270 |
|\ \ | |/ | |||||
| * | Revert "Another stab at mantis #5256" | Diva Canto | 2010-12-10 | 2 | -32/+25 |
| | | | | | | | | This reverts commit ccb4f958c0dbb2daad4249a6b97d1c0b008b6a47. | ||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-12-10 | 11 | -146/+245 |
| |\ | |||||
| | * | Remove the restriction that you have to be logged in when loading/saving iars | Justin Clark-Casey (justincc) | 2010-12-11 | 2 | -72/+70 |
| | | | | | | | | | | | | This is pointless as we're supplying the password on the command line | ||||
| | * | If we're saving an IAR with --profile information, then label this a version ↵ | Justin Clark-Casey (justincc) | 2010-12-11 | 1 | -5/+22 |
| | | | | | | | | | | | | 1.0 IAR since it isn't compatible with older OpenSim releases. | ||||
| | * | Drop current OAR version back to 0.5 since these are currently now ↵ | Justin Clark-Casey (justincc) | 2010-12-11 | 4 | -38/+38 |
| | | | | | | | | | | | | | | | | | | compatible with older OpenSim versions again. Removed ability to choose 0.4 to avoid having to write code that polices this properly. Please shout on the ml if you really need this. | ||||
| | * | Normalization of OSSL function names. | Marck | 2010-12-10 | 4 | -31/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added the following replacement functions for compliance to the OSSL standards stated on the wiki: osGetTerrainHeight osSetTerrainHeight osGetSunParam osSetSunParam osSetPenColor The functions that do not comply to the standard give a warning when used but work normally otherwise. The graphics primitive drawing command "PenColor" has also been added as well as dynamic texture parameter "bgcolor" as an alternative to "bgcolour". The following two functions have been renamed because they are not enabled yet aynway: osWindParamSet => osSetWindParam osWindParamGet => osGetWindParam | ||||
| * | | 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 | 3 | -3/+3 |
| |\ | |||||
| | * | 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 | 2 | -2/+2 |
| | | | |||||
| * | | 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 | 1 | -1/+1 |
| | | | | | | | | command. mantis #5259 | ||||
| * | 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 | 2 | -43/+203 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-12-09 | 1 | -42/+202 |
| |\ | |||||
| | * | Added ability for GetTexture to serve multiple formats. The format may come ↵ | Diva Canto | 2010-12-08 | 1 | -42/+202 |
| | | | | | | | | | | | | 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 | 3 | -0/+45 |
| |/ | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| * | 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 | 3 | -0/+45 |
| | | | | | | | | 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 |
| | | |||||
* | | Add the interface needed to revive calling cards | Melanie | 2010-12-07 | 1 | -0/+13 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-12-07 | 8 | -54/+32 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 8 | -54/+32 |
| |\ \ | | |/ | |||||
| | * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 4 | -10/+9 |
| | | | | | | | | | | | | 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 | 45 | -701/+1456 |
| | |\ | |||||
| | | * | 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 | 10 | -93/+283 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 38 | -967/+1199 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 12 | -59/+116 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * \ \ \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 14 | -84/+158 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-31 | 1 | -2/+2 |
| | |\ \ \ \ \ \ |