| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 13 | -303/+553 | |
| | |\ \ | ||||||
| | | * | | 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 | 5 | -81/+132 | |
| | | | | | | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored. | |||||
| | * | | | Add my work on top of cmickeyb's | Melanie | 2010-10-29 | 1 | -1/+99 | |
| | | | | | ||||||
| | * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 28 | -779/+954 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 28 | -780/+956 | |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | dev-appearance | |||||
| | * | | | | | Revert "Preliminary work on appearance layers. No user functionality yet." | Melanie | 2010-10-29 | 2 | -201/+261 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This work conflicts with cmickeyb's more extensive, related work This reverts commit 9c829c0410da89fdbb873f706d7ba63cf26b088f. | |||||
| | * | | | | | Preliminary work on appearance layers. No user functionality yet. | Melanie | 2010-10-29 | 2 | -261/+201 | |
| | | |_|_|/ | |/| | | | ||||||
| * | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -23/+29 | |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs | |||||
| | * | | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵ | Marck | 2010-10-28 | 1 | -20/+27 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linked regions. * Added check for already occupied region coordinates. * Optimized Check4096. | |||||
| * | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 41 | -934/+1261 | |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| | * | | | | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 2 | -5/+27 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 21 | -120/+261 | |
| | |\ \ \ \ | | |/ / / | ||||||
| | | * | | | Formatting cleanup. | Jeff Ames | 2010-10-28 | 2 | -2/+1 | |
| | | | | | | ||||||
| | | * | | | 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 | 9 | -63/+37 | |
| | | |\ \ \ | ||||||
| | | | * | | | Formatting cleanup. | Jeff Ames | 2010-10-27 | 9 | -63/+37 | |
| | | | | | | | ||||||
| | | * | | | | Overload Scene.NewUserConnection() to facilitate NPCs and other region ↵ | dahlia | 2010-10-26 | 1 | -9/+27 | |
| | | |/ / / | | | | | | | | | | | | | | | | specific applications | |||||
| | * | | | | Added background thread to handle delayed send and save of appearance | Master ScienceSim | 2010-10-28 | 2 | -59/+171 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance. | |||||
| | * | | | | Small cleanup and add more debugging information | Master ScienceSim | 2010-10-26 | 2 | -8/+23 | |
| | | | | | | ||||||
| | * | | | | Made the check for texture assets asynchronous. This is one part of | Master ScienceSim | 2010-10-26 | 1 | -7/+10 | |
| | | | | | | | | | | | | | | | | | | | | | a bigger clean up that needs to happen around locks on appearance. | |||||
| | * | | | | Half of the compatibility is working. Login into a new region with | Master ScienceSim | 2010-10-25 | 4 | -21/+29 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | old data works. Teleport out of a new region with old data works. Teleport into a new region with old data does not trigger the necessary rebake. | |||||
| | * | | | | Intermediate commit for backward compatability; does not compile yet | Mic Bowman | 2010-10-25 | 2 | -62/+73 | |
| | | | | | | ||||||
| | * | | | | First attempt to get multiple attachments working to support viewer2. | Master ScienceSim | 2010-10-21 | 6 | -111/+100 | |
| | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 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 | 28 | -779/+955 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-25 | 1 | -2/+2 | |
| |\ \ \ \ | | |/ / | |/| | | ||||||
| | * | | | * Updated libomv to r3461 | Latif Khalifa | 2010-10-24 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | Main reason for upgrade is to revert API change that was introduced in order to support headerless binary LLSD decoding needed for deserialization of the mesh assets, which turned out to be unnecessary as we can transparently decode both kinds. | |||||
| * | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-24 | 3 | -3/+46 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Add PRIM_NAME, PRIM_DESC and PRIM_ROT_LOCAL | Melanie | 2010-10-24 | 2 | -0/+30 | |
| | | | | | ||||||
| | * | | | 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 | 25 | -214/+193 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | |||||
| * | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-24 | 3 | -5/+5 | |
| |\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | | 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 remote branch 'otakup0pe/mantis5110' | Justin Clark-Casey (justincc) | 2010-10-22 | 25 | -193/+214 | |
| | |\ \ \ | ||||||
| | * | | | | Revert "* refactor refactor refactor ServerURI 4 lyfe" | Justin Clark-Casey (justincc) | 2010-10-22 | 14 | -72/+94 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98. | |||||
| | * | | | | Revert "* additional serveruri cleanup" | Justin Clark-Casey (justincc) | 2010-10-22 | 8 | -20/+54 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9. | |||||
| | * | | | | Revert "* more url / hg cleanup" | Justin Clark-Casey (justincc) | 2010-10-22 | 8 | -56/+45 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 58f75fa19d9aea18283ecdbd44559efb81781c9d. | |||||
| | * | | | | Revert "* remove some spurious debug info" | Justin Clark-Casey (justincc) | 2010-10-22 | 3 | -22/+20 | |
| | | | | | | | | | | | | | | | | | | | | | This reverts commit 017b83d0a3e3ac6a1c8bc86b9bef1ee47cba059e. | |||||
| | * | | | | Fix llParcelMediaCommandList() so that it applies commands only to the ↵ | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parcel that the script is in, not all parcels. Patch from http://opensimulator.org/mantis/view.php?id=2738 Thanks snoopy and fineman. | |||||
| | * | | | | Allow OARs and IARs to save and load meshes. | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Save and reload appears okay for the duck mesh at https://collada.org/owl/download.php?sess=0&parent=126&expand=1&order=name&curview=0&binary=1&id=698/ However, one attempt at trying to load a more complicated scene failed (errors on console, only triangles appearing in mesh viewer). Not sure if this is really and OAR load problem. Needs more investigation. | |||||
| | * | | | | print IAR version number on console when saving | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -2/+6 | |
| | | | | | | ||||||
| | * | | | | Implement guard against trying to load incompatible version IARs | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -3/+20 | |
| | | | | | | ||||||
| | * | | | | start parsing iar control file | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -2/+20 | |
| | | | | | | | | | | | | | | | | | | | | | This change requires a prebuild[.sh|.bat] since a System.Xml.Linq reference is added to prebuild.xml | |||||
| | * | | | | slightly simplify oar control file loading code | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -10/+3 | |
| | | | | | | ||||||
| | * | | | | write IAR control file first in the archive rather than last | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -5/+8 | |
| | | | | | | ||||||
| | * | | | | minor: add some text to the oar abort messages on assets timeout to make it ↵ | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | clear that the oar will not be usable | |||||
| | * | | | | Allow region modules to know which agents actually receive chat | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -8/+71 | |
| | | | | | | ||||||
| | * | | | | This fixes a delay in llSetLinkPrimitiveParamsFast | AdelleF | 2010-10-21 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: dahlia <dahliaTrimble@gmail.removeme.com> | |||||
| | * | | | | Deleted a verbose and unneeded log message. | Diva Canto | 2010-10-21 | 1 | -1/+1 | |
| | | |_|/ | |/| | | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |