aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-0613-150/+154
|\ \ | |/
| * Fixed some inconsistency with trailing /. Made debug messages consistent. ↵Diva Canto2010-12-055-23/+29
| | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB.
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-056-42/+354
| |\
| * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-231-1/+8
| |\ \
| * \ \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-219-16/+538
| |\ \ \
| * \ \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-211-3/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-053-1/+45
| |\ \ \ \ \
| * | | | | | * better semantics for link-region commandJonathan Freedman2010-10-301-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * actually parse name for new link-region command
| * | | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-301-28/+80
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-304-112/+153
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-1/+1
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-23/+29
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-295-24/+142
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | | | | | | | | * a bit of additional debugging:Jonathan Freedman2010-10-232-8/+6
| | | | | | | | | | | |
* | | | | | | | | | | | Add a missing interface memeber to the new HG stuffMelanie2010-12-031-0/+5
| | | | | | | | | | | |
* | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-035-41/+352
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found
| * | | | | | | | | | | Added some comments. Better than listening to the boring speaker...Diva Canto2010-12-012-0/+12
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-291-1/+2
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Make gatekeeper's address check case-insensitive.Marck2010-11-271-1/+2
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | |
| * | | | | | | | | | | Preservation of creator information now also working in IARs. Cleaned up ↵Diva Canto2010-11-292-42/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function.
| * | | | | | | | | | | Creator information preserved upon HG transfers.Diva Canto2010-11-261-1/+0
| | | | | | | | | | | |
| * | | | | | | | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵Diva Canto2010-11-254-41/+276
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | | | | Fix some crashes caused by the addition of the CreatorData columnMelanie2010-11-231-1/+8
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Make gatekeeper's address check case-insensitive.Marck2010-11-281-1/+2
| | | | | | | | | |
* | | | | | | | | | Add the ability for gods to impersonate users. For this, bit 6 needs to beMelanie2010-11-258-8/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 columnMelanie2010-11-221-1/+8
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-223-2/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-11-223-2/+7
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-214-4/+499
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-213-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 ↵Melanie2010-11-221-2/+3
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | why standalone should not.
* | | | | | | | | | | Fox the buglets in Freeswitch. Grid mode works now and there is no reason ↵Melanie2010-11-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | why standalone should not.
* | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-212-0/+19
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Add the remote connector for freeswitch config retrievalMelanie2010-11-211-0/+103
| | | | | | | | | | |
| * | | | | | | | | | Remove username and password from the publicly accessible FS configMelanie2010-11-211-3/+1
| | | | | | | | | | |
| * | | | | | | | | | Implement a method to allow regions to query the gridwide FreeswitchMelanie2010-11-212-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration from ROBUST
| * | | | | | | | | | Move Dialplan and Directory from the region module to the ROBUST serverMelanie2010-11-211-4/+333
| | | | | | | | | | |
| * | | | | | | | | | Start implementing Freeswitch in ROBUSTMelanie2010-11-213-4/+48
| |/ / / / / / / / /
* | | | | | | | | | Add the remote connector for freeswitch config retrievalMelanie2010-11-211-0/+103
| | | | | | | | | |
* | | | | | | | | | Move Dialplan and Directory from the region module to the ROBUST serverMelanie2010-11-211-4/+333
| | | | | | | | | |
* | | | | | | | | | Start implementing Freeswitch in ROBUSTMelanie2010-11-213-4/+48
| | | | | | | | | |
* | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-171-10/+30
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-11-171-0/+1
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-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.
| * | | | | | | | | Do not include hyperlinks in a random region search during a login.Marck2010-11-131-10/+30
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Before a random region is chosen, available fallback regions are used for the login.
* | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-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-refactorMelanie2010-11-091-3/+3
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Formatting cleanup.Jeff Ames2010-11-081-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-051-0/+13
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Delete existing presences for a user ID when they log in again.Melanie2010-11-051-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WARNING!!! This changes a default. The old default is to allow multiple presences, the new default disables this. As the feature currently has no users, this should not present any difficulty and will alleviate the presence issues somewhat.