Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 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 | 3 | -4/+4 | |
| |\ | ||||||
| | * | Implement Scope ID lookup on GetLandData. Stacked regions were not handled | Melanie | 2011-01-03 | 3 | -4/+4 | |
| | | | | | | | | | | | | 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 | 3 | -4/+4 | |
| | | | | | | | | properly | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-30 | 4 | -81/+65 | |
|\ \ | |/ | ||||||
| * | Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors ↵ | Diva Canto | 2010-12-29 | 1 | -1/+1 | |
| | | | | | | | | were not getting notified. | |||||
| * | fixes a problem with ending slashes in GatekeeperService to verify ↵ | Myan Thor | 2010-12-29 | 1 | -3/+5 | |
| | | | | | | | | session-addresses | |||||
| * | 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-20 | 1 | -3/+3 | |
|\ \ | |/ | ||||||
| * | More changes to the long help text for console command link-region. | Marck | 2010-12-20 | 1 | -3/+3 | |
| | | ||||||
| * | Make long help text for new link-region command syntax more explicit. | Marck | 2010-12-19 | 1 | -1/+1 | |
| | | ||||||
* | | 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 | 3 | -65/+71 | |
|\ \ | |/ | ||||||
| * | 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 | 3 | -64/+70 | |
| | | | | | | | | | | | | 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 | 6 | -68/+53 | |
|\ \ | |/ | ||||||
| * | Adjust hypergrid console commands to latest changes. | Marck | 2010-12-10 | 1 | -64/+41 | |
| | | ||||||
| * | minor: remove some compiler warnings | Justin Clark-Casey (justincc) | 2010-12-10 | 1 | -1/+1 | |
| | | ||||||
| * | Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks ↵ | Diva Canto | 2010-12-09 | 4 | -2/+8 | |
| | | | | | | | | command. mantis #5259 | |||||
| * | Minor bug fixes. Hunting down mantis #5259 | Diva Canto | 2010-12-09 | 2 | -2/+4 | |
| | | ||||||
* | | 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 | 2 | -0/+61 | |
| | | | | | | | | 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 | 2 | -0/+61 | |
| | | | | | | | | whether or not an agent is allowed there as a root agent. | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 13 | -150/+154 | |
|\ \ | |/ | ||||||
| * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 5 | -23/+29 | |
| | | | | | | | | 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 | 6 | -42/+354 | |
| |\ | ||||||
| * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-23 | 1 | -1/+8 | |
| |\ \ | ||||||
| * \ \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 9 | -16/+538 | |
| |\ \ \ | ||||||
| * \ \ \ | 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 | 3 | -1/+45 | |
| |\ \ \ \ \ | ||||||
| * | | | | | | * better semantics for link-region command | Jonathan Freedman | 2010-10-30 | 1 | -21/+21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * actually parse name for new link-region command | |||||
| * | | | | | | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 1 | -28/+80 | |
| |\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-30 | 4 | -112/+153 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/+1 | |
| |\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -23/+29 | |
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Services/GridService/HypergridLinker.cs | |||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 5 | -24/+142 | |
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||||
| * | | | | | | | | | | | * a bit of additional debugging: | Jonathan Freedman | 2010-10-23 | 2 | -8/+6 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Add a missing interface memeber to the new HG stuff | Melanie | 2010-12-03 | 1 | -0/+5 | |
| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 5 | -41/+352 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found | |||||
| * | | | | | | | | | | | Added some comments. Better than listening to the boring speaker... | Diva Canto | 2010-12-01 | 2 | -0/+12 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 1 | -1/+2 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | Make gatekeeper's address check case-insensitive. | Marck | 2010-11-27 | 1 | -1/+2 | |
| | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |