| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 3 | -37/+10 |
| |\ | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -10/+5 |
| | |\ | |||||
| | | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 5 | -39/+29 |
| | | |\ | |||||
| | | * | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -10/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It contains a major interface version bump and will NOT work with earlier grid services. This is preliminary work that will lead to layers support. Rest appearance services are commented out completely, they will have to be adapted by someone who actually uses them. Remote admin is working, but has no layers support. There is no layers support in the database. Login likely won't work. You have been warned. | ||||
| | * | | | minor: remove some old commented out code | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -22/+0 |
| | | |/ | |/| | |||||
| | * | | Change level of some logging messages, turning some info into arguably more ↵ | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -5/+6 |
| | | | | | | | | | | | | | appropriate debug to reduce console spam when log level is info | ||||
| * | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 4 | -34/+23 |
| |\ \ \ | |/ / | |||||
| | * | | Rationalize the logging messages from the merged appearance branch, ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 1 | -29/+18 |
| | | | | | | | | | | | | | commenting out most of them as per Mic | ||||
| | * | | Merge branch 'justincc-dev' | Justin Clark-Casey (justincc) | 2010-10-29 | 3 | -5/+5 |
| | |\ \ | | |/ | |/| | |||||
| | | * | for now, comment out some older or redundant log debug lines to make ↵ | Justin Clark-Casey (justincc) | 2010-10-29 | 3 | -5/+5 |
| | | | | | | | | | | | | | diagnostics easier | ||||
| * | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -43/+62 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 2 | -43/+62 |
| | | | | | | | | | | | | | | | | and avatar data are sent. And the number of times they are stored. | ||||
| * | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 8 | -144/+317 |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * | | Configuration of persistent baked textures and save/send delays. | Master ScienceSim | 2010-10-28 | 1 | -4/+14 |
| | | | | |||||
| | * | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 7 | -71/+111 |
| | |\ \ | | |/ | |||||
| | | * | Formatting cleanup. | Jeff Ames | 2010-10-27 | 5 | -50/+27 |
| | | | | |||||
| | | * | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 5 | -26/+50 |
| | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | | Added background thread to handle delayed send and save of appearance | Master ScienceSim | 2010-10-28 | 1 | -55/+164 |
| | | | | | | | | | | | | | | | | | | | | | | to accommodate batching of the many updates that happen on login and teleport. Fixed handling of the serial property in appearance. | ||||
| | * | | 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 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | 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. | ||||
| | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 3 | -95/+169 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | -1/+1 |
| |\ \ \ | | |/ | |/| | |||||
| | * | | Merge remote branch 'otakup0pe/mantis5110' | Justin Clark-Casey (justincc) | 2010-10-22 | 5 | -50/+26 |
| | |\ \ | |||||
| | * | | | Revert "* refactor refactor refactor ServerURI 4 lyfe" | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -8/+21 |
| | | | | | | | | | | | | | | | | | This reverts commit 55974df14b6d64c1e1f9e386a3eacce3ba86dc98. | ||||
| | * | | | Revert "* additional serveruri cleanup" | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | This reverts commit 19119d7705f8381a3c207d0e64a23243215a12b9. | ||||
| | * | | | Revert "* more url / hg cleanup" | Justin Clark-Casey (justincc) | 2010-10-22 | 2 | -12/+26 |
| | | | | | | | | | | | | | | | | | This reverts commit 58f75fa19d9aea18283ecdbd44559efb81781c9d. | ||||
| | * | | | 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 | 1 | -8/+36 |
| | | | | | |||||
| | * | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-20 | 2 | -26/+12 |
| | | | | | |||||
| | * | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 2 | -4/+4 |
| | | | | | |||||
| | * | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 2 | -21/+8 |
| | | |/ | |/| | |||||
| * | | | * throw debug message when no HomeURI is set | Jonathan Freedman | 2010-10-24 | 1 | -0/+2 |
| | |/ |/| | |||||
| * | | Merge branch 'hg16' into mantis5110 | Jonathan Freedman | 2010-10-22 | 5 | -50/+26 |
| |\ \ | |||||
| | * | | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 2 | -5/+8 |
| | | | | |||||
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 2 | -19/+67 |
| | |\ \ | | |/ | |||||
| | * | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -0/+329 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-18 | 1 | -3/+3 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-17 | 10 | -60/+609 |
| | |\ \ \ \ | |||||
| | * | | | | | * more url / hg cleanup | Jonathan Freedman | 2010-10-11 | 2 | -26/+12 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-10 | 2 | -3/+14 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-07 | 4 | -27/+80 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 2 | -3/+18 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 7 | -16/+35 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 11 | -68/+1448 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 2 | -4/+4 |
| | | | | | | | | | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |