| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 9 | -70/+64 |
| |\ | |||||
| | * | 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 | 4 | -57/+39 |
| | | | | | | | | | commenting out most of them as per Mic | ||||
| | * | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 2010-10-29 | 6 | -11/+23 |
| | |\ | |||||
| | | * | add timing report to CompleteScenePresence for diagnostic purposes | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -1/+8 |
| | | | | |||||
| | | * | for now, comment out some older or redundant log debug lines to make ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 4 | -6/+6 |
| | | | | | | | | | | | | | diagnostics easier | ||||
| | | * | Add number of ms it takes to complete UseCircuitCode packet handling to log ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -2/+8 |
| | | | | | | | | | | | | | for diagnostics | ||||
| * | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 9 | -82/+304 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Rename the new default texture to be consistent with the others | Melanie | 2010-10-29 | 2 | -1/+1 |
| | | | | |||||
| | * | | Add a default alpha layer | Melanie | 2010-10-29 | 1 | -0/+0 |
| | | | | |||||
| | * | | Merge commit 'cmickeyb/dev-appearance' | Melanie | 2010-10-29 | 14 | -303/+567 |
| | |\ \ | |||||
| | | * | | 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 | 3 | -1/+133 |
| | | | | | |||||
| | * | | | 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 | 4 | -235/+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 | 4 | -261/+235 |
| | | |_|_|/ | |/| | | | |||||
| * | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -23/+30 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs | ||||
| | * | | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵ | Marck | 2010-10-28 | 2 | -20/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linked regions. * Added check for already occupied region coordinates. * Optimized Check4096. | ||||
| * | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 42 | -934/+1275 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | | | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 3 | -5/+41 |
| | | | | | | |||||
| | * | | | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 28 | -130/+273 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | 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' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 3 | -4/+7 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -17/+62 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -3/+3 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -13/+17 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -4/+15 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-19 | 1 | -0/+27 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -48/+76 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -0/+301 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 2 | -3/+4 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 3 | -14/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of /var/git/opensim/ | opensim mirror account | 2010-10-18 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |