| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | 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 | |
| | | | | | | | | | from the sim. | |||||
| | * | Call the cleanup after saving attachment states, so that the attachments | Melanie | 2010-11-08 | 1 | -1/+3 | |
| | | | | | | | | | don't get killed before they can be saved | |||||
| | * | Call the Cleanup when an agent logs out, when an agent leaves and just | Melanie | 2010-11-08 | 1 | -0/+3 | |
| | | | | | | | | | | | before an agent logs in directly. Intentionally not calling this from MakeRoot as that would mess up attachment transfer in teleport | |||||
| | * | Add a method to delete left over / dropped attachments | Melanie Thielker | 2010-11-08 | 1 | -0/+32 | |
| | | | ||||||
| * | | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 5 | -32/+54 | |
| |\ \ | |/ | ||||||
| | * | Fix playing sound from HUDs | Melanie | 2010-11-05 | 1 | -0/+1 | |
| | | | ||||||
| | * | Add lsClearWindlightScene() to the lightshare module to remove WL settings | Melanie | 2010-11-03 | 2 | -0/+2 | |
| | | | | | | | | | from a region and allow normal day cycles to be reestablished | |||||
| | * | 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 | |
| | | | ||||||
| | * | Fix avatar height management | Melanie | 2010-11-02 | 1 | -24/+11 | |
| | | | ||||||
| | * | 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. | |||||
| * | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -11/+11 | |
| |\ \ | |/ | ||||||
| | * | 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. | |||||
| * | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -10/+16 | |
| |\ \ | |/ | ||||||
| | * | 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 mantis5110 | Jonathan Freedman | 2010-10-29 | 3 | -20/+92 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 3 | -23/+96 | |
| | |\ \ | ||||||
| | | * | | Clean up some cruft from the last commit. Re-add the initial update | Master ScienceSim | 2010-10-29 | 2 | -2/+41 | |
| | | | | | | | | | | | | | | | | | | | | | 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 'dev-appearance' | Melanie | 2010-10-29 | 3 | -159/+48 | |
| | |\ \ \ | | |_|/ | |/| | | ||||||
| | | * | | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 3 | -160/+50 | |
| | | |\ \ | | | | | | | | | | | | | | | | dev-appearance | |||||
| | | * | | | Make SImStatsReporter pick ObjectCapacity striaght out of region info | Melanie | 2010-10-21 | 2 | -9/+3 | |
| | | | | | | ||||||
| | | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The last 4 commits are a patch from otakup0pe that's supposed to make URLs better somehow in an effort to make it easier to do hypergrid (I think).. But as it seems that I'm the only one who was able to apply the patch.. and I looked it over and it doesn't look like it breaks anything via the diffs.. I'll sign off on it. Signed-off-by: Teravus Ovares (Dan Olivares) <teravus@gmail.com> | |||||
| * | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 6 | -177/+86 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 5 | -25/+88 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | 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 | |||||
| | * | | | | 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. | |||||
| | * | | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 3 | -159/+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 mantis5110 | Jonathan Freedman | 2010-10-24 | 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. | |||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -3/+3 | |
| | |\ \ | |/ / |/| | | ||||||
| | * | | 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. | |||||
| * | | | 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 '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 | |
| |/ | ||||||
| * | It looks like Vector3s also got written down in lower case at some point in ↵ | Diva Canto | 2010-10-19 | 1 | -3/+3 | |
| | | | | | | | time. Added code to account for that. 17:45:59 - [SceneObjectSerializer]: exception while parsing SitTargetPosition: System.Xml.XmlException: Expecting X tag from namespace , got x and instead Line 1, position 2838. | |||||
| * | Another take related to the previous commit. | Diva Canto | 2010-10-19 | 1 | -13/+17 | |
| | | ||||||
| * | Added code to quaternion deserialization to try to cope with an exception ↵ | Diva Canto | 2010-10-19 | 1 | -4/+15 | |
| | | | | | | | seen in Wright Plaza related to SitTargetOrientation. 17:23:05 - [SceneObjectSerializer]: exception while parsing SitTargetOrientation: System.Xml.XmlException: Expecting X tag from namespace , got w and instead Line 1, position 30064. | |||||
| * | Added TextureAnimation and ParticleSystem to serialization. | Diva Canto | 2010-10-19 | 1 | -0/+27 | |
| | | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |