Diva Canto
b7c7293c7a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-22 10:16:19 -07:00
Diva Canto
f7b2aa0f49
Fixed a problem with detaching attachments in situations where the user's asset server is not the same as the simulator's asset server. Unfortunately this still continues to be wasteful -- new assets are created every time an attachment is detached, but the process of storing the new asset goes through the InventoryAccess module, which does all sorts of checks regarding the users' inventory.
2014-05-22 10:16:01 -07:00
AliciaRaven
04aa13a086
Fix mantis 6973. Prevent BOM being prefixed to message XML which was causing an exception when the service tried to read the data later on.
...
Signed-off-by: Oren Hurvitz <orenh@kitely.com>
2014-05-22 13:16:14 +01:00
Oren Hurvitz
251b93d97e
Store the Teleport Flags in the Circuit. This doesn't seem to be necessary, because everything has worked so far, but it's the right thing to do.
2014-05-22 13:16:06 +01:00
Oren Hurvitz
a1b291c889
Allow map searches for regions that contain the characters "!+|"
...
These characters are used as placeholders for other characters: ": /". But we should search first for the exact string the user entered, and only if that fails then replace the characters and search again.
2014-05-21 07:39:23 +01:00
Justin Clark-Casey (justincc)
5b433e101d
minor: Comment out currently unused log setup in TerrainCompressor
2014-05-20 23:59:08 +01:00
Justin Clark-Casey (justincc)
d93275745b
minor: Remove some unused fields in ScenePresence
2014-05-20 23:57:03 +01:00
Justin Clark-Casey (justincc)
32070fa5f4
minor: remove compiler warning in SceneObjectPartInventory
2014-05-20 23:54:49 +01:00
Justin Clark-Casey (justincc)
9479f64778
Fix issue where avatar and script chat could sometimes be heard from anywhere in neighbouring regions.
...
This was due to a silent uint overflow in ScenePresence.UpdateChildAgent() corrupting child agent positions
when the child agent was in a region with a greater x or y map co-ord than the root agent region
Probably introduced in beeec1c
.
This still will not function properly with very high region map co-ords (in the millions) but other parts of the code don't handle this properly anyway.
Looks to address http://opensimulator.org/mantis/view.php?id=7163
2014-05-20 23:52:07 +01:00
Justin Clark-Casey (justincc)
5ec3429843
On verbose groups messaging logging, count all operations in reported time when sending group messages, not just those after get group members and get presence status, as applicable
2014-05-19 23:01:48 +01:00
Justin Clark-Casey (justincc)
77a331fce3
Add DebugMessagingEnabled = false to OpenSim.ini.example for consistency. Slightly simplify config comments.
2014-05-19 23:00:04 +01:00
Justin Clark-Casey (justincc)
b46be88db6
Split verbose groups messaging logging into its own setting separate from that of the groups module.
...
This is to allow us to get useful information on messaging without being overwhelmed by the rest of groups debug.
Enabled with [Groups] DebugMessagingEnabled = true in config (default false)
Or "debug groups messaging verbose true|false on the console" (similar to existing groups setting).
Done for both xmlrpc and V2 groups.
2014-05-19 22:45:17 +01:00
Justin Clark-Casey (justincc)
3a6f312484
Fix recent regression from 77e7bbc
where an attachment on a received group notice with XmlRpcGroups messaging did not appear in the user's inventory.
...
This was because the "session ID" when the message template was copied was always replaced with the group ID, whereas a notice requires this to be the notice ID.
Instead just copy the "session ID" as is - other callers already have this set properly so replacing with group ID was redundant anyway.
Relates to http://opensimulator.org/mantis/view.php?id=7037
2014-05-19 22:06:41 +01: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
Oren Hurvitz
882af7195c
Better error-handling and logging in case User Profile requests fail
2014-05-19 11:11:06 +01:00
Oren Hurvitz
96e5836b50
When can't rez, show only one error message; not two. And show more specific error messages.
2014-05-19 10:54:27 +01:00
Diva Canto
ab1472e5b7
Don't trigger ItemUploaded when no item has been uploaded.
2014-05-18 23:01:55 -07:00
Diva Canto
922f76a3a7
Don't fetch assets from the server when doing simple inventory operations like copy-paste items in inventory.
2014-05-18 07:49:01 -07:00
Robert Adams
0be9e3b079
BulletSim: adjust avatar step up parameters to better walk up small
...
staircases. This change is required because of the change in the
avatar default shape from the capsule to the rectangle.
2014-05-17 20:11:22 -07:00
Justin Clark-Casey (justincc)
4a74c4533c
minor: eliminate now unnecessary string.Format in postgresql RetrieveGroups method
2014-05-15 22:51:47 +01:00
Justin Clark-Casey (justincc)
d2c738fc09
Don't warn on not seeing [Groups] Robust section for core groups as this does not contain any mandatory parameters and won't be present on older installations.
2014-05-15 22:48:05 +01:00
Justin Clark-Casey (justincc)
6dc1b113d0
Escape find string in PgSQL core groups plugin
2014-05-15 22:45:01 +01:00
Justin Clark-Casey (justincc)
d32d25634d
Escape find string in MySQL core groups plugin
2014-05-15 22:09:37 +01:00
Justin Clark-Casey (justincc)
7c12dfe185
On ScenePresence.MakeChildAgent(), reset the m_originRegionID as this is currently being used as a flag to orchestrate destination simulator threads on teleport.
...
If not reset, it's possible that teleports back and forth between simulators may not restart scripts in attachments.
2014-05-14 22:08:06 +01:00
Justin Clark-Casey (justincc)
2f7539a25b
Remove a race where the client's SP.CompleteMovement() thread could attempt to restart attachment scripts before the source simulator's SP.UpdateAgent() thread had added them.
...
This commit changes the order of code so that attachments are re-added before the CompleteMovement() thread is released.
Relates to http://opensimulator.org/mantis/view.php?id=7148
2014-05-14 21:49:29 +01:00
Justin Clark-Casey (justincc)
0c0ee95bd8
minor: Clean up and make consistent some log file messages in EstateManagementModule relating to RAW file uploading.
2014-05-14 19:22:55 +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
Justin Clark-Casey (justincc)
4569c595bf
Fix behaviour change in recent commit bbc1dc6
so that SynchronousRestObjectRequester.MakeRequest() calls with no timeout specified use the default HttpWebRequest timeout as previously.
...
I mistakenly thought that that default request timeout was inifite rather than 100 seconds, restoring previously behaviour.
As per http://msdn.microsoft.com/en-us/library/system.net.httpwebrequest.timeout%28v=vs.100%29.aspx
Relates to http://opensimulator.org/mantis/view.php?id=7165
2014-05-13 22:21:20 +01:00
Justin Clark-Casey (justincc)
484aa72ff8
minor: Add some method doc to IMessageTransferModule
2014-05-12 23:49:37 +01:00
Justin Clark-Casey (justincc)
8ad29fc5c8
Make offline IM delivery to URL (pre recent Addons code) have a 10 second rather than infinite timeout.
...
This both signals a problem with the URL and eventually frees the thread, rather than hanging indefinitely with no information.
2014-05-12 23:42:47 +01:00
Justin Clark-Casey (justincc)
87e2668529
For XmlRpcGroups (Flotsam) module, when MessageOnlineUsersOnly = true, handle notices to offline users directly as known undeliverable messages rather than discarding or attempting delivery.
...
Offline notices can still be controlled with the [Messaging] ForwardOfflineGroupMessages setting.
Looks to address more of http://opensimulator.org/mantis/view.php?id=7037
Only for Flotsam now for testing, but if approach works should be possible with core offline notices as well.
2014-05-12 23:38:48 +01:00
Justin Clark-Casey (justincc)
515d373a8e
Add send group notice regression test for when MessageOnlineUsersOnly=true
2014-05-12 22:54:54 +01:00
Justin Clark-Casey (justincc)
bbc1dc6bce
Replace existing 0 timeout in internal overloaded SynchronousRestObjectRequester.MakeRequest() methods with proper Timeout.Infinite (-1) instead.
...
Triggered by recent faf9ba53
though this was wrong in the code before, it's just that we didn't actually try to set the timeout given.
2014-05-12 22:37:07 +01:00
Justin Clark-Casey (justincc)
8457044b2f
Eliminate subsequently unused scene finding in UndeliveredMessage() method of xmlrpc and core offline IM modules
2014-05-12 22:23:24 +01:00
Justin Clark-Casey (justincc)
19d8f05584
minor: eliminate unused UUID in xmlrpc GroupsMessagingModule.ProcessMessageFromGroupSession()
2014-05-12 22:15:01 +01:00
Justin Clark-Casey (justincc)
7db4336f1c
minor: Add method doc to SynchronousRestObjectRequester.MakeRequest() methods
2014-05-12 22:05:02 +01:00
Justin Clark-Casey (justincc)
faf9ba53fc
In SynchronousRestObjectRequester.MakeRequest<TRequest, TResponse>(string verb, string requestUrl, TRequest obj, int pTimeout, int maxConnections) actually set timeout on WebRequest if given.
...
Previously, we were doing nothing with this parameter.
No effect on current code since none of the 6 callers attempt to use the timeout.
2014-05-12 19:20:00 +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
Diva Canto
73891c7fd3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-09 11:06:33 -07:00
Diva Canto
667a272cce
This little sucker had evaded my attention forever. As a consequence some assets associated with foreign users were being missed.
2014-05-09 11:06:03 -07:00
Justin Clark-Casey (justincc)
f41809e07d
minor: Capitalize Hypergrid help category like others
2014-05-08 22:39:52 +01:00
Diva Canto
afb938e579
Fix test breakage
2014-05-08 11:30:45 -07:00
Diva Canto
a31393ba0b
Make the URL for texture redirects match the path of the resource that we use in OpenSim.
2014-05-08 11:18:17 -07:00
Diva Canto
a845c1a893
Finished implementing redirects in GetTexture.
2014-05-07 19:38:33 -07:00
Diva Canto
093705efd1
Delete extraneous console message in the Configger.
2014-05-07 17:19:57 -07:00
Diva Canto
f4cba27105
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-07 17:00:12 -07:00
Diva Canto
3db9b847bf
Allow Tools.Configger to take -inifile as argument
2014-05-07 16:59:11 -07:00
Justin Clark-Casey (justincc)
2b33677402
Add GridUserService service config to [UserAccountService] in Robust[.HG].ini.example so that home can be set for new users rather than always warning that it can't be set.
...
Code already exists to do this but forgot to put entry into config files a long time ago.
Thanks to AliciaRaven for the spot.
Relates to http://opensimulator.org/mantis/view.php?id=7155
2014-05-07 23:32:02 +01:00