| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 1 | -0/+262 |
| |\ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs | ||||
| | * | Convert SimianMaptile refresh time from ms to seconds. Too many 0's | Mic Bowman | 2011-02-04 | 1 | -11/+12 |
| | | | | | | | | | in the config file. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 4 | -23/+22 |
| |\ \ | |/ | |||||
| | * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 1 | -2/+2 |
| | | | |||||
| | * | Reduce amount of debug lopgging put out by some simiangrid connectors. ↵ | Justin Clark-Casey (justincc) | 2011-01-18 | 4 | -21/+20 |
| | | | | | | | | | Please re-enable if needed. | ||||
| | * | Moved the map tile processing used by the Simian Grid | Mic Bowman | 2011-01-08 | 2 | -86/+261 |
| | | | | | | | | | | | | | Frontend into a separate region module. Configuration settings added to the defaults ini file. Others may find this useful for pushing map tiles to a separate server. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 2 | -4/+2 |
| |\ \ | |/ | |||||
| | * | comment out a couple simian debug messages | Mic Bowman | 2011-01-05 | 2 | -4/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-30 | 1 | -68/+50 |
| |\ \ | |/ | |||||
| | * | Update SimianGridServicesConnector to work more like | Mic Bowman | 2010-12-27 | 1 | -68/+50 |
| | | | | | | | | | | | a connector so we can take advantage of the logic in RemoteGridServicesConnector. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -3/+1 |
| |\ \ | |/ | |||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -0/+2 |
| | |\ | |||||
| | * \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -3/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -26/+27 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs | ||||
| | * \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -1/+81 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 1 | -0/+2 |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| | * | | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵ | Diva Canto | 2010-11-21 | 1 | -0/+2 |
| | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | 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). | ||||
| * | | | | | 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-02 | 1 | -26/+27 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | 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 | 1 | -1/+81 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 1 | -1/+81 |
| | |\ \ \ | |||||
| | | * \ \ | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵ | Melanie | 2010-10-21 | 1 | -1/+81 |
| | | |\ \ \ | | | | |/ | | | |/| | | | | | | dev-appearance | ||||
| | | | * | | Major refactoring of appearance handling. | Master ScienceSim | 2010-10-20 | 1 | -1/+81 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+3 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Revert "Merge remote branch 'otakup0pe/mantis5110'" | Justin Clark-Casey (justincc) | 2010-10-22 | 1 | -1/+3 |
| | | |_|/ | |/| | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c. | ||||
| | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-05 | 1 | -3/+3 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Merge branch 'master' of git://opensimulator.org/git/opensim | Jonathan Freedman | 2010-10-03 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-02 | 1 | -3/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-21 | 1 | -3/+1 |
| |\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| | * | | | | * refactor refactor refactor ServerURI 4 lyfe | Jonathan Freedman | 2010-10-20 | 1 | -3/+1 |
| | | |_|/ | |/| | | |||||
| | * | | | 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 |
| |\ \ \ | |/ / | |||||
| | * | | Initial port of the Warp3D map tile renderer | Melanie | 2010-10-03 | 1 | -1/+1 |
| | |/ | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-02 | 1 | -5/+33 |
| |\ \ | |/ | |||||
| | * | couple fixes to enable profiles in simian connector | Master ScienceSim | 2010-09-30 | 1 | -5/+33 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-30 | 2 | -16/+12 |
| |\ \ | |/ | |||||
| | * | Actually log users out (call LogoutAgent) in the ↵ | John Hurliman | 2010-09-29 | 1 | -0/+6 |
| | | | | | | | | | SimianPresenceServiceConnector when LoggedOut() is called | ||||
| | * | Part two of the previous commit, making IGridUserService.LoggedOut() more ↵ | John Hurliman | 2010-09-29 | 2 | -6/+2 |
| | | | | | | | | | flexible without changing current behavior | ||||
| | * | Made IGridUserService.SetLastPosition() more flexible to allow different ↵ | John Hurliman | 2010-09-29 | 2 | -10/+4 |
| | | | | | | | | | possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now | ||||
| | * | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 1 | -2/+2 |
| | | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
| * | | Revert "* Changed 11 calls for session info to the more optimized API method" | root | 2010-09-17 | 1 | -2/+2 |
| | | | | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-09-13 | 8 | -74/+66 |
| |\ \ | |/ | | | | | | | The modules will need to be updated for this to compile and run again. Please don't use until I do the companion commit to modules later on. | ||||
| | * | First pass at cleaning up thread safety in EntityManager and SceneGraph | John Hurliman | 2010-09-10 | 1 | -1/+4 |
| | | | |||||
| | * | * Run SimianGrid session updates asynchronously instead of from the main ↵ | John Hurliman | 2010-09-09 | 6 | -66/+5 |
| | | | | | | | | | | | | | heartbeat thread * Minor dead code cleanup | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-09-08 | 2 | -0/+10 |
| | |\ | |||||
| | | * | Added constructor that takes an URL to asset and inventory simian connectors. | Diva Canto | 2010-09-08 | 2 | -0/+10 |
| | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |