3f703ae1cb
Merge branch 'master' into 0.8-post-fixes
2014-05-27 23:29:54 +01:00
c32ccfb520
minor: Comment out 2 error level debugging message in authentication code
2014-05-27 23:18:33 +01:00
9ca86664bb
Make RegionReady login disabled during initialization message a console messages instead of a warning message.
...
Same justification as earlier commit 996a6c2
2014-05-27 23:15:50 +01:00
464d31b70b
Stop appending redundant newline to console messages in Robust and pCampbot configs
...
This is to fix an issue since recent commit fbcb763
2014-05-27 20:44:00 +01:00
5622cf68aa
In compiler tests, remove the ResolveEventHandlers after test exit
2014-05-27 18:47:42 +01:00
394ec508f6
Make CompilerTest add same AssemblyResolver as XEngine to see if this solves the issue with different AppDomain BaseDirectory in local and Jenkins test runs
2014-05-27 18:37:16 +01:00
bcaacb4e41
Temporarily print regression TestCastAndConcatString() script compile errors out to console to get a handle on what's going wrong.
...
Does not fail for me locally and I failed to notice this test was failing on Jenkins.
2014-05-27 18:19:08 +01:00
d131c57978
Update regression TestInventoryDescendentsFetch() to account for recent commit 1fa3a6f
...
This was hidden in continuous integration because of another regression test issue.
2014-05-27 18:14:36 +01:00
987c56984d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-27 10:13:43 -07:00
e19c830a6c
Fixes a bug where map search results pertaining to varregions would only send the SW-most corner of the varregions; the other areas, when clicked, would result a blue circle, meaning that the viewer didn't know about those areas. This is still not quite right, as all the areas appear to be in the same coordinates, but it's good enough for now.
2014-05-27 10:13:24 -07:00
fab0389cb1
BulletSim: add locking of PhysObjects while processing simulation
...
step updates and collisions. This is an attempt to fix a crash reported
by Justin when doing high velocity teleports.
2014-05-26 20:29:45 -07:00
d2877b9cd4
Don't report NPC presences.
2014-05-26 10:28:31 -07:00
b778bd9423
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-26 08:14:34 -07:00
449548d7a4
Adds an optional redirect URL to the asset server handler for when assets are not found locally.
2014-05-26 08:13:49 -07:00
33cc847c4a
When saving an OAR in "Publish" mode, also discard Group information
2014-05-26 15:33:13 +01:00
5aeaa7fcdd
Prevent login to a region if the Telehub or Landing Point are in a banned parcel
2014-05-25 15:37:28 +01:00
e68867c9b6
When taking an object into inventory, set the inventory item's "Next Owner" permissions according to the permissions of the items in the object
2014-05-25 15:35:00 +01:00
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
ff9da24465
Added HTTP Authentication also to Groups and offline IM.
2014-05-23 17:31:39 -07:00
227685bea4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-23 16:20:04 -07:00
20f20895cf
Adds optional HTTP Basic Authentication to Robust service connectors.
2014-05-23 16:19:43 -07:00
9bae636ff0
Fix issues where reported LSL compiler error line numbers do not match the script.
...
This is probably due to changes in the layout of the generated script preamble (using statements etc, ) in c8afc852
2014-05-24 00:12:23 +01:00
cf95b65c10
Get regression test TestUseUndeclaredVariable() functional again, though not yet enabled.
...
This reveals the position map problems and will make the fix (and subsequent continual checking) easier.
2014-05-23 22:29:47 +01:00
250ea09328
Reactivate regression test TestCastAndConcatString() in CompilerTests.
2014-05-23 22:12:49 +01:00
b3a496d6f2
Add mikemig to contributors
2014-05-23 21:13:37 +01:00
f55e153636
Compile the regex that extract categories for colourization just once rather than on every single log.
...
Compiling every time is unnecessary since Regex is thread-safe.
2014-05-23 21:09:48 +01:00
fbcb76383d
Allow console output to be multiline by making colourization regex RegexOptions.SingleLine
2014-05-23 20:57:50 +01:00
72c67c5091
Fix possible infinite recursion in 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.
2014-05-23 20:14:49 +01:00
5015b0b485
If one is sitting on a child with an unset camera-eye and so using one set in a root prim, the focus should remain on the root prim.
...
Matches behaviour just tested on the Linden grid.
2014-05-23 01:55:05 +01:00
c78a8271c4
Add any camera at compensation for sat upon child prims to any existing camera-at value, rather than replace.
2014-05-23 01:38:05 +01:00
fbed245596
Compensate camera-at and camera-eye for child prim rotation when sitting on child prim with camera-eye set
2014-05-23 01:34:02 +01:00
174df94172
If a script calls llSetCameraAtOffset() or llSetCameraEyeOffset() on a child 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.
2014-05-22 23:58:28 +01:00
3fbaef9275
If the root prim has a camera-at or camera-eye setting and a sat upon child prim does not, use the root prim offsets.
...
This matches behaviour just tested on the Linden Lab grid.
2014-05-22 23:52:28 +01:00
16bf38e1ab
Fix issue where llSetCameraAtOffset() and llSetCameraEyeOffset() in non-root 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
2014-05-22 23:39:22 +01:00
f8b8241239
Add regression test for north-south chat across neighbour regions.
2014-05-22 20:28:26 +01:00
bffc9ad184
Extend regression TestInterRegionChatDistanceEastWest() to test out of range chat
2014-05-22 20:04:32 +01:00
15b50ae737
Extend regression TestInterRegionChatDistanceEastWest() to test in range chat both ways.
2014-05-22 19:55:34 +01:00
65a135f4d3
Simplify regression TestInterRegionChatDistanceEastWest() by making the child presence connection directly rather than routing through TestClient.
...
This code isn't relevant to this test and is already exercised by other tests.
2014-05-22 19:47:33 +01:00
1b156b7fe8
Add regression test for in-range chat between neighbouring regions from east to west.
2014-05-22 19:18:24 +01:00
b7c7293c7a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2014-05-22 10:16:19 -07:00
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
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
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
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
5b433e101d
minor: Comment out currently unused log setup in TerrainCompressor
2014-05-20 23:59:08 +01:00
d93275745b
minor: Remove some unused fields in ScenePresence
2014-05-20 23:57:03 +01:00
32070fa5f4
minor: remove compiler warning in SceneObjectPartInventory
2014-05-20 23:54:49 +01:00
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 beeec1chttp://opensimulator.org/mantis/view.php?id=7163
2014-05-20 23:52:07 +01:00
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
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