Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 7 | -32/+31 |
|\ | |||||
| * | minor: remove mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 4 | -11/+11 |
| | | |||||
| * | 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. | ||||
| * | Merge branch 'cmickeyb' | Mic Bowman | 2011-01-08 | 2 | -86/+261 |
| |\ | |||||
| | * | 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. | ||||
| * | | Canonicalize URL endings for the UserAgentServiceConnector. | Diva Canto | 2011-01-06 | 1 | -1/+5 |
| | | | |||||
| * | | HG map tile fetch: handle cached images appropriately. | Diva Canto | 2011-01-06 | 1 | -4/+12 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 4 | -479/+148 |
|\ \ | |/ | |||||
| * | comment out a couple simian debug messages | Mic Bowman | 2011-01-05 | 2 | -4/+2 |
| | | |||||
| * | removed the early return on agentupdates, this was debugging code | Mic Bowman | 2011-01-04 | 1 | -1/+1 |
| | | |||||
| * | Cleaned up debugging messages in the WebRequest handlers | Mic Bowman | 2011-01-03 | 2 | -8/+8 |
| | | |||||
| * | Merge branch 'master' into cmickeyb | Mic Bowman | 2011-01-03 | 2 | -3/+3 |
| |\ | |||||
| | * | Implement Scope ID lookup on GetLandData. Stacked regions were not handled | Melanie | 2011-01-03 | 2 | -3/+3 |
| | | | | | | | | | | | | properly | ||||
| * | | Standardize the way WebRequests are made in the SimulationServiceConnector. ↵ | Mic Bowman | 2010-12-29 | 2 | -469/+148 |
| |/ | | | | | | | | | | | Added debugging calls for tracking performance of web requests. | ||||
* | | Revise Materials properties; Fix Double-Click Autopilot; Allow non-script ↵ | Kitto Flora | 2011-01-04 | 1 | -1/+1 |
| | | | | | | | | sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message. | ||||
* | | Implement Scope ID lookup on GetLandData. Stacked regions were not handled | Melanie | 2010-12-31 | 2 | -3/+3 |
| | | | | | | | | properly | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-30 | 3 | -78/+60 |
|\ \ | |/ | |||||
| * | Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors ↵ | Diva Canto | 2010-12-29 | 1 | -1/+1 |
| | | | | | | | | were not getting notified. | ||||
| * | 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. | ||||
| * | No need for these methods to be virtual now. | Diva Canto | 2010-12-27 | 1 | -9/+9 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-14 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | More on mantis #5270 | Diva Canto | 2010-12-14 | 1 | -2/+3 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-13 | 1 | -15/+16 |
|\ \ | |/ | |||||
| * | Changed logging level for message about failure to retrieve a map image from ↵ | Marck | 2010-12-13 | 1 | -1/+1 |
| | | | | | | | | a linked region. | ||||
| * | Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink. | Marck | 2010-12-13 | 1 | -14/+15 |
| | | | | | | | | | | | | Configuration option AssetService in section [GridService] must be set to enable this functionality. Map tiles do currently not show for hyperlinks set in simulators that are connected to grids, see Mantis #5270. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-12 | 2 | -1/+2 |
|\ \ | |/ | |||||
| * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 2 | -1/+2 |
| | | | | | | | | command. mantis #5259 | ||||
* | | 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/+59 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| * | Removed extraneous left-/ on /object/ subpath. Bug introduced during region ↵ | Diva Canto | 2010-12-07 | 1 | -1/+1 |
| | | | | | | | | URLs clean up. | ||||
* | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+59 |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 6 | -69/+37 |
|\ \ | |/ | |||||
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -14/+14 |
| | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
| * | 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. |