aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-219-16/+538
|\
| * 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.
| * | 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
| |/
| * 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.
* | Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-211-3/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Formatting cleanup.Jeff Ames2010-11-081-3/+3
| |
* | Merge git://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-053-1/+45
|\ \ | |/
| * 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.
| * Add lsClearWindlightScene() to the lightshare module to remove WL settingsMelanie2010-11-031-0/+4
| | | | | | | | from a region and allow normal day cycles to be reestablished
| * Fix HypergridLinker.Check4096()Marck2010-11-011-1/+28
| | | | | | | | Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects.
* | * 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
|\ \ | |/
| * Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight.Diva Canto2010-10-301-0/+3
| |
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-301-28/+77
| | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2.
* | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-304-112/+153
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
| * This commit fixes all the appearance related null refs. Still can't log in,Melanie2010-10-302-56/+72
| | | | | | | | client displays a blank error box.
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-10-302-29/+29
| |\
| | * Change level of some logging messages, turning some info into arguably more ↵Justin Clark-Casey (justincc)2010-10-301-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.Melanie2010-10-302-80/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 mantis5110Jonathan Freedman2010-10-291-1/+1
|\ \ \ | | |/ | |/|
| * | Merge branch 'justincc-dev'Justin Clark-Casey (justincc)2010-10-291-1/+1
| |\ \ | | |/ | |/|
| | * for now, comment out some older or redundant log debug lines to make ↵Justin Clark-Casey (justincc)2010-10-291-1/+1
| | | | | | | | | | | | diagnostics easier
| * | Merge commit 'cmickeyb/dev-appearance'Melanie2010-10-291-11/+5
| |\ \
| * \ \ Merge branch 'dev-appearance'Melanie2010-10-295-13/+137
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into ↵Melanie2010-10-215-13/+137
| | |\ \ | | | | | | | | | | | | | | | dev-appearance
| | * | | * remove some spurious debug infoJonathan Freedman2010-10-201-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>
| | * | | * more url / hg cleanupJonathan Freedman2010-10-203-15/+13
| | | | |
| | * | | * additional serveruri cleanupJonathan Freedman2010-10-205-49/+15
| | | | |
| | * | | * refactor refactor refactor ServerURI 4 lyfeJonathan Freedman2010-10-209-66/+51
| | | | |
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-23/+29
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs
| * | | | HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with ↵Marck2010-10-281-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | linked regions. * Added check for already occupied region coordinates. * Optimized Check4096.
| * | | | Revert "Merge remote branch 'otakup0pe/mantis5110'"Justin Clark-Casey (justincc)2010-10-2212-132/+131
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 21187f459ea2ae590dda4249fa15ebf116d04fe0, reversing changes made to 8f34e46d7449be1c29419a232a8f7f1e5918f03c.
* | | | | Merge branch 'master' into mantis5110Jonathan Freedman2010-10-295-24/+142
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | First attempt to get multiple attachments working to support viewer2.Master ScienceSim2010-10-211-11/+5
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | The attachment code appears to work correctly for 1.23 viewers so, in spite of some big changes in the internal representation, there don't appear to be regressions. That being said, I still can't get a viewer2 avatar to show correctly.
| * | | Major refactoring of appearance handling.Master ScienceSim2010-10-205-13/+137
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | * a bit of additional debugging:Jonathan Freedman2010-10-232-8/+6
| |/ |/|
* | * change the data exchanged within hypergrid transactionsJonathan Freedman2010-10-214-34/+86
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-201-1/+1
|\ \ | |/
| * Deleted verbose debug messages that are bringing sims to an halt. Increased ↵Diva Canto2010-10-191-1/+1
| | | | | | | | the user cache expiration period to 33 hours.
* | * remove some spurious debug infoJonathan Freedman2010-10-201-15/+15
| |
* | Merge branch 'master' of git://opensimulator.org/git/opensimJonathan Freedman2010-10-181-1/+1
|\ \ | |/
generated by cgit v1.1 at 2024-11-06 11:47:39 +0000