Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-08 | 1 | -7/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Reinstate a lost fix | Melanie | 2010-11-08 | 1 | -2/+1 | |
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-08 | 1 | -0/+7 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | ||||||
| * | | | | | | | | Fix merge artefacts | Melanie | 2010-11-08 | 1 | -14/+19 | |
| * | | | | | | | | Prevent plants from being treated like dropped attachments and removed | Melanie | 2010-11-08 | 1 | -2/+1 | |
| * | | | | | | | | Call the cleanup after saving attachment states, so that the attachments | Melanie | 2010-11-08 | 1 | -1/+3 | |
| * | | | | | | | | Call the Cleanup when an agent logs out, when an agent leaves and just | Melanie | 2010-11-08 | 1 | -0/+3 | |
| * | | | | | | | | Add a method to delete left over / dropped attachments | Melanie Thielker | 2010-11-08 | 1 | -0/+32 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
| * | | | | | | | Fix playing sound from HUDs | Melanie | 2010-11-05 | 1 | -0/+1 | |
* | | | | | | | | Fix merge artefacts | Melanie | 2010-11-05 | 1 | -55/+18 | |
* | | | | | | | | Revert "Fix for hanging on "Connecting to region".. caused by packets being p... | Melanie | 2010-11-05 | 1 | -26/+58 | |
* | | | | | | | | Fix child prims returning after being unlinked and deleted where the root is | Melanie | 2010-11-04 | 1 | -0/+5 | |
* | | | | | | | | Fix creation of a duplicate physics actor on chained drag-copy operations, | Melanie | 2010-11-04 | 1 | -17/+0 | |
* | | | | | | | | Fix playing sound from HUDs | Melanie | 2010-11-03 | 1 | -8/+0 | |
* | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 1 | -0/+9 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Actually calculate the height before setting it, this isn't done automatically | Melanie | 2010-11-03 | 1 | -1/+7 | |
| * | | | | | | | Trying to prevent a wrong physical actor size | Melanie | 2010-11-03 | 1 | -0/+3 | |
* | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 1 | -4/+1 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Fix avatar height management | Melanie | 2010-11-02 | 1 | -24/+11 | |
* | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 2 | -51/+67 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | ||||||
| * | | | | | | | Fix sitting and standing up | Melanie | 2010-11-02 | 1 | -5/+14 | |
| * | | | | | | | Old deserialization can't deal with commas in flag fields. Making use of -ver... | Diva Canto | 2010-11-02 | 1 | -3/+17 | |
| | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Move physics actor creation to after SetHeight to try and prevent | Melanie | 2010-10-30 | 1 | -11/+11 | |
| | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | tweak a few more scene presence logging messages for consistency | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -3/+3 | |
| * | | | | | Rationalize the logging messages from the merged appearance branch, commentin... | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -5/+5 | |
| * | | | | | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -3/+9 | |
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | add timing report to CompleteScenePresence for diagnostic purposes | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -1/+8 | |
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 2 | -23/+57 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 2 | -23/+57 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Clean up some cruft from the last commit. Re-add the initial update | Master ScienceSim | 2010-10-29 | 1 | -2/+2 | |
| | * | | | | | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 2 | -20/+53 | |
| | | |_|_|/ | | |/| | | | ||||||
| | * | | | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 5 | -25/+88 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | * | | | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 1 | -4/+5 | |
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 2 | -130/+48 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 2 | -121/+48 | |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | ||||||
| | * | | | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-a... | Melanie | 2010-10-21 | 2 | -122/+50 | |
| | |\ \ \ \ | | | |/ / / | ||||||
| | | * | | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 2 | -121/+49 | |
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-27 | 4 | -14/+35 | |
|\ \ \ \ \ \ | |/ / / / / | ||||||
| * | | | | | Prevent nullrefs in scene object deletion. Mantis #5156 | Melanie | 2010-10-27 | 1 | -1/+4 | |
| * | | | | | Merge branch 'master' of ssh://MyConnection01/var/git/opensim | dahlia | 2010-10-26 | 2 | -4/+4 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 2 | -4/+4 | |
| | | |_|_|/ | | |/| | | | ||||||
| * | | | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region specif... | dahlia | 2010-10-26 | 1 | -9/+27 | |
| |/ / / / | ||||||
* | | | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va... | Melanie | 2010-10-25 | 1 | -16/+22 | |
|\ \ \ \ \ | ||||||
| * | | | | | Comment repeated add and remove of avatars from the physical scene. It's no | Melanie | 2010-10-25 | 1 | -16/+22 | |
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-25 | 1 | -3/+16 | |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | ||||||
| * | | | | Added inner exception handling in Shape deserialization processing, so that t... | Diva Canto | 2010-10-23 | 1 | -3/+16 | |
* | | | | | Change the results from llGetPrimitiveParams to be the same as SL for | Melanie | 2010-10-24 | 1 | -1/+1 | |
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-23 | 2 | -2/+35 | |
|\ \ \ \ \ | |/ / / / | ||||||
| * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 | |
| |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | * | | | Change some exception to use ToString(). e.Message is not sufficient to fix | Melanie | 2010-10-22 | 1 | -3/+3 |