Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -1/+1 |
|\ | |||||
| * | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+11 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| * | change doc. trivial commit to get panda to rebuild | Justin Clark-Casey (justincc) | 2010-12-08 | 1 | -1/+1 |
| | | |||||
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+11 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -3/+2 |
| | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
| * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 1 | -68/+16 |
| |\ | |||||
| * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -33/+7 |
| |\ \ | |||||
| * \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -2/+47 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| * \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -0/+7 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -16/+27 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
* | | | | | | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ↵ | Melanie | 2010-12-03 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to another region."" This reverts commit 6c01ebb87541ecf66d678606bb97d996bee51953. | ||||
* | | | | | | | Improve health reporting | Melanie | 2010-12-03 | 1 | -10/+18 |
| | | | | | | | |||||
* | | | | | | | Fix health reporting. This will now actually monitor the threads properly | Melanie | 2010-12-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | and not just the http server. It will also restart a dead heartbeat. | ||||
* | | | | | | | Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to ↵ | Melanie | 2010-12-03 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another region." This reverts commit 2827deffe822378b6cb35dac6c90a21c3fbc0de7. Pulling out a bad core commit that broke attachment teleporting for us | ||||
* | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 1 | -4/+8 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found | ||||
| * | | | | | | Only force prim persistence before delete if the prim is the result of an ↵ | Justin Clark-Casey (justincc) | 2010-12-03 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unpersisted delink This considerably improves delete performance for objects with large linksets | ||||
| * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 1 | -9/+6 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-25 | 1 | -55/+2 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 1 | -0/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. | ||||
* | | | | | | | | Change the way sim health reporting reports sim startup | Melanie | 2010-12-03 | 1 | -6/+14 |
| | | | | | | | | |||||
* | | | | | | | | Implement health monitoring of the packet receiving and sending threads | Melanie | 2010-11-28 | 1 | -3/+36 |
| | | | | | | | | |||||
* | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -9/+6 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | Trigger changed event with CHANGED_TELEPORT when teleporting to another region. | Marck | 2010-11-26 | 1 | -9/+6 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-25 | 1 | -67/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Change all restarting to use the restart module. Remove hardcoded behavior | Melanie | 2010-11-25 | 1 | -55/+2 |
| |/ / / / / | |||||
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-22 | 1 | -32/+4 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Global creator information working on MySQL DB and on load/save OARs. ↵ | Diva Canto | 2010-11-21 | 1 | -32/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule. | ||||
* | | | | | | Send media and other parcel data to client on login. Makes streams visible | Melanie | 2010-11-18 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | right away and starts media. | ||||
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-16 | 1 | -0/+3 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -1/+3 |
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | | | Prevent teleporting to a region when the egent is banned in all parcels | Melanie | 2010-11-10 | 1 | -0/+7 |
| | | | | | |||||
| * | | | | Fix parcel bans to work only on the avatars they're supposed to work on ↵ | Melanie | 2010-11-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | instead of pushing all avatars, even the ones that are allowed. | ||||
* | | | | | Change the way attachments are persisted. Editing a worn attachment will now | Melanie | 2010-11-16 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* | | | | | Prevent teleporting to a region when the egent is banned in all parcels | Melanie | 2010-11-10 | 1 | -0/+7 |
| | | | | | |||||
* | | | | | Add option SeeIntoBannedRegion to allow band to act like SL, where you can | Melanie | 2010-11-09 | 1 | -1/+9 |
| | | | | | | | | | | | | | | | | | | | | see in but not enter. Defaults to false, so no change. | ||||
* | | | | | Fix parcel bans to work only on the avatars they're supposed to work on ↵ | Melanie | 2010-11-09 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | instead of pushing all avatars, even the ones that are allowed. | ||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-08 | 1 | -7/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Reinstate a lost fix | Melanie | 2010-11-08 | 1 | -2/+1 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-08 | 1 | -0/+7 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix merge artefacts | Melanie | 2010-11-08 | 1 | -14/+19 |
| | | | | | |||||
| * | | | | Prevent plants from being treated like dropped attachments and removed | Melanie | 2010-11-08 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | from the sim. | ||||
| * | | | | Call the cleanup after saving attachment states, so that the attachments | Melanie | 2010-11-08 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | don't get killed before they can be saved | ||||
| * | | | | Call the Cleanup when an agent logs out, when an agent leaves and just | Melanie | 2010-11-08 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | before an agent logs in directly. Intentionally not calling this from MakeRoot as that would mess up attachment transfer in teleport | ||||
| * | | | | Add a method to delete left over / dropped attachments | Melanie Thielker | 2010-11-08 | 1 | -0/+32 |
| | |_|/ | |/| | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -0/+7 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bunch of fixes that reduce the number of times appearance | Master ScienceSim | 2010-10-29 | 1 | -0/+7 |
| | |/ | |/| | | | | | | | | | | and avatar data are sent. And the number of times they are stored. | ||||
| * | | Merge branch 'opensim-master' into dev-appearance | Master ScienceSim | 2010-10-28 | 1 | -13/+29 |
| |\ \ | |||||
* | \ \ | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-10-29 | 1 | -7/+0 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'dev-appearance' | Melanie | 2010-10-29 | 1 | -7/+0 |
| |\ \ \ \ | | |_|/ / | |/| | | |