Commit Graph

663 Commits (6627da693e48836334016e26ddc1cd71b99e0fa8)

Author SHA1 Message Date
Diva Canto 6974596e83 Fixed mix-up in UserAccount fields when passing UserAccounts remotely. 2011-12-29 12:34:57 -08:00
Melanie 759f1d2dbe Merge branch 'master' into careminster 2011-12-18 10:49:45 +00:00
Diva Canto 7e4a2d69d5 HG minor bug fix and marked one method obsolete in UAS. 2011-12-16 08:48:29 -08:00
Justin Clark-Casey (justincc) 4567555c49 Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
Melanie bc17e2e9cf Merge branch 'master' into bigmerge 2011-12-05 20:32:35 +00:00
Melanie 5ab536a1e9 Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
Diva Canto a2d98c7293 HG: Added HEAD method to Helo service. This is the preferred method, but its wide use will have to wait a few releases. So the sims are still calling GET for now. 2011-12-04 10:10:09 -08:00
Diva Canto 080dfcc9c9 HG: Renamed one method 2011-12-04 08:24:16 -08:00
Melanie bdb5ac96d9 Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-11-19 22:39:15 +00:00
Justin Clark-Casey (justincc) 2206e2fc96 Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCreateChildAgent" message
This is misleading since a simulator will call this method before successfully trying remote regions.
Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
2011-11-19 01:32:21 +00:00
Justin Clark-Casey (justincc) 10a23a823e Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
2011-11-19 01:16:07 +00:00
Justin Clark-Casey (justincc) b89534ad0a Remove mono compiler warnings. Fix problem with co-ordinate given in deregister region message 2011-11-19 00:34:13 +00:00
Justin Clark-Casey (justincc) d05d065d85 Improve some grid region log messages to express regions at co-ordinate (e.g. 1000, 1000) rather than meter positions (256000, 256000) 2011-11-19 00:29:52 +00:00
Melanie 243acef917 Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-03 00:06:14 +00:00
Justin Clark-Casey (justincc) b6873a7b5d Catch any exceptions exiting the top of the robust console, as we already do for the main simulator.
This prevents issues such as transient mono console problems from crashing the server.
2011-11-02 13:16:02 +00:00
Melanie fd22159d0c Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
Justin Clark-Casey (justincc) 8a0a78cbcc Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this.  This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
Melanie 4e9457ca0c Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
Conflicts:
	OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
2011-10-25 03:26:09 +01:00
Melanie a71c60ee6d Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge 2011-10-25 02:56:56 +01:00
Melanie 1b87a0c229 Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmerge 2011-10-25 02:56:30 +01:00
Melanie 3555987fe9 Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmerge 2011-10-25 02:56:22 +01:00
Melanie e1ff72209f Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmerge 2011-10-25 02:56:15 +01:00
Melanie cdca0fb387 Merge commit '9d59b285bbc84aa620200e7da69be0f347dd69f4' into bigmerge 2011-10-25 02:56:03 +01:00
Melanie f5e2bdebef Merge commit 'c85a780583cb36bac95f69c5d704f60a758d56bb' into bigmerge 2011-10-25 02:55:57 +01:00
Melanie 9ceb98344a Merge commit '631d5e16ef8c5340b6283b1a9ed9cc95aea3e3a1' into bigmerge 2011-10-25 01:37:11 +01:00
Justin Clark-Casey (justincc) 4c9400e646 Add optional getauthinfo and setauthinfo authentication service calls.
These are disabled by default, as before.  Please only turn these on in secure grids, since they allow the same facilities as the existing SetPassword call (also disabled by default)
These facilities can be helpful when integrating external systems, in addition to the existing option of adapting an IAuthenticationService or using WebLoginKey
2011-10-24 21:40:36 +01:00
Justin Clark-Casey (justincc) d9184eceab Add option to allow remote http calls to setpassword in the AuthenticationService.
This is switched on by setting AllowSetPassword = true in the [AuthenticationService] section of Robust.ini or Robust.HG.ini
Default is false as before.
2011-10-19 19:03:17 +01:00
Justin Clark-Casey (justincc) 4cffdf15ba Make ScopeID optional for http GetAccount and GetAccounts
If not specified then it assumes UUID.Zero. as occurs elsewhere in the codebase
2011-10-19 00:34:54 +01:00
Justin Clark-Casey (justincc) 9f171041c9 Make PrincipalID a synonym for UserID in GetUserAccount 2011-10-19 00:23:06 +01:00
Justin Clark-Casey (justincc) 97c66f8eac Get new NewUser and SetUserAccount calls to accept PrincipalID instead of UserID for consistency with output 2011-10-19 00:16:53 +01:00
Justin Clark-Casey (justincc) 9d59b285bb Allow an http call to set account details if AllowSetAccount = true in [UserAccountService].
As before, default is false to not allow these calls.
2011-10-19 00:06:40 +01:00
Justin Clark-Casey (justincc) c85a780583 Provide an option to allow remote calls to the CreateUser method on the UserAccountService
Default is false, as before.
Enabling AllowCreateUser in [UserAccountService] for ROBUST allows avatars to be created via an http call, with viewer 2 appropriate bits and pieces.
Only Ruths can be created at present.
Please don't rely on the config since at some point CreateUser will be moved to a separate co-ordinating service.
2011-10-18 22:51:40 +01:00
Justin Clark-Casey (justincc) 631d5e16ef Get rid of some traces of the old pre-ROBUST grid architecture config 2011-10-12 21:51:34 +01:00
Tom 66dec3b874 Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Justin Clark-Casey (justincc) 504de8bc47 Pass the first name and last name from the agent circuit data to the authorization service rather than from the account.
This is to accomodate situations where the authorization service is being used by the hypergrid, where visitors have no user account.
See http://opensimulator.org/mantis/view.php?id=5517, this code is somewhat adapted/cleaned up from Michelle's patch
I'm a little ambivalent about this since visitors could put anything in firstname/lastname so it's not much of an auth measure.
It's up to the auth service to decide which data it actually uses.
Possibly we should be passing through other info such as agent circuit ip
2011-07-23 03:48:53 +01:00
Melanie 6ae73aea49 Merge branch 'master' into careminster-presence-refactor 2011-06-20 03:11:34 +01:00
Diva Canto ecb28ae130 V2 map now working in grids too. WARNING: A few visible configuration variables added in order for this to work. See .ini.example changes 2011-06-13 09:13:44 -07:00
Melanie 9b1d3f0c38 Merge branch 'master' into careminster-presence-refactor 2011-06-13 12:38:17 +01:00
Diva Canto 2e77518c6d bit depth: 24!!! begeez! -- zoom levels work now. 2011-06-12 21:51:26 -07:00
Diva Canto 78c16da544 A few bug fixes on map V2. Zoom level weirdness still there. 2011-06-12 17:05:45 -07:00
Diva Canto fd57c91b4a First pass at making the V2 map work. Standalones only for now. There are some issues with the zoom level -- TBD. 2011-06-12 15:37:42 -07:00
Melanie 326c46ba70 Merge branch 'master' into careminster-presence-refactor 2011-06-09 02:05:04 +01:00
Oren Hurvitz 39323055bd When a plugin fails to load because a DLL is missing, log which DLL it is 2011-06-07 20:17:49 -07:00
Diva Canto 3307db5d4a This hopefully fixes all issues with online/offline notifications across grids. http://opensimulator.org/mantis/view.php?id=5528 2011-06-07 19:36:04 -07:00
Diva Canto f5d82350bb This fixes the crash reported in http://opensimulator.org/mantis/view.php?id=5529 related to sending IMs to foreign friends who are offline. Hopefully. 2011-06-07 10:51:12 -07:00
Diva Canto 6312eea459 HG IM bug fix: grid_instant_message was being placed in the default port instead of the specified one. 2011-06-02 10:14:26 -07:00
Diva Canto 65c71050cc Extra debug message 2011-06-02 09:39:29 -07:00
Diva Canto f2f30a7890 HG Friends bug fix: connector was shrinking principalID to UUID. 2011-06-02 07:26:40 -07:00
Diva Canto 76525be7b2 HG lures working! Friends can offer friends HG teleports via the profile. WARNING: additional configuration for HG inis -- see *Common.ini.example 2011-05-27 13:07:18 -07:00
Diva Canto 4087a453dc Avoid a scary warning message about null replies from the user agent service. 2011-05-27 08:53:26 -07:00
Diva Canto 0d29f73916 Commented a few extra debug messages. 2011-05-26 19:13:03 -07:00
Diva Canto 0c58a9e680 HG IM in grid mode working fairly well. Unknown target user references looked back in source user's User Agent service. 2011-05-26 10:04:48 -07:00
Diva Canto 5c2168cae7 HG: Instant Message working. Tested on HG standalones only. Needs a lot more testing. 2011-05-25 12:32:21 -07:00
Diva Canto e19031849e Added necessary code to drop inventory on hg friends using the profile window, but can't test because this mechanism doesn't seem to work without a profile service. 2011-05-24 09:38:03 -07:00
Diva Canto 24f28d3534 HG friends: Status notifications working. Also initial logins get the online friends in other grids. 2011-05-23 19:45:39 -07:00
Diva Canto 336665e035 More on HG Friends. Added Delete(string, string) across the board. Added security to friendship identifiers so that they can safely be deleted across worlds. Had to change Get(string) to use LIKE because the secret in the identifier is not always known -- affects only HG visitors. BOTTOM LINE SO FAR: HG friendships established and deleted safely across grids, local rights working but not (yet?) being transmitted back. 2011-05-22 16:51:03 -07:00
Diva Canto 58c53c41de Fixed permissions bug related to friends in PermissionsModule. Added FriendsData[] GetFriends(string principalID) to IFriendsData and FriendInfo[] GetFriends(string PrincipalID) to IFriendsService. Refactored some more in the FriendsModule. Made client get notification of local friends permissions upon HGLogin. HG Friends object permissions work. 2011-05-21 16:48:00 -07:00
Diva Canto d21e9c755f HG Friends working to some extent: friendships offered and accepted correctly handled. Friends list showing correct foreign names. TODO: GrantRights. 2011-05-19 16:54:46 -07:00
Melanie 37a7b87862 Merge branch 'master' into careminster-presence-refactor 2011-05-14 21:09:52 +01:00
SignpostMarv Martin cb6cd3714e The get_grid_info REST call now encodes XML Entities 2011-05-14 00:31:54 +01:00
Melanie 75d4956ee5 Merge branch 'master' into careminster-presence-refactor 2011-05-13 12:05:46 +01:00
Diva Canto e9e4c009b4 This makes compression of fatpacks actually work. Previously they always failed. See comment in WebUtil. 2011-05-11 20:44:03 -07:00
Diva Canto 7fa2489a6e Revert "Functional improvement: close the stream. Non-functional: add debug messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs."
This reverts commit 5548f83750.
2011-05-11 13:15:27 -07:00
Diva Canto af2e12d2b4 One more debug message. Don't use this unless your name is nebadon. 2011-05-11 10:43:50 -07:00
Diva Canto 5548f83750 Functional improvement: close the stream. Non-functional: add debug messages to find out why updates are getting an error. WARNING: MASSIVE CONSOLE SPAM ON TPs. 2011-05-11 10:21:42 -07:00
Melanie c8b9558039 Also compress the actual fatpacks 2011-05-08 23:52:31 +01:00
Melanie ade09d0fa1 Also compress the actual fatpacks 2011-05-08 23:23:33 +02:00
Melanie e345f03895 Remove a spammy debug I left in. Disable TP cancel button at the point
of no return.
2011-05-08 22:05:33 +01:00
Melanie 1fbf4c8300 Remove a spammy debug I left in. Disable TP cancel button at the point
of no return.
2011-05-08 21:36:51 +02:00
Melanie b451cc1ebb Merge branch 'master' into careminster-presence-refactor 2011-05-08 20:23:06 +01:00
Melanie 1be67914fa Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2011-05-08 20:20:40 +01:00
Melanie 9688db2f68 Enable compressed (gzip) fatpack transfers. 2011-05-08 20:20:00 +01:00
Melanie 763666e2d6 Enable compressed (gzip) fatpack transfers. 2011-05-08 19:50:35 +02:00
BlueWall 8ca7938753 Adding ssl support
Adding ssl support for "Out of Band" applications such as the remote
	admin module or Robust services
2011-05-05 19:56:54 -04:00
Melanie d1cf1fe3d7 Merge branch 'master' into careminster-presence-refactor 2011-04-30 14:37:37 +01:00
Diva Canto 9892e115cc Fatpack message on agent transfers: 1 message only (UpdateAgent) containing the agent and all attachments. Preserves backwards compatibility -- older sims get passed attachments one by one. Meaning that I finally introduced versioning in the simulation service. 2011-04-28 20:19:54 -07:00
Melanie a62b435a39 Merge branch 'master' into careminster-presence-refactor 2011-03-27 21:41:54 +01:00
SignpostMarv Martin 6153c45973 LLLoginHandlers now supports both password & web login
Signed-off-by: SignpostMarv Martin <me@signpostmarv.name>
2011-03-26 02:28:11 +00:00
Melanie 9be1d2aef1 Merge branch 'master' into careminster-presence-refactor 2011-02-24 02:37:21 +00:00
Justin Clark-Casey (justincc) db7c758b7f On a Grid Handler exception, explicitly log the exception message and stack trace so that we get somewhat better diagnostics on windows 2011-02-24 00:55:50 +00:00
Melanie 918c12c965 Change the QUERYACCESS method to eliminate spurious access denied messages 2011-02-16 08:06:11 +00:00
Melanie cfce0aa448 Change the QUERYACCESS method to eliminate spurious access denied messages 2011-02-16 05:22:05 +01:00
Melanie e2762a68b3 Merge branch 'master' into careminster-presence-refactor 2011-02-12 00:42:10 +00:00
Diva Canto 34bd41d186 Comment previous debug 2011-02-08 11:16:38 -08:00
Diva Canto 305c755cfb XFF header again -- debug. 2011-02-08 07:50:01 -08:00
Melanie 4e0b0f0f4c Fix a typo in the QUERYACCESS method name 2011-02-05 04:24:43 +00:00
Melanie 188d86998d Fix up QueryAccess to also check parcels 2011-01-28 04:09:04 +00:00
Melanie 657c14c5db Fix up QueryAccess to also check parcels 2011-01-28 03:07:25 +01:00
Melanie 11c742a5a8 Make bans work for teleport. Now teleport will complete block if the user
is not allowed on the estate. If the user is allowed on no parcel, the
teleport will also be blocked. If the user is allowed on a parcel, but
not the desired one, the user will be shifted to the closest allowed
location.
2011-01-27 02:16:41 +01:00
Melanie 105deab601 Merge branch 'master' into careminster-presence-refactor 2011-01-23 23:29:25 +00:00
Justin Clark-Casey (justincc) bf5ec8cb88 remove some mono compiler warnings and unnecessary dictionary instantiations 2011-01-21 22:51:52 +00:00
Melanie 6306578fcf Merge branch 'master' into careminster-presence-refactor 2011-01-18 01:28:50 +00:00
Diva Canto 479d72ac97 Account for some component along the way lower-casing the HTTP header keys. (XFF header issue) 2011-01-17 11:37:39 -08:00
Diva Canto 0aeb8981b2 Brute force debug for XFF issue 2011-01-17 11:19:20 -08:00
Diva Canto 66f99ae267 More debug messages to help track the XFF header problem. 2011-01-17 11:03:46 -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
Melanie 9971766256 Implement Scope ID lookup on GetLandData. Stacked regions were not handled
properly
2011-01-03 19:40:55 +00:00
Melanie 6820deed34 Implement Scope ID lookup on GetLandData. Stacked regions were not handled
properly
2010-12-31 15:45:08 +01:00
Melanie 7fef89847c Merge branch 'master' into careminster-presence-refactor 2010-12-09 02:24:12 +00: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
Melanie f28dc77ab4 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 02:01:41 +01:00
Diva Canto 796216e44f Added an exception handler on CreateObject handler, just in case there's an exception being thrown that is silently being ignored by the http server. (Trying to catch Melanie's problem with attachments on TPs) 2010-12-07 20:05:53 -08:00
Melanie 45314c6622 Merge branch 'master' into careminster-presence-refactor 2010-12-06 02:54:51 +00:00
Jonathan Freedman 45cd2e3ef9 Merge branch 'master-core' into mantis5110 2010-12-05 11:49:15 -08:00
Melanie 342dc532ec Merge branch 'master' into careminster-presence-refactor
Also prevent god takes from ending up in Lost and Found
2010-12-03 02:36:13 +00: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 45b08a9ce3 Fix more potential nullrefs 2010-11-23 14:02:20 +00:00
Melanie 4a54b3318b Fix more potential nullrefs 2010-11-23 00:31:09 +01:00
Jonathan Freedman b7f5e82843 Merge branch 'master-core' into mantis5110 2010-11-21 20:01:48 -08: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 22ff06ba17 Merge branch 'master' into careminster-presence-refactor 2010-11-22 01:09:26 +00:00
Melanie 8d7b181b58 Merge branch 'master' into careminster-presence-refactor 2010-11-21 23:47:28 +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 c0ccfeebe7 Start implementing Freeswitch in ROBUST 2010-11-21 21:29:11 +00:00
Melanie 1cf8eb8a90 Start implementing Freeswitch in ROBUST 2010-11-21 20:59:01 +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
Melanie 4f15b8d4e6 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 20:44:39 +01:00
Melanie 7f74dc1b14 Merge branch 'master' into careminster-presence-refactor 2010-10-23 00:21:42 +01: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
Melanie fc33d569cd Merge branch 'master' into careminster-presence-refactor 2010-10-21 07:33:01 +01:00
Jonathan Freedman 58f75fa19d * more url / hg cleanup 2010-10-20 22:21:45 -04:00
Jonathan Freedman a2167b0f0d * more url / hg cleanup 2010-10-11 16:53:00 -04:00
Melanie d8149373c1 Merge branch 'master' into careminster-presence-refactor 2010-10-06 00:27:10 +01:00
Jeff Ames bc9f793a92 Formatting cleanup. 2010-10-04 21:28:17 -04:00
Melanie da6816c805 Merge branch 'master' into careminster-presence-refactor 2010-10-04 04:49:54 +01:00
Diva Canto 37231e0941 Made the home agent handler check for xff if behind a proxy. 2010-10-03 21:21:02 -07:00
Diva Canto 934ae03d44 Made the Gatekeeper proxy-able. 2010-10-03 20:35:26 -07: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 fd56fd2ce8 Merge branch 'master' into careminster-presence-refactor 2010-10-02 19:51:43 +01:00
BlueWall ffc1123ca5 adding -logconfig to Robust.exe
Adding -logconfig to Robust.exe. will still process the
	-logfile option, as before. No options given, the value
	"Robust.log" will be written in the ./bin directory
2010-10-01 05:42:18 +01:00
Melanie 521e2c8355 Merge branch 'master' into careminster-presence-refactor 2010-09-30 16:01:45 +01: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
John Hurliman 9b7c99f0cf Made IGridUserService.SetLastPosition() more flexible to allow different possible implementations. This doesn't change any behavior or any Robust code, but it simplifies the SimianGrid connector by using the standard OpenSim interface for setting last position now 2010-09-29 14:24:32 -07:00
Melanie 6a1ce17cdb Merge branch 'master' into careminster-presence-refactor
The modules will need to be updated for this to compile and run again. Please
don't use until I do the companion commit to modules later on.
2010-09-13 16:17:38 +01:00
Jeff Ames f1f0bc23f4 Formatting cleanup. 2010-09-12 13:43:49 -04:00
Diva Canto d301f3fd6a Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule. 2010-09-08 14:12:01 -07:00
Diva Canto 3fb4a17f10 No need for a config var for the HELO message on the server-side. It's robust. 2010-09-08 11:30:38 -07:00
Diva Canto 904d6b787a First version of the Hypergrid HELO service that will enable different backends to interoperate. 2010-09-08 09:53:57 -07:00
Melanie e4c2b44e5c Merge branch 'master' into careminster-presence-refactor 2010-09-05 15:06:00 +01:00
Diva Canto 9fd9836841 Make User Agent Service and Login Service separable. 2010-09-04 16:39:03 -07:00
Diva Canto 8fc68c6d98 Added XFF header processing. Untested, for lack of proxy. 2010-09-03 17:18:53 -07:00
Melanie f8ff98577e Merge branch 'master' into careminster-presence-refactor 2010-08-21 00:32:26 +01:00
Diva Canto 1955b79759 Partial rewrite of client IP verification. Not completely finished yet, and untested. Committing to move to my other computer. 2010-08-19 18:55:30 -07:00
Melanie e74809ff4c Merge branch 'master' into careminster-presence-refactor 2010-08-18 00:59:20 +01:00
Justin Clark-Casey (justincc) 576faee203 minor: change some logging levels 2010-08-11 23:17:29 +01:00
Justin Clark-Casey (justincc) 686f44c575 minor: change "no [GridInfo] config" warning to refer to "configuration files" rather than "OpenSim.ini" 2010-08-11 23:16:33 +01:00
Melanie 8fd3f6cf7f Merge branch 'master' into careminster-presence-refactor 2010-08-07 05:41:41 +01:00
Melanie a04efe4a4d Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-08-07 05:39:20 +01:00
Melanie Thielker 00fd2e0446 Correct display of landmark about info. Also correct region maturity rating
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
2010-08-07 05:33:49 +01:00
Melanie Thielker c554de7501 Correct display of landmark about info. Also correct region maturity rating
in LM info. Maturity is NOT the parcel's setting, that is only for the
image and text. Parcel maturity is governed by region maturity.
2010-08-07 05:45:52 +02:00
Marck 7e47ab746e Allow creation of link regions if there is an existing region within a 4096 range.
Also add GetHyperlinks() to the grid service.
2010-08-06 17:02:03 -07:00
sacha a390541e1c Allowing the expected purge trash folder...
Please validate !!!
2010-08-06 14:38:11 +00:00
Melanie 46a531d865 Merge branch 'master' into careminster-presence-refactor 2010-06-30 21:35:05 +01:00
Diva Canto b6264e60d3 Removed opportunity for exception in BaseHttpServer. (mantis #4825) 2010-06-30 06:35:22 -07:00
Diva Canto 9fde9085a0 Bug fix in HG standalone: wrong handler in the in module. Fixed a few broken comments in InventoryAccessModule. 2010-06-29 02:07:10 -07:00
Robert Adams 6cf0b8f6fe Add command-script to the Robust console 2010-06-27 13:28:27 -07:00
Diva Canto 3dbc736049 Addresses mantis #4789. Not really a fix, because the event is harmless anyway. Just shouldn't happen normally. 2010-06-27 13:23:51 -07:00
Melanie Thielker a791689ceb Make the text mode remote console really work. It can now be used to send
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:05:06 +01:00
Melanie Thielker 4921d5ac2d Make the text mode remote console really work. It can now be used to send
multi-word commands with proper quoting, handles arguments with spaces
and allows interactive use, e.g. user creation.
2010-06-08 22:03:08 +02:00
Melanie c5878b6610 Merge branch 'master' into careminster-presence-refactor 2010-06-04 21:11:15 +01:00
Diva Canto 952029380a Fixed a couple of buglets in Friendship offers / acceptance / decline when avies are in different sims. 2010-06-04 10:59:59 -07:00
Melanie 542e6b8af4 Merge branch 'master' into careminster-presence-refactor 2010-05-28 21:56:42 +01:00
Justin Clark-Casey (justincc) 505cb82dee fission UserAccountService.HandleCreateUser() into two methods, one which handles user command parsing and another which actually does the work 2010-05-28 21:14:15 +01:00
Melanie Thielker ecc77e3886 Comment noisy "CONNECTION DEBUGGING" messages, because they push more
important stuff off screen too fast. Clean this time
2010-05-27 19:09:00 +01:00
Melanie Thielker ac5373427f Comment noisy "CONNECTION DEBUGGING" messages, because they push more
important stuff off screen too fast. Clean this time
2010-05-27 20:08:12 +02:00
Melanie a48d7f62a7 Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"
Some other stuff snuck in.

This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
2010-05-27 19:02:20 +01:00
Melanie Thielker 6b6425aa5e Comment noisy "CONNECTION DEBUGGING" messages, because they push more
important stuff off screen too fast
2010-05-27 18:44:15 +01:00
Diva Canto 13c22015e5 Removed sessionID from GridUserservice again. Removed parcel crossing detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface. 2010-05-20 15:14:14 -07:00
unknown 59dec2f989 * Added sessionID to IGridUserService.SetLastPosition(), as some connectors will want to track position against sessionID instead of userID
* Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing
2010-05-20 11:51:57 -07:00
Tom Grimshaw 1c040d8c1e Fix to the scenario where we send an agent to a neighbouring sim (via teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it. 2010-05-18 03:24:43 -07:00
Melanie 60357d3778 Implement the "delete" path for assets. Adds a new option to allow remote asset deletion in robust handler. 2010-05-09 17:56:52 +01:00
Diva Canto 15562017f2 These files are part of the GridUserService write-up. 2010-05-07 21:32:02 -07:00
Diva Canto a58859a0d4 GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.
BTW, the Meshing files want to be committed too -- EOFs.
2010-05-07 21:29:56 -07:00
Melanie Thielker 2ebe148266 Plumb the viewer version string through into AgentCircuitData. Now all that
is left os to figure out what black magic turns AgentCircuitData into
AgentData and then copy that into the ScenePresence, where m_Viewer is
already added with this commit and waits for the data.
2010-05-05 22:15:32 +01:00
Melanie Thielker fe8399d1bf Add a XMLRPC method to remotely set the login level for the LLLoginService.
This requires a special XMLRPC call, which has to supply the credentials of
a god user (User level >= 200). Disabled by default. Also Adds a configuration
option to set the initial permitted login level.
2010-05-05 20:46:53 +01:00
Diva Canto b10811a13b Assorted bug fixes in hypergrid linking. 2010-05-03 09:50:55 -07:00
Diva Canto 5fda81e6bb * XInventory fairly tested, including for HG. Almost ready to switch.
* Removed a few buglets and added better exception handling.
2010-04-30 11:39:02 -07:00
Diva Canto 2c595227b0 Commented verbose debug messages from XInventory handler. 2010-04-28 07:41:16 -07:00
Diva Canto 3f9d38538e XInventory connector/handler showing signs of life. Tested, but needs more testing. 2010-04-27 11:01:56 -07:00
Melanie a92ca3c2c9 Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim 2010-04-27 03:49:25 +01:00
Diva Canto 76e87181b2 RemoteXInventoryServiceConnector, the plugin region module. Not active in default configs yet. 2010-04-26 20:28:37 -07:00
Melanie 1e743eab6d Allow a client to pass a scope id to log into in the login XML / LLSD 2010-04-27 03:48:49 +01:00
Diva Canto bdc03dbff9 * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.
* PrimitiveBaseShape wants to be be committed too -- EOF.
2010-04-14 10:36:03 -07:00
Diva Canto 6485c576a1 * Made UserAccountService handle UserLevel, UserFlags and UserTitle appropriately.
* Removed Store service from the UserAccount handler.
2010-04-03 12:03:34 -07:00
Justin Clark-Casey (justincc) bfbf25c542 minor: Print out port that http servers are using
do this in callers so that we know who is setting up these things
2010-03-25 21:36:57 +00:00
Diva Canto 45ef3e9987 Get the local inner simulation service object to the handler so that there is no possibility of cascading requests when failures happen. 2010-03-15 20:32:36 -07:00
Diva Canto 76106e39d9 Restoring LoadPlugin as it was before. Justin's last change made it throw. 2010-03-15 19:34:14 -07:00
Justin Clark-Casey (justincc) f2de50bb14 Fix tests broken in 88771aeed3
Adds MockUserAccountService and connects it up
Stops services being carried over between tests since this leads to hard to find bugs
Improves information and error reporting when loading plugins
2010-03-12 19:31:14 +00:00
Jeff Ames f58a0394ed Formatting cleanup. Add copyright notices. 2010-03-10 13:15:36 +09:00
Melanie bef311dfb9 Merge branch 'master' into presence-refactor
This is the big one. master is now presence-refactor (pre 0.7). A new branch 0.6.9-post-fixes and leading tag 0.6.9 has been created. The Presence-refactor
branch remains for experimental work.
2010-03-02 04:46:13 +00:00
Jeff Ames 780ee4f991 Fix a few compiler warnings. 2010-03-01 23:04:45 +09:00
Diva Canto bbb43f9bde Now showing friends online upon grid login. 2010-02-26 10:35:23 -08:00
Diva Canto 2af7577fab Flags on Store(Friend) are supposed to be MyFlags. 2010-02-26 09:01:59 -08:00
Diva Canto c745df007d Added server-side Friends in connector. Untested. 2010-02-25 17:42:51 -08:00
Melanie 1f45e6c649 Merge branch 'master' into presence-refactor
This brings presence-refactor up to master again
2010-02-22 03:00:59 +00:00
John Hurliman 845a390e93 * Added a sanity check for missing asset data in LLClientView
* Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil
* Linked content type to asset type in AssetMetadata
2010-02-20 16:21:13 -08:00
John Hurliman eb22fde96c * Fixed SL asset type enum to mime type conversion and added more helper functions for going back and forth between enums and mime types 2010-02-19 15:28:35 -08:00
Jeff Ames af265e001d Formatting cleanup. 2010-02-15 19:21:56 +09:00
Justin Clark-Casey (justincc) 00800c59d3 Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522
These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login.
The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems).
Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place.
2010-02-12 23:13:35 +00:00
Melanie baaf660511 Merge branch 'master' into presence-refactor
This was a large, heavily conflicted merge and things MAY have got broken.
Please check!
2010-02-08 15:53:38 +00:00
Diva Canto 16f77fa1f1 Finished implementing the XInventory connector. Untested. 2010-02-07 16:41:41 -08:00
Diva Canto 29e501d688 A little more beef on the xinventory in connector. 2010-02-06 19:06:08 -08:00
Diva Canto 35de8e91ec * Remove unnecessary debug message
* Bug fix in UserAgentService, logout
2010-01-31 17:27:56 -08:00
Diva Canto 0b89afd3e5 * Simplified the configuration by having [DatabaseService] in it
* Fixed configuration issue for HGInventoryServerInConnector
* Corrected typos in debug messages
2010-01-31 14:37:22 -08:00
Diva Canto 22a3ad7f6c * Bug fix in XInventoryData -- groupOwned is an int in the DB
* Bug fix in InventoryServerInConnector -- m_config
2010-01-31 11:26:12 -08:00
Diva Canto 40d8e91008 * Added a few files that were missing in the repo.
* New HGInventoryService which allows restricted access to inventory while outside
2010-01-31 11:10:57 -08:00
Diva Canto 0c81966c0a Works for grid login. 2010-01-29 09:12:22 -08:00
Diva Canto 00f7d622cb HG 1.5 is in place. Tested in standalone only. 2010-01-28 19:19:42 -08:00
Diva Canto 7c00469cd2 Added ExternalName config on Gatekeeper. 2010-01-27 08:00:29 -08:00
Diva Canto 48b03c2c61 Integrated the hyperlinking with the GridService. 2010-01-24 14:30:48 -08:00
Diva Canto 9fbcceb1db * Towards enabling hyperlinks at grid-level.
* Updated grid configs
2010-01-18 20:35:59 -08:00
Diva Canto 3d53694415 Go Home works. With security!! 2010-01-18 16:34:23 -08:00
Diva Canto fd64823466 * Added missing GatekeeperServiceConnector
* Added basic machinery for teleporting users home. Untested.
2010-01-18 10:37:11 -08:00
Melanie 2257431cba Comment the asset deletion handler. It can be abused and is not currently
needed.
2010-01-18 17:36:38 +00:00
Diva Canto b5fcb5e872 HG teleports through gatekeeper are working. 2010-01-17 20:10:42 -08:00
Diva Canto b2e6ec9e12 Agent gets there through the Gatekeeper, but still a few quirks to fix. 2010-01-17 18:04:55 -08:00
Diva Canto f276ba57bf HG agent transfers are starting to work. Gatekeeper handlers are missing. 2010-01-17 11:33:47 -08:00
Diva Canto a7309d90da * Added ServiceURLs to AgentCircuitData.
* Fixed a configuration buglet introduced yesterday in StandaloneHypergrid.ini.
2010-01-17 08:40:05 -08:00
Diva Canto 6dceb8b4a9 These 2 were moved to corresponding Hypergrid folders. The server connector was renamed to Gatekeeper, because it will have all the handlers for the gatekeeper. 2010-01-17 07:37:43 -08:00
Diva Canto 04e29c1bac Beginning of rewriting HG. Compiles, and runs, but HG functions not restored yet. 2010-01-16 21:42:44 -08:00
Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor
This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.
2010-01-16 00:05:08 +00:00
Diva Canto 4bae547ecb Added the 2 missing methods in the grid service remote connections. 2010-01-14 06:36:39 -08:00
Diva Canto 369e57beee Take the verbose debug messages in AgentHandler out again. 2010-01-13 21:34:29 -08:00
Diva Canto e90a5895ad Bug fix in releasing agent. In Scene, always use SimulatonService, and not m_SimulationService, because it may be null... 2010-01-13 21:32:48 -08:00
Diva Canto 7356860b48 Several more buglets removed. 2010-01-13 09:17:30 -08:00
Melanie e3a04fcb7b Change the error messages on region region registration. This changes URM
and region. The non-error case should be compatible, so no version bump.
Untested.
2010-01-13 03:08:34 +00:00
Melanie 2b478a61d0 Add the console port setting to ROBUST, too 2010-01-11 03:49:05 +00:00
Diva Canto 49618dc102 Moved GridInfo service from where it was to Handlers/Grid 2010-01-10 19:19:34 -08:00
Diva Canto eb6d49e02c Fixed small inconsistency in config var name. 2010-01-10 17:19:40 -08:00
Diva Canto b0bbe861cd Moved OpenId authentication from user server to Server.Handlers.Authentication. 2010-01-10 17:15:02 -08:00
Diva Canto 4dd523b45d * Changed IPresenceService Logout, so that it takes a position and a lookat
* CommsManager.AvatarService rerouted
2010-01-10 15:34:56 -08:00
Melanie bc68390b14 The first 2 handlers for the XInventory system. 2010-01-08 22:51:37 +00:00
Diva Canto f11a97f12d * Finished SimulationServiceConnector
* Started rerouting calls to UserService.
* Compiles. May run.
2010-01-07 15:53:55 -08:00
Melanie 6d061d9f39 Complete the XInventoryConnector. Flesh out the skeleton for the
XInventoryInConnector
2010-01-06 22:00:19 +00:00
Melanie 68eba8973c Adding a skeleton for the XInventoryInConnector, counterpart to the already
done XInventoryConnector. No functionality yet.
2010-01-06 19:16:43 +00:00
Melanie aca01f5415 Add the XInventoryServicesConnector, a new inventory connector without the cruft
of the old one that makes inventory crash on folder creation. This is just
the connector part, the handler is still ont he todo list.
2010-01-05 04:22:03 +00:00
Melanie be41ba6670 Allow lists to be embedded in query strings 2010-01-05 03:17:45 +00:00
Melanie cbe434149e Change the signature of the forms requester data in preparation to getting
to where lists can be sent as requests
2010-01-05 03:17:37 +00:00
Diva Canto 99efa99585 Successfully logged into a grid. 2010-01-03 11:44:57 -08:00
Diva Canto c268e342d1 * Changed ISimulation interface to take a GridRegion as input arg instead of a regionHandle.
* Added the RemoteSimulationConnectorModule, which is the replacement for RESTComms. Scenes is not using this yet, only (standalone) Login uses these region modules for now.
* Completed SimulationServiceConnector and corresponding handlers.
2010-01-03 09:35:12 -08:00
Diva Canto ae1bdaa7b5 Applied fix for avatar connectors similar to yesterday's fix of user account connectors. 2010-01-03 07:03:14 -08:00
Diva Canto 8bed461957 Test client for remote user account connector and service. It seems to be working. 2010-01-02 20:16:21 -08:00
Diva Canto 08b507517b Test client for remote presence connector, and for the service itself. Connector seems to work well. 2010-01-02 18:18:13 -08:00
Diva Canto 28702f585f * Avatar service connectors all in place, but untested.
* Fixed a typo in RemoteUserAccountServiceConnector module.
2010-01-02 15:07:38 -08:00
Diva Canto 8a9677a531 The Library Service is now working. UserProfileCacheService.LibraryRoot is obsolete. Didn't delete it yet to avoid merge conflicts later -- want to stay out of core as much as possible. 2010-01-01 21:12:46 -08:00
Diva Canto 1387919c20 Yes! First test of new login service done still in 2009! Bombs in auth, because the data migration is missing. Will fix it next year...
* HAPPY NEW YEAR!
2009-12-31 20:51:35 -08:00
Diva Canto 130c80efe0 A lot more beef on the login service. The LLLoginResponse is a MONSTER! Almost done... 2009-12-31 17:18:55 -08:00
Diva Canto 0ce9be653d * Added the Login server handlers that were lost in yesterday's commit grief
* More beef to the LLLoginService
* Better design for handling local simulation service
2009-12-31 14:59:26 -08:00
Diva Canto a8901a40f4 Simulation handlers (agents & objects) completed. 2009-12-31 09:25:16 -08:00
Melanie 3507005d9d Remove CreateUserAccount. Rename SetUserAccount to StoreUserAccount.
Implement the fetch operations fully. Rename one last UserService file to
UserAccountService
2009-12-31 01:16:16 +00:00
Diva Canto b4483df270 * All modules and connectors for user account service are in place. Untested.
* Cleaned up a few things on presence connectors
2009-12-29 15:58:40 -08:00
Melanie e0fc854f05 Adding new fields and home location methid to presence. Adding cleanup
(deleting all but one presence record) on logout so that they don't pile up.
2009-12-28 23:42:08 +00:00
Melanie 92a40129b5 Database and presence changes. Untested 2009-12-28 17:34:42 +00:00
Diva Canto 3ef513e863 Presence remote connector and handler. Presence HG Broker. Nothing tested, just compiles. 2009-12-27 20:34:42 -08:00
Melanie 0f5219a004 Allow lists to be embedded in query strings 2009-12-27 21:46:16 +00:00
Melanie 9cef5f92a1 Change the signature of the forms requester data in preparation to getting
to where lists can be sent as requests
2009-12-27 03:31:53 +00:00
Melanie 490c093636 Just make it compile :) 2009-12-27 02:11:25 +00:00
Melanie 982e3ff5d9 Presence Step 1 2009-12-27 01:27:51 +00:00
Melanie 984d5b0de6 Add "shutdown" command to ROBUST shell 2009-11-30 14:15:00 +00:00
Melanie 06ecdf1967 Tweak presence handling and whip up a database connector and handler
for testign the new generic table handling
2009-11-18 08:21:28 +00:00
Melanie 02680cda42 Add the presence server connector 2009-11-17 02:22:15 +00:00
Melanie b0923e0d73 Fix a glitch in a ROBUST message 2009-10-23 10:41:05 +01:00
Diva Canto 77b4abaa25 * Removed verbose debug message
* Restored HG inventory access which had been lost upon adding a 3rd argument to inventory and asset server handlers
* Fixed a stupid bug in the InventoryConnector which was making move items do things twice
2009-10-06 11:08:11 -07:00
Diva Canto 2753f4d62c * GridServerPostHandler.cs: Try/catch in Handle
* BaseOpenSimServer.cs: Added thread pool numbers in show threads
2009-10-05 16:06:21 -07:00
Diva Canto 282b752035 Minor change. 2009-10-05 13:14:14 -07:00
Diva Canto 9bd1353875 Fixed bug introduced in one of the last commits. 2009-10-05 12:13:38 -07:00
Diva Canto 05b80185b9 More debug to try to diagnose a problem with region registration. 2009-10-05 11:49:21 -07:00
Diva Canto 5f18a088a8 More error catching/outputting. 2009-10-05 11:14:46 -07:00
Melanie 6878b26b0d Merge branch 'diva-textures-osgrid' 2009-10-04 05:49:16 +01:00
John Hurliman 387e9f7a7f * Creates Util.UTF8 and switches some references of Encoding.UTF8 to Util.UTF8 (not all references were switched since not all OpenSim libraries reference OpenSim.Framework)
* Shrinks the largest in-memory object, the LLRAW.HeightmapLookupValue struct (only used for exporting to LLRAW terrain files), to the minimum possible size. This seems to have the odd side effect of cutting the size of the two double[256,256] terrain objects in half. Possibly an alignment optimization?
2009-10-02 18:31:08 -07:00
Melanie 31d8cec0f8 Merge branch 'master' into diva-textures 2009-10-02 08:23:38 +01:00
Jeff Ames 606e831ff5 Formatting cleanup. 2009-10-01 09:38:36 +09:00
Melanie 8d35cd9061 Remove more tests that don't apply to this build 2009-09-30 19:25:48 +01:00
Jeff Ames ee205e7e81 Formatting cleanup. 2009-10-01 01:17:47 +09:00
Melanie 1096103d66 Fix loading modules with alternate configurations and ports into ROBUST.
Make all current modules support the configuration name option
2009-09-29 09:44:12 +01:00
Diva Canto f4e8ac3556 Fixed a bug that was causing exceptions to the thrown in ROBUST MainServer. 2009-09-28 18:53:07 -07:00
Jeff Ames f00126dc2d Add copyright header. Formatting cleanup. 2009-09-29 08:32:59 +09:00
Melanie 0709149313 Merge branch 'grid-service-redux' 2009-09-28 23:03:47 +01:00
Melanie a1aa362866 Allow the notation config_name@port/dll_name:class_name as a handler spec
in OpenSim.Server.ini
This allows things like "8003/AssetServirce.dll local@8004/InventoryService.dll"
The config name is not yet supported by any modules
2009-09-28 22:48:57 +01:00
Diva Canto 276b0a0cbe Forgot a return statement. 2009-09-28 11:17:34 -07:00
Diva Canto 9bdb585a93 Added Protocol versions back, this time in a range model. 2009-09-28 10:56:05 -07:00
Melanie 0ed7371f3e Change DocToBytes to return no trailing whitespace. 2009-09-28 13:27:33 +01:00
Diva Canto 5d09c53a1a Unpacking the mess with OtherRegionUp, so we can have a real cache of the neighbours in the grid service modules. 2009-09-27 10:14:10 -07:00
Diva Canto f4bf581b96 Moved all HG1 operations to HGGridConnector.cs and HypergridServerConnector.cs/HypergridServiceConnector.cs, away from Region.Communications and HGNetworkServersInfo.
Fixed small bugs with hyperlinked regions' map positions.
2009-09-26 21:00:51 -07:00
Diva Canto dcfd08b8dd Fixed a bug with link-region. 2009-09-26 11:01:18 -07:00
Justin Clark-Casey (justincc) 0bdf75637f Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim 2009-09-25 19:19:01 +01:00
Diva Canto b2772b3a2d Added GridForm.html in Tests/Clients/Grid that shows how to interact with a grid server via regular Web forms. May be good for developing administrative tools. 2009-09-25 07:38:05 -07:00
Justin Clark-Casey (justincc) 730458be1f minor: remove some mono compiler warnings 2009-09-25 14:31:29 +01:00
Diva Canto 1faaa0a43a GridServerPostHandler finished. GridClient tests all work. More guards on getting parameters and replies over the wire. 2009-09-24 15:30:00 -07:00
Diva Canto dd3d52ae1f Added test GridClient, which allowed me to remove a few bugs out of the new code. 2009-09-24 13:33:58 -07:00
Diva Canto 2824bbc47b Changed name of the hyperlink XMLRPC method to linkk-region, so that it doesn't conflict with the existing one. 2009-09-24 05:48:35 -07:00
Diva Canto 67276589c8 Changed IGridService to use the new GridRegion data structure instead of old SimpleRegionInfo.
Added grid configs to standalones.
2009-09-23 17:20:07 -07:00
Diva Canto 882d2c9cc3 Added hg console commands to the module.
Added the IN connector module for link-region and corresponding handler to be used in the regions only. No service as such is needed.
This will replace the current link-region machinery. Compiles but not tested.
2009-09-22 20:25:00 -07:00
Diva Canto 34f4738159 Added HGGridConnector and related code. 2009-09-22 11:58:40 -07:00
Diva Canto 390137d540 Added grid handler and grid remote connector. 2009-09-21 11:05:01 -07:00
Melanie 2f624800d3 Adding the deserializer for server form/xml replies 2009-09-19 18:06:25 +01:00
Melanie 97ebdd4607 Adding Xml serialization of Dictionary<string, object> where object
is either another Dictionary<string, object> or a value that is
convertible to a string.
2009-09-19 16:57:15 +01:00
Rob Smart 281ad1251c updated the IAuthorizationService interface so that a message is passed back and can be displayed at the client when an avatar is denied access to a region 2009-09-16 10:04:07 -07:00
Diva Canto ce332f235c Changed the interface of IAuthorizationService to get less data. 2009-09-10 19:56:08 -07:00
Rob Smart b5c8925fdf added AuthorizationRequest and AuthorizationResponse objects for passing Authorization messages over http. Added handling code for these in the AuthorizationServerConnector and AuthorizationServicesConnector 2009-09-10 17:53:05 -07:00
Rob Smart 953ef780c5 adding in working functionality for the remote connector 2009-09-10 17:52:42 -07:00
Rob Smart 16940097be The stubs for an authorization service, at the moment the service will always grant access to an avatar entering the region if requested. 2009-09-10 17:51:28 -07:00
Melanie 11700ba4a4 Implement plain password authentication partway. Tested, but no user
functionality yet.
2009-09-04 07:03:43 +01:00
Melanie c9a24ece54 More work on new authentication service 2009-09-04 03:13:32 +01:00
Melanie 07e8907569 Remove another IAuthentificationInterface user 2009-08-30 03:27:09 +01:00
Melanie 5b06079a83 Remove a user of the old auth interface 2009-08-29 17:49:58 +01:00
Diva Canto b03eeeb9f6 * Fixes mantis http://opensimulator.org/mantis/view.php?id=4044. Turns out folders were never being removed from trash when they were singled out for purging in trash. They were being removed when Trash was purged as a whole. That behavior is now fixed for the new InventoryService set.
* Removed left-overs from AssetInventoryServer.
2009-08-22 10:24:26 -07:00
Diva Canto 3318652723 Added a more sane InventoryServerMoveItemsHandler. Changed SynchronousRestObjectRequester so that it also understands PUTs. 2009-08-21 11:00:45 -07:00
Diva Canto d519f1885f Added MoveItems, which is most useful upon viewer-delete inventory operation. Moving a batch of items is a 1-time operation. Made it async anyway, so that the viewer doesn't wait in case the DB layer is dumb (which is the case currently). 2009-08-19 10:56:08 -07:00
Diva Canto 4818d11b9d Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-08-19 00:31:51 -07:00
Diva Canto c5af39239f A better purge of trash folder. 2009-08-19 00:13:51 -07:00
Melanie 99c7a43ffd Add rest console support to the user server. Will ask new questions at
startup. To use, run it normally once, answering the questions, then
run again with -console=rest.
Also now supports -console=basic for a console that reads stdin
2009-08-19 04:39:02 +01:00
Diva Canto fa8a94577a Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim 2009-08-17 05:55:38 -07:00
Melanie 002940dd5d Filling in the blanks: The "meat" of the REST console 2009-08-17 05:00:30 +01:00
Diva Canto 034c9cf606 Added GetAssetPermissions. Few last bugs nixed. This is ready for testing. 2009-08-13 17:34:15 -07:00
Diva Canto 5246dc33dc Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' starting to get on my nerves. 2009-08-13 14:10:12 -07:00
Diva Canto 41839efcc5 Some more hammering on the head of the obsolete rest inventory handlers, just to make this work. 2009-08-11 14:52:17 -07:00
Diva Canto bd7ff803fe Re-adding a conditional in UserManager that was removed with arthusv's commit. Changing new inventory ops to POST. 2009-08-11 14:31:45 -07:00
Diva Canto e3dbd0e049 Added http handlers for the two new inventory operations. 2009-08-11 12:30:28 -07:00
Diva Canto 6a6dd66129 More removal of HG2 code, this time authentication module and handlers. 2009-08-09 14:21:47 -07:00
Diva Canto 53ba245967 HGAuthenticationService must be a singleton, because it has in-memory state. This makes this singleton register with IScene, so that other parts can retrieve its reference. 2009-08-06 18:43:53 -07:00
Justin Clark-Casey 190bdc8a2e * Remove some mono compiler warnings 2009-08-05 17:33:23 +01:00
Melanie 0f400dc83d Adding the plumbing for a ROBUST freeswitch service 2009-08-04 04:11:04 +01:00
Melanie Thielker ff35a3378e Make ROBUST not hang on exit in recent Mono versions. Make the logfile config
setting/commandline option actually work.
2009-07-31 21:00:09 +00:00
Justin Clarke Casey 5815162d7e minor: remove some mono compiler warnings 2009-07-15 20:49:58 +00:00
Justin Clarke Casey d89cf47d50 * Change server prompt from B.U.S.T to R.O.B.U.S.T, as per mailing list 2009-07-15 20:32:35 +00:00
Melanie Thielker 7b457805a3 Create a MainServer static class to access the regions server's HTTP server 2009-07-10 00:59:43 +00:00
Melanie Thielker 4badac3c90 Make a renamed OpenSim.Server.exe use the corret ini file, e.g.
renaming OpenSim.Server.exe to OpenSim.AssetServer.exe will cause
OpenSim.AssetServer.ini to be read by that instance. This facilitates legacy
usage
2009-07-07 21:23:11 +00:00
Melanie Thielker f10e53d167 Update prompt and make it settable from within the ini file 2009-07-07 20:45:29 +00:00
Melanie Thielker fe1e9ac5c3 Make the asset IN connector return HTTP 404 if an asset is not found, and
also make it return a non-xml content type so a browser can be used
for testing it.
2009-07-07 17:45:02 +00:00
Melanie Thielker 3bfd98eae7 Committing the basic universal server Technology (B.U.S.T.) 2009-07-07 16:21:51 +00:00
Jeff Ames 142b481e03 Update svn properties. 2009-06-22 10:07:27 +00:00
diva ce7de3581c Implementation of a simple authentication service + in connector in route to making HGInventory (client access) work in standalone again. This is the refactoring of what was/is there, but done in the new model. Not complete yet, but key authentication works. It should be enough to make HGInventory work again soon. 2009-06-17 03:52:39 +00:00
diva 380f59d0ff Factoring out "land_data" / RequestLandData that was hanging off of IGridServices, erroneously. Not sure when this is used, but now it is implemented in the new model of service connectors. Hopefully it works. 2009-06-14 23:00:23 +00:00
Jeff Ames 8d0eb3307f Update svn properties. 2009-06-14 21:37:50 +00:00
diva 7a9c85526c Pulled out HelloNeighbour into its own service, INeighbourService, which may get more functions as we go along. It's a very simple service and service connectors, and it served primarily to establish the design of services that dependent on Scenes and that must always have a local connector. More refactoring coming, as this showed how to do it right. 2009-06-14 15:35:09 +00:00
diva 2afd733229 Fixes mantis #3803. Thanks jhurliman. 2009-06-11 20:27:13 +00:00
diva 0f367bd7bb Heart surgery no.2: the inventory service hooks.
Several improvements in the connectors themselves.
Several improvements in configurations.
Needed to add a hack in IUserService and UserManagerBase, to be removed when that service is refactored.
2009-06-10 13:18:32 +00:00
Jeff Ames 135ff63c3d Update svn properties. 2009-06-09 17:48:22 +00:00
diva b43fc318fb That didn't quite work. Trying this instead -- prompt given in the cmd line. 2009-06-08 17:50:17 +00:00
diva 71c8346f78 Making the prompt configurable in the server shell. Default is "Server". 2009-06-08 17:34:42 +00:00
diva 9216f4b7c2 First draft of the inventory service IN connector. Probably won't work yet. But everything of inventory service is now checked in, first draft. 2009-06-08 03:16:55 +00:00
Jeff Ames c6cef4bad5 Comment out unused variables / private fields to avoid compiler warnings. 2009-06-04 03:58:04 +00:00
Jeff Ames 2a855a6457 Comment out unused private functions to avoid compiler warnings. 2009-06-04 01:37:31 +00:00
Melanie Thielker 6e494e5de5 Committing the partial refactor of authentication services. No user functionlity
will eat your babies, etc
2009-06-03 19:49:26 +00:00
lbsa71 8e011ecbbb * Removed some commented-out code 2009-06-01 20:17:10 +00:00
Jeff Ames 840de6c036 Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt. 2009-06-01 06:37:14 +00:00