Commit Graph

714 Commits (472f7844f5852a778a70771142d6c6a2ab7b894a)

Author SHA1 Message Date
Diva Canto 59c2cd04ba DEBUG DEBUG DEBUG 2011-01-17 12:35:19 -08:00
Diva Canto e80bcc0049 Improved debug messages to track what is going on with the XFF header 2011-01-09 16:52:41 -08:00
Mic Bowman ec22560045 Merge branch 'cmickeyb' 2011-01-08 13:33:52 -08:00
Mic Bowman df7fb207a8 Moved the map tile processing used by the Simian Grid
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.
2011-01-08 13:33:07 -08:00
Diva Canto 8c0e156b4d Make HG map search consistent with new syntax for link-region, i.e. http://foo.org. Old syntax (foo.org) is still supported, but has surprising results when ppl search again, because internally the HG link names start with http. 2011-01-07 11:38:54 -08:00
Diva Canto 32a3f330ed Canonicalize URL endings for the UserAgentServiceConnector. 2011-01-06 17:42:16 -08:00
Diva Canto 21dedb573b HG map tile fetch: handle cached images appropriately. 2011-01-06 12:48:28 -08:00
Mic Bowman 0b44e99730 comment out a couple simian debug messages 2011-01-05 14:51:11 -08:00
Mic Bowman 6a5d52b4c8 removed the early return on agentupdates, this was debugging code 2011-01-04 09:12:32 -08:00
Mic Bowman e0da281e3d Cleaned up debugging messages in the WebRequest handlers 2011-01-03 17:16:22 -08:00
Mic Bowman d3987024d7 Merge branch 'master' into cmickeyb 2011-01-03 17:05:24 -08:00
Melanie 9971766256 Implement Scope ID lookup on GetLandData. Stacked regions were not handled
properly
2011-01-03 19:40:55 +00:00
Mic Bowman df5e4a1e5b Standardize the way WebRequests are made in the SimulationServiceConnector. Added
debugging calls for tracking performance of web requests.
2010-12-29 20:47:51 -08:00
Diva Canto d42e0c39fc Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors were not getting notified. 2010-12-29 07:36:39 -08:00
Myan Thor 915c0b17b0 fixes a problem with ending slashes in GatekeeperService to verify session-addresses 2010-12-29 06:03:43 -08:00
Mic Bowman 94ed69b1da Update SimianGridServicesConnector to work more like
a connector so we can take advantage of the logic in
RemoteGridServicesConnector.
2010-12-27 17:18:49 -08:00
Diva Canto 6386dfd362 No need for these methods to be virtual now. 2010-12-27 16:26:29 -08:00
Marck 711283d3ca More changes to the long help text for console command link-region. 2010-12-20 02:50:19 +01:00
Marck 2a40c8511a Make long help text for new link-region command syntax more explicit. 2010-12-19 22:59:32 +01:00
Diva Canto 4357288a94 More on mantis #5270 2010-12-14 11:24:23 -08:00
Marck a4588befb7 Changed logging level for message about failure to retrieve a map image from a linked region. 2010-12-13 22:00:34 +01:00
Marck 9a24c0b41c Show map tile for hyperlinks. Perform Check4096 before adding a hyperlink.
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.
2010-12-13 21:20:48 +01:00
Marck 6f37290f4c Adjust hypergrid console commands to latest changes. 2010-12-10 17:48:45 +01:00
Justin Clark-Casey (justincc) 3053f5ba7d minor: remove some compiler warnings 2010-12-10 03:08:31 +00:00
Diva Canto cefdee8aaf Normalized ALL URLs with trailing /'s hopefully. Fixed show hyperlinks command. mantis #5259 2010-12-09 16:52:37 -08:00
Diva Canto baa8ddfd26 Minor bug fixes. Hunting down mantis #5259 2010-12-09 08:28:21 -08:00
Melanie 4df1d25d23 Plumb a code path for the entity transfer module to ask a destination scene
whether or not an agent is allowed there as a root agent.
2010-12-09 01:55:32 +00:00
Diva Canto 7cfb3d7e96 Removed extraneous left-/ on /object/ subpath. Bug introduced during region URLs clean up. 2010-12-07 17:17:06 -08:00
Diva Canto 72748746d5 Fixed some inconsistency with trailing /. Made debug messages consistent. Changed the stored region names of HG regions. Increased the size of regionName in DB. 2010-12-05 19:43:24 -08:00
Jonathan Freedman 45cd2e3ef9 Merge branch 'master-core' into mantis5110 2010-12-05 11:49:15 -08:00
Diva Canto 7d24dbca3c Added some comments. Better than listening to the boring speaker... 2010-12-01 16:01:22 -08:00
Diva Canto f3835fe15c Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-29 09:58:20 -08:00
Diva Canto f86c438653 Preservation of creator information now also working in IARs. Cleaned up usage help. Moved Osp around, deleted unnecessary OspInventoryWrapperPlugin, added manipulation of SOP's xml representation in a generic ExternalRepresentationUtils function. 2010-11-29 08:43:33 -08:00
Marck 947d730b56 Make gatekeeper's address check case-insensitive. 2010-11-27 09:18:39 +01:00
Diva Canto 3292a22558 Creator information preserved upon HG transfers. 2010-11-26 22:06:34 -08:00
Diva Canto ae4b02e115 WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added 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. 2010-11-25 11:14:16 -08:00
Jonathan Freedman bc51dfc45e Merge branch 'master-core' into mantis5110 2010-11-23 22:27:54 -08:00
Melanie 7796b90ebb Fix some crashes caused by the addition of the CreatorData column 2010-11-23 14:02:06 +00:00
Jonathan Freedman b7f5e82843 Merge branch 'master-core' into mantis5110 2010-11-21 20:01:48 -08:00
Jonathan Freedman 562147475c Merge https://github.com/opensim/opensim into mantis5110
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2010-11-21 19:51:23 -08:00
Melanie 8466ada8e0 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-11-22 00:46:37 +00:00
Diva Canto 0fec29c849 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-21 17:19:45 -08:00
Diva Canto c617d658dd Added creator info across the board -- TaskInventoryItems and InventoryItems 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).
2010-11-21 17:19:24 -08:00
Melanie ddf08276f1 Fox the buglets in Freeswitch. Grid mode works now and there is no reason why standalone should not. 2010-11-22 00:46:23 +00:00
Melanie c85e6bc36d Add the remote connector for freeswitch config retrieval 2010-11-21 23:42:52 +00:00
Melanie a7174cecdd Remove username and password from the publicly accessible FS config 2010-11-21 22:45:04 +00:00
Melanie 2b0ef9ad1d Implement a method to allow regions to query the gridwide Freeswitch
configuration from ROBUST
2010-11-21 22:17:25 +00:00
Melanie ed5f91c638 Move Dialplan and Directory from the region module to the ROBUST server 2010-11-21 21:29:17 +00:00
Melanie c0ccfeebe7 Start implementing Freeswitch in ROBUST 2010-11-21 21:29:11 +00:00
Justin Clark-Casey (justincc) b38a1594c1 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2010-11-17 01:28:46 +00:00
Melanie 7bb005b0d1 Change the way attachments are persisted. Editing a worn attachment will now
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.
2010-11-16 21:01:56 +00:00
Marck 98f29a47c0 Do not include hyperlinks in a random region search during a login.
Before a random region is chosen, available fallback regions are used for the login.
2010-11-13 00:40:03 +00:00
Jeff Ames ae9c4a4d11 Formatting cleanup. 2010-11-08 07:48:35 -05:00
Jonathan Freedman 4f40374464 Merge git://github.com/opensim/opensim into mantis5110 2010-11-05 19:10:02 -07:00
Melanie 1c8d19d714 Delete existing presences for a user ID when they log in again.
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.
2010-11-05 13:31:45 +00:00
Melanie 6c3b7617b0 Add lsClearWindlightScene() to the lightshare module to remove WL settings
from a region and allow normal day cycles to be reestablished
2010-11-03 02:31:43 +00:00
Marck 2bce1716af Fix HypergridLinker.Check4096()
Make the optimization with IEnumerable.Except() in Check4096 actually work by providing an appropriate equality definition for GridRegion objects.
2010-11-01 08:01:31 -07:00
Jonathan Freedman 0a56cfbfd5 * better semantics for link-region command
* actually parse name for new link-region command
2010-10-30 22:51:52 -04:00
Jonathan Freedman 95a0ea78f9 Merge branch 'master' into mantis5110 2010-10-30 18:28:07 -04:00
Diva Canto 48f6d47744 Fixed: ToAvatarAppearance wasn't retrieving the AvatarHeight. 2010-10-30 12:30:03 -07:00
Jonathan Freedman e371d3208c Merge branch 'master' into mantis5110
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
2010-10-30 14:10:13 -04:00
Melanie e98d8d500f Fix logins and avatar appearance. Contains a Migration. May contain nuts.
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.
2010-10-30 19:06:47 +01:00
Jonathan Freedman 9e7d3e0f25 Merge branch 'master' into mantis5110 2010-10-29 23:59:16 -04:00
Jonathan Freedman 594f23ff22 Merge branch 'master' into mantis5110
Conflicts:
	OpenSim/Services/GridService/HypergridLinker.cs
2010-10-29 23:46:53 -04:00
Jonathan Freedman d219317074 Merge branch 'master' into mantis5110
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2010-10-29 23:12:51 -04:00
Melanie ff7da2082d This commit fixes all the appearance related null refs. Still can't log in,
client displays a blank error box.
2010-10-30 02:25:25 +01:00
Melanie 7503c4ad61 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-10-30 00:56:42 +01:00
Justin Clark-Casey (justincc) ade71c9ed7 Change level of some logging messages, turning some info into arguably more appropriate debug to reduce console spam when log level is info 2010-10-30 01:32:56 +01:00
Melanie 818ed2032a READ CAREFULLY!!! This is a BROKEN commit. It is UNTESTED and INCOMPLETE.
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.
2010-10-30 00:41:36 +01:00
Justin Clark-Casey (justincc) abcde41c0d Merge branch 'justincc-dev' 2010-10-29 23:15:35 +01:00
Justin Clark-Casey (justincc) bcd784b316 for now, comment out some older or redundant log debug lines to make diagnostics easier 2010-10-29 21:49:26 +01:00
Melanie 934e536738 Merge commit 'cmickeyb/dev-appearance' 2010-10-29 21:06:46 +01:00
Melanie 05d2302c62 Merge branch 'dev-appearance' 2010-10-29 20:24:14 +01:00
Marck 7b0d643999 HypergridLinker optimizations and enable use of owner_uuid/EstateOwner with linked regions.
* Added check for already occupied region coordinates.
* Optimized Check4096.
2010-10-28 17:21:17 -07:00
Jonathan Freedman 5ddb8b535e * a bit of additional debugging: 2010-10-23 00:18:19 -04:00
Justin Clark-Casey (justincc) fe8d3d5a2b Revert "Merge remote branch 'otakup0pe/mantis5110'"
This reverts commit 21187f459e, reversing
changes made to 8f34e46d74.
2010-10-22 23:52:07 +01:00
Jonathan Freedman d4144bedb8 * change the data exchanged within hypergrid transactions 2010-10-21 23:22:15 -04:00
Master ScienceSim 267f18925d First attempt to get multiple attachments working to support viewer2.
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.
2010-10-21 16:48:58 -07:00
Melanie 08e14d653e Merge branch 'dev-appearance' of git://github.com/cmickeyb/opensim into dev-appearance 2010-10-21 17:09:42 +01:00
Jonathan Freedman 017b83d0a3 * remove some spurious debug info
* 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>
2010-10-20 22:36:29 -04:00
Jonathan Freedman 58f75fa19d * more url / hg cleanup 2010-10-20 22:21:45 -04:00
Jonathan Freedman 19119d7705 * additional serveruri cleanup 2010-10-20 22:21:41 -04:00
Jonathan Freedman 55974df14b * refactor refactor refactor ServerURI 4 lyfe 2010-10-20 22:21:23 -04:00
Jonathan Freedman 335f2ddad2 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-20 20:26:37 -04:00
Master ScienceSim b1c8d05888 Major refactoring of appearance handling.
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.
2010-10-20 16:17:54 -07:00
Jonathan Freedman 94684a2251 * remove some spurious debug info 2010-10-20 02:36:59 -04:00
Diva Canto a7acb650d4 Deleted verbose debug messages that are bringing sims to an halt. Increased the user cache expiration period to 33 hours. 2010-10-19 22:26:07 -07:00
Jonathan Freedman 12128f1917 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-18 23:00:48 -04:00
Melanie 7de30cc57b Change substring matching to prefix matching in region search. This affects
both map and login, as they use the same method.
2010-10-18 22:59:00 +01:00
Jonathan Freedman a2167b0f0d * more url / hg cleanup 2010-10-11 16:53:00 -04:00
Jonathan Freedman 8f1acb890a Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-05 14:17:18 -04:00
Diva Canto 0772e19af2 Added viewer's channel, mac, and id0 to agent circuit data. Also moved client ip address to agent circuit data, so that it's always there. 2010-10-03 20:01:59 -07:00
Melanie 766ce9a141 Add linden prim renderer and update libOMV 2010-10-04 00:10:08 +01:00
Jonathan Freedman e3099d48f9 Merge branch 'master' of git://opensimulator.org/git/opensim 2010-10-03 18:04:38 -04:00
Jonathan Freedman 69acf9c79b * additional serveruri cleanup 2010-10-03 18:03:53 -04:00
Melanie ab4be3ffdf Initial port of the Warp3D map tile renderer 2010-10-03 16:34:17 +01:00
Jonathan Freedman 32ccc7a9d9 * refactor refactor refactor ServerURI 4 lyfe 2010-10-02 19:17:02 -04:00
Master ScienceSim 9c6a591ad0 couple fixes to enable profiles in simian connector 2010-09-30 09:59:53 -07:00
John Hurliman 08ee7a0e51 Actually log users out (call LogoutAgent) in the SimianPresenceServiceConnector when LoggedOut() is called 2010-09-29 15:14:13 -07:00
John Hurliman b6e0563ad7 Part two of the previous commit, making IGridUserService.LoggedOut() more flexible without changing current behavior 2010-09-29 14:34:02 -07:00