| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 1 | -1/+8 | |
| | |\ | ||||||
| | | * | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-23 | 1 | -1/+8 | |
| | | | | ||||||
| | * | | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 4 | -0/+110 | |
| | |\ \ | | |/ | ||||||
| | * | | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -3/+3 | |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * \ \ | Merge git://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-05 | 1 | -0/+4 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 2 | -52/+53 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | |||||
| | * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 2 | -1/+93 | |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to be | Melanie | 2010-11-25 | 2 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set in the target's UserFlags and the impersonator must have UserLevel 200 or above. The user can then log in using the target's name and their own password. | |||||
| * | | | | | | | Fix some crashes caused by the addition of the CreatorData column | Melanie | 2010-11-22 | 1 | -1/+8 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 2 | -0/+5 | |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||||
| | * | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-11-22 | 2 | -0/+5 | |
| | |\ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-21 | 1 | -0/+103 | |
| | | |\ \ \ \ \ \ | ||||||
| | | * | | | | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 2 | -0/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255). | |||||
| | * | | | | | | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason ↵ | Melanie | 2010-11-22 | 1 | -2/+3 | |
| | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | why standalone should not. | |||||
| | * | | | | | | | Add the remote connector for freeswitch config retrieval | Melanie | 2010-11-21 | 1 | -0/+103 | |
| | |/ / / / / / | ||||||
| | * | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+1 | |
| | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | |||||
| * | | | | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason ↵ | Melanie | 2010-11-22 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | why standalone should not. | |||||
| * | | | | | | Add the remote connector for freeswitch config retrieval | Melanie | 2010-11-21 | 1 | -0/+103 | |
| | | | | | | | ||||||
| * | | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -0/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching. | |||||
| * | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-09 | 1 | -3/+3 | |
| |\ \ \ \ \ \ | |/ / / / / | ||||||
| | * | | | | | Formatting cleanup. | Jeff Ames | 2010-11-08 | 1 | -3/+3 | |
| | | |_|_|/ | |/| | | | ||||||
| * | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-03 | 1 | -0/+4 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Add lsClearWindlightScene() to the lightshare module to remove WL settings | Melanie | 2010-11-03 | 1 | -0/+4 | |
| | | |_|/ | |/| | | | | | | | | | | from a region and allow normal day cycles to be reestablished | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-02 | 2 | -54/+55 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-10-30 | 1 | -28/+28 | |
| | |\ \ \ | ||||||
| | | * | | | Change level of some logging messages, turning some info into arguably more ↵ | Justin Clark-Casey (justincc) | 2010-10-30 | 1 | -28/+28 | |
| | | | | | | | | | | | | | | | | | | | | | appropriate debug to reduce console spam when log level is info | |||||
| | * | | | | READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE. | Melanie | 2010-10-30 | 1 | -26/+27 | |
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 2 | -1/+93 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 2 | -1/+93 | |
| | |\ \ \ | ||||||
| | | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 2 | -1/+93 | |
| | | |\ \ \ | | | | |/ | | | |/| | | | | | | dev-appearance | |||||
| | | | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 2 | -1/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-23 | 5 | -29/+70 | |
| |\ \ \ \ \ | |/ / / / | ||||||
| | * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 6 | -42/+74 | |
| | | |_|/ | |/| | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | |||||
| | * | | | * change the data exchanged within hypergrid transactions | Jonathan Freedman | 2010-10-21 | 2 | -14/+23 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-20 | 1 | -1/+1 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | * | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -15/+15 | |
| | | | | | ||||||
| | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 2 | -5/+9 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 | |
| | |\ \ \ \ | ||||||
| | * | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-03 | 2 | -17/+7 | |
| | | | | | | | ||||||
| | * | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 5 | -58/+27 | |
| | | | | | | | ||||||
| * | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 6 | -76/+31 | |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| | * | | | | | * remove some spurious debug info | Jonathan Freedman | 2010-10-20 | 1 | -15/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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> | |||||
| | * | | | | | * additional serveruri cleanup | Jonathan Freedman | 2010-10-20 | 2 | -17/+7 | |
| | | | | | | | ||||||
| | * | | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 5 | -58/+27 | |
| | | |_|_|/ | |/| | | | ||||||
| | * | | | | Deleted verbose debug messages that are bringing sims to an halt. Increased ↵ | Diva Canto | 2010-10-19 | 1 | -1/+1 | |
| | | |_|/ | |/| | | | | | | | | | | the user cache expiration period to 33 hours. | |||||
| * | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-04 | 1 | -2/+6 | |
| |\ \ \ \ | |/ / / | ||||||
| | * | | | Added viewer's channel, mac, and id0 to agent circuit data. Also moved ↵ | Diva Canto | 2010-10-03 | 1 | -2/+6 | |
| | | | | | | | | | | | | | | | | | client ip address to agent circuit data, so that it's always there. | |||||
| | * | | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 1 | -3/+3 | |
| | | |/ | |/| | ||||||
| * | | | Add linden prim renderer and update libOMV | Melanie | 2010-10-04 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-03 | 1 | -1/+1 | |
| |\ \ \ | |/ / | ||||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |