aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Added HTTP Authentication also to Groups and offline IM.Diva Canto2014-05-236-39/+55
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2014-05-2312-136/+472
|\
| * Fix issues where reported LSL compiler error line numbers do not match the ↵Justin Clark-Casey (justincc)2014-05-242-16/+16
| | | | | | | | | | | | | | script. This is probably due to changes in the layout of the generated script preamble (using statements etc, ) in c8afc852 (Jan 17 2013). Re-enabled existing regression test that exercises at least one case of this.
| * Get regression test TestUseUndeclaredVariable() functional again, though not ↵Justin Clark-Casey (justincc)2014-05-231-8/+19
| | | | | | | | | | | | yet enabled. This reveals the position map problems and will make the fix (and subsequent continual checking) easier.
| * Reactivate regression test TestCastAndConcatString() in CompilerTests.Justin Clark-Casey (justincc)2014-05-232-10/+18
| |
| * Compile the regex that extract categories for colourization just once rather ↵Justin Clark-Casey (justincc)2014-05-231-5/+7
| | | | | | | | | | | | than on every single log. Compiling every time is unnecessary since Regex is thread-safe.
| * Allow console output to be multiline by making colourization regex ↵Justin Clark-Casey (justincc)2014-05-231-1/+1
| | | | | | | | RegexOptions.SingleLine
| * Fix possible infinite recursion in ↵Justin Clark-Casey (justincc)2014-05-231-108/+56
| | | | | | | | | | | | | | | | | | MessageTransferModule.SendGridInstantMessageViaXMLRPCAsync() whilst preserving retry lookup behaviour. This is based on heavily mikemig's original patch in http://opensimulator.org/mantis/view.php?id=7149 but instead of exiting after the first IM delivery failure to presence information retrieved from the presence service it will retry the lookup until the result matches the previous lookup. This is to deal with the case where the agent is sent an IM whilst they are teleporting.
| * If one is sitting on a child with an unset camera-eye and so using one set ↵Justin Clark-Casey (justincc)2014-05-231-3/+7
| | | | | | | | | | | | in a root prim, the focus should remain on the root prim. Matches behaviour just tested on the Linden grid.
| * Add any camera at compensation for sat upon child prims to any existing ↵Justin Clark-Casey (justincc)2014-05-231-1/+1
| | | | | | | | camera-at value, rather than replace.
| * Compensate camera-at and camera-eye for child prim rotation when sitting on ↵Justin Clark-Casey (justincc)2014-05-231-0/+12
| | | | | | | | child prim with camera-eye set
| * If a script calls llSetCameraAtOffset() or llSetCameraEyeOffset() on a child ↵Justin Clark-Casey (justincc)2014-05-221-0/+6
| | | | | | | | | | | | prim and the root prim has no corresponding value set, then also set the root prim. This matches behaviour just tested on the Linden Lab grid.
| * If the root prim has a camera-at or camera-eye setting and a sat upon child ↵Justin Clark-Casey (justincc)2014-05-221-0/+7
| | | | | | | | | | | | prim does not, use the root prim offsets. This matches behaviour just tested on the Linden Lab grid.
| * Fix issue where llSetCameraAtOffset() and llSetCameraEyeOffset() in non-root ↵Justin Clark-Casey (justincc)2014-05-221-0/+4
| | | | | | | | | | | | | | | | prims moved camera/focus to wrong position. For non-root prim, eye offsets now need to be made relative to root prim if either camera-at or camera-eye are set. Probably a regression since November 2013 when all sits were made relative to root prim to match viewer expections (and fix other bugs). Addresses http://opensimulator.org/mantis/view.php?id=7176
| * Add regression test for north-south chat across neighbour regions.Justin Clark-Casey (justincc)2014-05-221-52/+133
| |
| * Extend regression TestInterRegionChatDistanceEastWest() to test out of range ↵Justin Clark-Casey (justincc)2014-05-221-11/+38
| | | | | | | | chat
| * Extend regression TestInterRegionChatDistanceEastWest() to test in range ↵Justin Clark-Casey (justincc)2014-05-221-17/+38
| | | | | | | | chat both ways.
| * Simplify regression TestInterRegionChatDistanceEastWest() by making the ↵Justin Clark-Casey (justincc)2014-05-222-8/+11
| | | | | | | | | | | | child presence connection directly rather than routing through TestClient. This code isn't relevant to this test and is already exercised by other tests.
| * Add regression test for in-range chat between neighbouring regions from east ↵Justin Clark-Casey (justincc)2014-05-224-1/+203
| | | | | | | | to west.
* | Adds optional HTTP Basic Authentication to Robust service connectors.Diva Canto2014-05-2343-116/+480
|/
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2014-05-2225-124/+292
|\
| * Fix mantis 6973. Prevent BOM being prefixed to message XML which was causing ↵AliciaRaven2014-05-221-2/+2
| | | | | | | | | | | | an exception when the service tried to read the data later on. Signed-off-by: Oren Hurvitz <orenh@kitely.com>
| * Store the Teleport Flags in the Circuit. This doesn't seem to be necessary, ↵Oren Hurvitz2014-05-221-0/+2
| | | | | | | | because everything has worked so far, but it's the right thing to do.
| * Allow map searches for regions that contain the characters "!+|"Oren Hurvitz2014-05-211-20/+24
| | | | | | | | 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.
| * minor: Comment out currently unused log setup in TerrainCompressorJustin Clark-Casey (justincc)2014-05-201-1/+1
| |
| * minor: Remove some unused fields in ScenePresenceJustin Clark-Casey (justincc)2014-05-201-3/+0
| |
| * minor: remove compiler warning in SceneObjectPartInventoryJustin Clark-Casey (justincc)2014-05-201-1/+1
| |
| * Fix issue where avatar and script chat could sometimes be heard from ↵Justin Clark-Casey (justincc)2014-05-201-3/+8
| | | | | | | | | | | | | | | | | | | | 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
| * On verbose groups messaging logging, count all operations in reported time ↵Justin Clark-Casey (justincc)2014-05-192-5/+5
| | | | | | | | when sending group messages, not just those after get group members and get presence status, as applicable
| * Split verbose groups messaging logging into its own setting separate from ↵Justin Clark-Casey (justincc)2014-05-192-26/+108
| | | | | | | | | | | | | | | | | | 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.
| * Fix recent regression from 77e7bbc where an attachment on a received group ↵Justin Clark-Casey (justincc)2014-05-194-5/+50
| | | | | | | | | | | | | | | | 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
| * Tell QueryAccess explicitly whether the user is coming in via Teleport or ↵Oren Hurvitz2014-05-197-12/+18
| | | | | | | | | | | | 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.
| * Log the user when an inventory operation is blocked because the item/folder ↵Oren Hurvitz2014-05-191-14/+14
| | | | | | | | isn't in the Suitcase
| * Return more specific error messages if an attempt to enter a region fails ↵Oren Hurvitz2014-05-194-17/+36
| | | | | | | | due to permissions (in QueryAccess and IsAuthorizedForRegion)
| * Better error-handling and logging in case User Profile requests failOren Hurvitz2014-05-192-12/+21
| |
| * When can't rez, show only one error message; not two. And show more specific ↵Oren Hurvitz2014-05-192-3/+2
| | | | | | | | error messages.
* | Fixed a problem with detaching attachments in situations where the user's ↵Diva Canto2014-05-224-9/+44
|/ | | | 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.
* Don't trigger ItemUploaded when no item has been uploaded.Diva Canto2014-05-181-6/+9
|
* Don't fetch assets from the server when doing simple inventory operations ↵Diva Canto2014-05-182-52/+29
| | | | like copy-paste items in inventory.
* BulletSim: adjust avatar step up parameters to better walk up smallRobert Adams2014-05-172-4/+4
| | | | | staircases. This change is required because of the change in the avatar default shape from the capsule to the rectangle.
* minor: eliminate now unnecessary string.Format in postgresql RetrieveGroups ↵Justin Clark-Casey (justincc)2014-05-151-1/+1
| | | | method
* Don't warn on not seeing [Groups] Robust section for core groups as this ↵Justin Clark-Casey (justincc)2014-05-151-2/+2
| | | | does not contain any mandatory parameters and won't be present on older installations.
* Escape find string in PgSQL core groups pluginJustin Clark-Casey (justincc)2014-05-152-3/+25
|
* Escape find string in MySQL core groups pluginJustin Clark-Casey (justincc)2014-05-151-1/+1
|
* On ScenePresence.MakeChildAgent(), reset the m_originRegionID as this is ↵Justin Clark-Casey (justincc)2014-05-141-0/+5
| | | | | | 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.
* Remove a race where the client's SP.CompleteMovement() thread could attempt ↵Justin Clark-Casey (justincc)2014-05-141-3/+6
| | | | | | | 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
* minor: Clean up and make consistent some log file messages in ↵Justin Clark-Casey (justincc)2014-05-141-6/+11
| | | | EstateManagementModule relating to RAW file uploading.
* Fix recent asset request timeout issue by commenting out (for now) the ↵Justin Clark-Casey (justincc)2014-05-141-10/+14
| | | | | | | | | 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
* Fix behaviour change in recent commit bbc1dc6 so that ↵Justin Clark-Casey (justincc)2014-05-131-5/+10
| | | | | | | | 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
* minor: Add some method doc to IMessageTransferModuleJustin Clark-Casey (justincc)2014-05-121-0/+18
|