| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Fix merge artefacts | Melanie | 2010-11-05 | 1 | -55/+18 | |
| | | | ||||||
| * | | Revert "Fix for hanging on "Connecting to region".. caused by packets being ↵ | Melanie | 2010-11-05 | 1 | -26/+58 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready." This reverts commit 91b1d17e5bd3ff6ed006744bc529b53a67af1a64. Conflicts: OpenSim/Client/Sirikata/ClientStack/SirikataClientView.cs OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | Fix child prims returning after being unlinked and deleted where the root is | Melanie | 2010-11-04 | 1 | -0/+5 | |
| | | | | | | | | | not deleted | |||||
| * | | Fix creation of a duplicate physics actor on chained drag-copy operations, | Melanie | 2010-11-04 | 1 | -17/+0 | |
| | | | | | | | | | the main cause for "ghost prims" | |||||
| * | | 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 | |
| | | | | | | | | | on incoming transfers in all cases. | |||||
| | * | 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 ↵ | Diva Canto | 2010-11-02 | 1 | -3/+17 | |
| | | | | | | | | | -version option on save oar command. Bumped archives version to 0.5; version < 0.5 generates flag fields without commas. Everything else is identical. | |||||
| | * | Move physics actor creation to after SetHeight to try and prevent | Melanie | 2010-10-30 | 1 | -11/+11 | |
| | | | | | | | | | bowlegginess. Didn't work but is better this way anyway. | |||||
| | * | 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, ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -5/+5 | |
| | | | | | | | | | commenting out most of them as per Mic | |||||
| | * | 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 | |
| | | | | | | | | | | | | | | | | | | | | | send in the scene presence constructor... need to figure this out later. | |||||
| | | * | | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 2 | -20/+53 | |
| | | | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored. | |||||
| | | * | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly. | |||||
| * | | | | 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 ↵ | Melanie | 2010-10-21 | 2 | -122/+50 | |
| | | |\ \ | | | |/ | | | | | | | | | dev-appearance | |||||
| | | | * | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 2 | -121/+49 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AvatarService -- add two new methods, GetAppearance and SetAppearance to get around the lossy encoding in AvatarData. Preseve the old functions to avoid changing the behavior for ROBUST services. AvatarAppearance -- major refactor, moved the various encoding methods used by AgentCircuitData, ClientAgentUpdate and ScenePresence into one location. Changed initialization. AvatarAttachments -- added a class specifically to handle attachments in preparation for additional functionality that will be needed for viewer 2. AvatarFactory -- removed a number of unused or methods duplicated in other locations. Moved in all appearance event handling from ScenePresence. Required a change to IClientAPI that propogated throughout all the IClientAPI implementations. | |||||
| * | | | | 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 ↵ | dahlia | 2010-10-26 | 1 | -9/+27 | |
| | |/ / / | | | | | | | | | | | | | specific applications | |||||
| * | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-10-25 | 1 | -16/+22 | |
| |\ \ \ \ | | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| | * | | | | Comment repeated add and remove of avatars from the physical scene. It's no | Melanie | 2010-10-25 | 1 | -16/+22 | |
| | | | | | | | | | | | | | | | | | | | | | longer needed. | |||||
| * | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-25 | 1 | -3/+16 | |
| |\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||||
| | * | | | Added inner exception handling in Shape deserialization processing, so that ↵ | Diva Canto | 2010-10-23 | 1 | -3/+16 | |
| | | | | | | | | | | | | | | | | | the whole Shape processing returns a valid Shape object. | |||||
| * | | | | Change the results from llGetPrimitiveParams to be the same as SL for | Melanie | 2010-10-24 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | the prim position. This will make attached resizer scripts work like SL. Existing resizers may be affected adversely. | |||||
| * | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | errors. Please don't use e.Message, devs NEED to see the dumps! | |||||
| | * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -7/+2 | |
| | |/ / / | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | |||||
| | * | | | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 2 | -2/+7 | |
| | |\ \ \ | ||||||
| | | * | | | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 2 | -2/+5 | |
| | | | | | | ||||||
| | | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 | |
| | | | |/ | | |/| | ||||||
| | * | | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -0/+35 | |
| | | | | | ||||||
| | * | | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-22 | 2 | -9/+3 | |
| | |/ / | ||||||
| * | | | Change some exception to use ToString(). e.Message is not sufficient to fix | Melanie | 2010-10-22 | 1 | -3/+3 | |
| | | | | | | | | | | | | | errors. Please don't use e.Message, devs NEED to see the dumps! | |||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 2 | -9/+3 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-21 | 2 | -9/+3 | |
| | | | | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |