ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-04 08:06:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
21,200 Commits 5 Branches 88 Tags
90de9df3e83bc0573589d77a20ccfdbda2d6d7e5
Commit Graph

1182 Commits

Author SHA1 Message Date
Diva Canto
0eaca7aafb Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-06-01 10:06:59 -07:00
Diva Canto
2ff9ea3f80 Fixed a few things pertaining to interfacing with the estate service. Specifically, StoreEstateSettings was not being used anywhere; instead EstatSetting.Save was being called, but that method is a trigger to the DB-layer code directly, which, besides being wrong, was making it impossible to replace the service with a remote connector. 
Also added more packing/unpacking code.
 2014-06-01 10:06:26 -07:00
Robert Adams
a2ea844494 Move the generation of the multi-resolution map tiles off the main 
region creation thread. For varregions or simulators with many regions,
this will speed up simulator startup and elimiate some thread timeout
warnings.
 2014-05-31 14:21:39 -07:00
Robert Adams
0300ec45eb Modifications to debugging printouts. No functional changes. 2014-05-31 12:19:51 -07:00
Diva Canto
d6f9f690e5 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2014-05-31 08:22:56 -07:00
Diva Canto
0eede1467f Moved these two estate-related interfaces to the projects where they belong. 2014-05-30 13:11:46 -07:00
Justin Clark-Casey (justincc)
c32ccfb520 minor: Comment out 2 error level debugging message in authentication code 2014-05-27 23:18:33 +01:00
Oren Hurvitz
1fa3a6f1bd When creating a new user, create the folders "Current Outfit", "Favorites", and the standard subfolders of "Calling Cards". 
(If we don't create them now then they'll be created later by the viewer, but why wait.)
 2014-05-25 15:34:49 +01:00
Diva Canto
20f20895cf Adds optional HTTP Basic Authentication to Robust service connectors. 2014-05-23 16:19:43 -07:00
Oren Hurvitz
47b84875fd Tell QueryAccess explicitly whether the user is coming in via Teleport or Cross, because the permission checks are different. 
Previously we used a heuristic of checking if the entry position is 0 to differentiate between Teleport and Cross, but that doesn't work anymore since we've started providing the precise entry position for cross, too. That's required in order to ensure that the user is allowed to enter the parcel that he's walking into.
 2014-05-19 11:19:11 +01:00
Oren Hurvitz
78733b979f Log the user when an inventory operation is blocked because the item/folder isn't in the Suitcase 2014-05-19 11:12:53 +01:00
Oren Hurvitz
dd30a29ba0 Return more specific error messages if an attempt to enter a region fails due to permissions (in QueryAccess and IsAuthorizedForRegion) 2014-05-19 11:11:30 +01:00
Justin Clark-Casey (justincc)
c23d37a509 Fix recent asset request timeout issue by commenting out (for now) the m_maxAssetRequestConcurrency mistakenly passed in as a timeout to SynchronousRestObjectRequester.MakeRequest() 
For a long time, possibly forever, the m_maxAssetRequestConcurrency was mistakenly passed in as a 30 ms timeout rather than as a concurrent connection limiter.
This didn't come to light until the timeout was actually used in recent commit faf9ba53
Since this hasn't been operational for a long time and in release candidate phase, commenting it out for now though will need to revisit this.
Relates to http://opensimulator.org/mantis/view.php?id=7165
 2014-05-14 00:11:07 +01:00
Oren Hurvitz
bf8f64e40e Fixed error if a user didn't have a "Current Outfit" folder in their suitcase. 
This fixes http://opensimulator.org/mantis/view.php?id=7161
 2014-05-12 08:54:31 +03:00
Justin Clark-Casey (justincc)
f41809e07d minor: Capitalize Hypergrid help category like others 2014-05-08 22:39:52 +01:00
Oren Hurvitz
df49196e17 Log whenever an inventory operation is blocked because the item/folder isn't in the Suitcase 2014-05-06 07:28:43 +01:00
Oren Hurvitz
0fe08c8799 - When sending the "My Suitcase" folder to the client, always claim it has Folder Type 8. (Previously we had used Folder Type -1 in one place, and LLClientView didn't even bother changing Folder Type 100 to anything else.) 2014-05-06 07:16:37 +01:00
Oren Hurvitz
88f7a833dc Improved HTTP logging 2014-04-29 07:59:17 +01:00
Oren Hurvitz
cb8c3ba023 Removed dependency on Linq in OpenProfileClient 2014-04-28 16:41:02 +01:00
Oren Hurvitz
0d898d8d8a Revert "When linking a Hypergrid region, set the region's flags on the in-memory GridRegion immediately." 
This reverts commit 463d0b2f8f.
 2014-04-24 19:08:50 +03:00
Oren Hurvitz
463d0b2f8f When linking a Hypergrid region, set the region's flags on the in-memory GridRegion immediately. 
(When using llTeleportAgent() this *specific* object is used for the teleport, so it should have the correct flags.)
 2014-04-24 16:58:16 +01:00
Oren Hurvitz
bc06db3df4 - Created a standard function to send XML-RPC requests, which logs them like we do for other types of HTTP activity. 
- Changed OpenProfileClient to use the new XML-RPC sending function
- Improved logging in WebUtil
 2014-04-24 15:58:43 +01:00
Oren Hurvitz
d62f0bc35d Refactored: moved OpenProfileClient to a location where it can be used by both the Simulators and Robust 2014-04-24 15:58:42 +01:00
Oren Hurvitz
d15a3b10a3 When sending JSON-RPC calls (for UserProfile), use WebUtil instead of constructing the HTTP requests manually. This allows the calls to be logged when using "debug http all 6". 2014-04-24 15:58:41 +01:00
Oren Hurvitz
6efc203ce8 Fixed: hypergrid-linking stopped accepting the following format: "http://grid.example.com" (without a region name) 
Fixes http://opensimulator.org/mantis/view.php?id=7128
 2014-04-24 06:19:57 +01:00
Oren Hurvitz
018832522c Removed GetUserInventory(). It wasn't being used, and was creating warnings because it's Obsolete. 2014-04-23 14:38:33 +01:00
Oren Hurvitz
998d7009a6 Eliminated many warnings 2014-04-23 16:37:36 +03:00
Oren Hurvitz
617bc4710a Workaround for SRAS: if Store Asset returns 'null' then assume the asset already exists, and this isn't an error 2014-04-23 14:19:24 +01:00
Oren Hurvitz
06db136fbc Removed an attempt to set a user's presence to "Region 0" when they HG teleport to another grid. 
a) This shouldn't have been done because at that point the user is still logged-in to the current grid. b) It's not necessary because the user will soon be logged-out completely. c) And it didn't even work because the MySQL database layer prevents setting the region to 0.
 2014-04-21 16:56:14 +01:00
Oren Hurvitz
acc2c42a79 Better logging in PresenceService, to help diagnose presence problems. 2014-04-21 18:55:53 +03:00
Oren Hurvitz
3f76f72137 Better error-handling when storing assets: recognize that 'null' is an error value 2014-04-20 06:23:38 +01:00
Oren Hurvitz
52f8669169 Stopped setting the Service URL "GatekeeperURI" on users' accounts. It isn't actually used. 2014-04-20 06:23:37 +01:00
Oren Hurvitz
e1dd228f18 Better error checking when creating hyperlinks: a) Reject invalid strings; b) Default port is 80, not 0 
The change of default port may fix http://opensimulator.org/mantis/view.php?id=7108 , where a user was able to create a Hyperlink to OSGrid from inside OSGrid.
 2014-04-13 09:54:56 +01:00
Oren Hurvitz
06e0528d0b In teleports, pass the source region to the destination (similar to an HTTP referrer) 2014-04-09 09:22:20 +01:00
Oren Hurvitz
cf1686335f Log when the presence service logs-out all the users in a region 2014-04-09 06:06:52 +01:00
Oren Hurvitz
e00f1a0410 Allow invalidating the users cache 2014-04-08 08:11:29 +01:00
Diva Canto
86105a1533 Better (amend to previous commit) 2014-04-07 19:51:26 -07:00
Diva Canto
c0fd09b445 Avoid calling HELO service on malformed URLs. This is in response to an exception reported by danbanner. 2014-04-07 19:41:25 -07:00
Oren Hurvitz
85d51e57a9 When sending QueryAccess to a region, also send the user's Home URI 2014-04-07 07:32:36 +01:00
Oren Hurvitz
abe0f4a088 When preparing a Hypergrid teleport, tell the receiving grid which user is entering the grid. 
This can affect which region to use. E.g., returning users may be allowed to enter any region, whereas users from other grids will have to enter a gateway region. Previously per-user decisions were only made later, but by then it's too late to change which region the user enters.
 2014-04-06 15:40:45 +01:00
Oren Hurvitz
6d2893be67 When teleporting using Hypergrid, show more informative error messages in case of error 2014-04-03 14:13:03 +01:00
Oren Hurvitz
d1c3f8eef5 Added assets service method AssetsExist(), which returns whether the given list of assets exist. 
This method is used to optimize sending assets with embedded assets: e.g., when a Hypergrid visitor takes an item into the inventory.
 2014-04-02 06:30:57 +01:00
BlueWall
ba5a236922 Profiles local StorageProvider fix, round 3 2014-03-27 13:41:20 -04:00
BlueWall
20640357ab Fix to local StorageProvider override 2014-03-27 13:27:46 -04:00
BlueWall
9c7b28341c Add support for specifying non-default StorageProvider 2014-03-27 12:36:30 -04:00
Justin Clark-Casey (justincc)
2fbb906ff6 Reinsert code to extract size_x and size_y parameters from GetHomeRegion response in UserAgentServiceConnector. 
This is actually code from commits afb2e07 and cf61cdf
For as yet unexplained reasons, the section of these commits which changed UserAgentServiceConnector.cs disappeared from its history between approx Feb 5 2014 and Feb 13 2014.
This ought to be impossible.  More details to follow in opensim-dev mailing list
 2014-03-26 02:34:22 +00:00
Oren Hurvitz
6a477e044d If prim region crossing fails then don't delete the prim from the original region 
Resolves http://opensimulator.org/mantis/view.php?id=6946
 2014-03-24 18:24:50 +01:00
Oren Hurvitz
0ff61341e4 HGAssetService searches for the "HomeURI" setting in several sections: Startup, Hypergrid, HGAssetService 
Resolves http://opensimulator.org/mantis/view.php?id=6940
 2014-03-24 18:02:22 +01:00
Oren Hurvitz
5b2af7f99e Moved the linkage between LoginService and HGInventoryService to the config file 2014-03-24 18:33:18 +02:00
Oren Hurvitz
df9845a283 When a user logs-in, automatically create the Suitcase folder 
This is only done if the Suitcase Inventory Service is used.
Previously the Suitcase was created at a later time, which meant that it wasn't shown in the viewer until the viewer was restarted.
 2014-03-24 17:02:13 +01:00