Commit Graph

20268 Commits (f4d462eb5d970ccfc6213a9b915dd6c8c518ca9c)

Author SHA1 Message Date
Melanie 745a209bf2 Explicitly set uploaded mesh object perms 2013-06-10 01:16:22 +02:00
UbitUmarov 925a8d47eb Merge branch 'avination-current' into ubitwork 2013-06-08 19:19:51 +01:00
UbitUmarov 244f6fa5cd Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 2013-06-08 19:18:47 +01:00
Melanie 8582b2b992 Make objects attached from the ground appear in inventory again. Fixes a number
of interaction issues causing client crashes.
2013-06-08 02:32:05 +02:00
UbitUmarov ed7fe6239c add indexes for new visual parameters shape_hover and
APPEARANCEMESSAGE_VERSION. For reference only, this aren't used in sim for
now
2013-06-07 23:18:48 +01:00
Melanie 17a902fed4 Clean up poll service 2013-06-07 22:39:27 +02:00
UbitUmarov c173c2eed5 try to suspend and resume keyframes on copy to inventory to take copy
doesn't destroy state
2013-06-06 19:21:21 +01:00
UbitUmarov 8bfd5c8927 Merge branch 'avination-current' into ubitwork 2013-06-06 19:03:32 +01:00
UbitUmarov 18e4496d2d keyframe: add more locks, change timming stop, added Suspend and resume 2013-06-06 18:57:32 +01:00
UbitUmarov c5d967b946 Merge branch 'avination-current' into ubitwork 2013-06-06 00:37:06 +01:00
Melanie 57c8d82c9e Fix llTeleportAgentGlobalCoords 2013-06-02 23:53:20 +02:00
Melanie e2d4cb870e Unsit seated avatars when an object is deleted 2013-06-02 23:53:07 +02:00
Melanie bd87eb90d1 Implement PERMISSION_TELEPORT and the needed checks to make it work.
Old auth system still works as well.
2013-06-02 16:28:28 +02:00
UbitUmarov 8fe2308afc Merge branch 'avination-current' into ubitwork 2013-05-31 23:18:12 +01:00
Melanie 9589a09eda Fix multi-wear of alpha and tattoo layers. 2013-05-31 22:02:31 +02:00
Melanie 70d5c29310 Stop sending velocity to avoid snap-back 2013-05-31 21:55:56 +02:00
UbitUmarov 4709436a6c retouch prim stopped condition test 2013-05-29 20:23:52 +01:00
UbitUmarov a6b964aa11 removed spurius ref to ode.dll from odeapi 2013-05-29 19:51:45 +01:00
UbitUmarov d5b1baffec correction to previus comment: all parameters but gravity modifier have
efect on all prims.
2013-05-29 06:45:25 +01:00
UbitUmarov 269febc87e let gravity modifier, friction, restitution and density changes be applied
to prim. Only have efect on root prim. Density doesn't get effect
imediatly, only on next change of size or shape. density change
implies a full body rebuild to be done later, after reducing the  number
of sets sop does. Other parameters should work. **** mainly untested ***
2013-05-29 06:32:26 +01:00
UbitUmarov 1cf24b7092 make sure friction slip parameters are zero ( or other value ) and not
default cmf
2013-05-29 04:47:59 +01:00
UbitUmarov 0882846770 missing file 2013-05-29 02:21:02 +01:00
UbitUmarov f00ecf5fe7 missing files 2013-05-29 02:18:05 +01:00
UbitUmarov 4e72cf9ee2 *** DANGER TESTING **** changed prims mesh generation hopefully removing
spurius faces. CHanged several aspects. Fixed prims inertia that was too
low, still using box as model. Increased number of quickstep SOR
iterations to 15. Keep it 15 even on heavy load ( will only jump
simulation time).
2013-05-29 02:08:14 +01:00
Melanie a348c8e44a Allow Linden trees to preserve their type when taken into inventory and rezzed again. Allow Linden trees to be sensed by LLSensor as PASSIVE objects. 2013-05-26 14:11:48 +02:00
Melanie 0086c3b5fb Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency
This will require all money modules to be refactored!
2013-05-25 01:58:50 +02:00
Melanie 027580935a Reset "Show in search" on parcels cut off other parcels that are in search 2013-05-24 01:09:07 +02:00
Melanie 9ba35c6b7e Port fix from justicc - decouple pay prices on drag-copied prims 2013-05-24 00:45:30 +02:00
Melanie 4cb7ee47f2 Let the event queue do lees work - expire every 40s as per Teravus instead of every seconds - whoever put that in.... 2013-05-22 23:49:34 +02:00
teravus 477a5e3a35 * This fixes the avatar stuck in objects on login and teleport by gently applying an upward motion when stuck in things on the Z
* Comments describe how it filters out good, normal collisions, from 'stuck' collisions..   It's especially sensitive in feetbox collisions since this is where normal collisions happen under usual circumstances.
2013-05-14 20:55:56 -04:00
teravus 799ba5aa7b * Tweaks the hard cut to apply to collisions of Greater then Normal Z 0.95. This fits within Ubit's framework of multi-body collisions, just moves the reactive force to the Midboxgeom(actual detection) instead of the bigbox geom(pre detection) 2013-05-14 19:17:31 -04:00
Melanie f9daf921f7 Explicitly zero avatar velocity on sit 2013-05-13 03:29:11 +02:00
Melanie 296b43f597 Small adjustments to the floater module 2013-05-13 02:15:48 +02:00
Melanie 3f6071ce3a Guard against trying to access terrain heights out of bounds. Clamp to sim. 2013-05-11 16:16:02 +02:00
Melanie 8ade6fa617 Refactor to get closer to core 2013-05-11 16:15:39 +02:00
Melanie cbae04ba97 Remove dumb "Region found!" message from map search 2013-05-06 06:15:47 +02:00
Melanie a8faed6f76 Implement llSetContentType using the new OpenID auth support for authentication 2013-05-05 22:01:07 +02:00
Melanie 2332453974 Add RegionManager level and the ability to use literal XML to the dynamic floater module 2013-05-04 00:45:27 +02:00
Melanie 4904d40138 Add llGetPhysicsMaterial 2013-05-04 00:44:47 +02:00
Melanie d982d24938 Fix the long standing bug of items being delivered to lost and found or trash when takig copy.
This bug was recently aggravated through the perms changes required for the
export permission.
2013-05-01 21:42:51 +01:00
Melanie 958a500692 Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current 2013-04-30 23:40:06 +02:00
Melanie 0af1d8fe19 Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list.
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
2013-04-30 23:35:59 +02:00
Justin Clark-Casey (justincc) 5a4cb539d2 Fix bug where an agent that declined an inventory offer and subsequently emptied their trash would make the item invalid in the giver's inventory
This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy.
2013-04-30 01:25:21 +01:00
Melanie 4275d7a839 Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster into avination-current
Conflicts:
	bin/Regions/Regions.ini.example
2013-04-28 19:03:39 +02:00
Melanie 3fcac2ba7b Controller module for dynamic floaters (WIP) 2013-04-27 01:20:03 +02:00
Melanie 40036ca05f Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID.
Sending the reply requires having the IClientAPI.
2013-04-25 21:37:40 +01:00
Diva Canto 2093d87e20 Make the kicked user's avie truly disappear when it's god-kicked. 2013-04-25 02:48:49 +01:00
Melanie 3934b779b8 Adding the dynamic menu module which allows registering new menu options in compliant viewers 2013-04-25 01:39:22 +02:00
Melanie e39156c656 Send 503 when throttling textures 2013-04-25 01:38:21 +02:00
Melanie 51e05dcb5b Gods module cleanup 2013-04-25 01:37:18 +02:00
Melanie 6571e7ead2 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:24:41 +02:00
Melanie ae833af3a9 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2013-03-31 20:56:13 +01:00
Melanie f142e1f394 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-03-31 20:27:46 +02:00
Melanie 4bf9c4bbb8 Export permission, part two. Setting export perms for textures and clothing works. Setting perms for prims also works but they don't propagate correctly yet.
NOT FOR PRODUCTIN USE. Your database will need to be updated before you can use this!
2013-03-31 20:25:32 +02:00
Melanie 64a56059b1 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-30 21:19:10 +00:00
Justin Clark-Casey (justincc) 9fee431cc8 In the flotasm asset cache, if we get a request for a file that we're actively writing, simply return null instead of first logging an exception. 2013-03-30 01:21:16 +00:00
Justin Clark-Casey (justincc) f8785b5f47 refactor: rename ETM.InformClientToInitateTeleportToLocationDelegate to InformClientToInitiateTeleportToLocationDelegate to correct spelling and bring into line with other ETM Initiate methods 2013-03-30 00:29:52 +00:00
Justin Clark-Casey (justincc) 76629289f0 refactor: move the append magic number processing for attachments back up into RezSingleAttachmentFromInventory from RezSingleAttachmentFromInventoryInternal() done in commit 023faa2 2013-03-29 23:59:21 +00:00
Kevin Cozens cbc9ae898c Added missing functionality (mainly custom headers) to llHTTPRequest. 2013-03-29 23:32:11 +00:00
Melanie d5d6a274a7 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-03-29 23:28:47 +00:00
Justin Clark-Casey (justincc) 023faa227e Check viewer 2/3 attachment calls against avatar appearance attachment data rather than actually attached objects
By checking against the grid's Avatar data, we can ignore viewer side attachments but still initiate these calls simulator-side.
Initiating simulator-side is always necessary for version 1 viewers.
This is a further commit to resolve http://opensimulator.org/mantis/view.php?id=6581
2013-03-29 23:10:28 +00:00
Melanie f2f8248178 Merge commit '23ae4c0a4d813763bcc39db7693850a21727d7f2' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 02:42:47 +00:00
Justin Clark-Casey (justincc) 23ae4c0a4d Fix bug where CHANGED_REGION and/or CHANGED_TELEPORT weren't firing for scripts in attachments.
This was because the script resumption in AttachmentsModule was firing the attach event instead.
Had to reinstate the code in 285bd3a do we can resume the scripts there instead, though the bug existed before its removal.
This is to resolve http://opensimulator.org/mantis/view.php?id=6578
2013-03-29 02:21:38 +00:00
Melanie e9eb837347 Merge commit 'e89bcf4f773d95492b168376599f7530a6044e8f' into careminster 2013-03-29 02:21:20 +00:00
Melanie 3696a668a8 Merge commit '4dfffa1df325c4b27a79e995585696cc20b6d905' into careminster 2013-03-29 02:21:06 +00:00
Melanie 7d466d36a3 Merge commit 'd87ddf50fcd674fbd9aa8b8556bf57f2d285a3ba' into careminster 2013-03-29 02:20:47 +00:00
Melanie e7d76c91c2 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 02:19:12 +00:00
Melanie 05810e48b0 Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2013-03-29 02:15:47 +00:00
Melanie c93f67b632 Merge commit '2b142f2f9e888d5cb7317cc51c12ac7152c54459' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
2013-03-29 01:58:57 +00:00
Melanie 73710413cd Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminster 2013-03-29 01:52:58 +00:00
Melanie 7d5eadf753 Merge commit '03e421bf3d796bf3498f4f3311c59ce04fb1fea1' into careminster 2013-03-29 01:52:45 +00:00
Melanie 6954024fb2 Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminster 2013-03-29 01:52:29 +00:00
Melanie abe885b3fe Merge commit '3b377f16b29a6395d73af1cc987cb9abf9935376' into careminster 2013-03-29 01:52:18 +00:00
Melanie 120903efb6 Merge commit 'c2093ccce16cd5210c8e0759f23b5b4bd205b7af' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-03-29 01:50:34 +00:00
Justin Clark-Casey (justincc) e89bcf4f77 Revert "Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way."
Unfortunately fails on Nebadon's system right now.  Needs investigation.  May put in a temproary option for experimentation soon.

This reverts commit d87ddf50fc.
2013-03-29 01:34:31 +00:00
Justin Clark-Casey (justincc) 4dfffa1df3 Add Location (relative), Rotation (Relative) and Rotation (World) to "show part" and other related console commands 2013-03-29 01:31:37 +00:00
Justin Clark-Casey (justincc) d87ddf50fc Try eliminating the pause before auto-reteleporting for a megaregion now that we're telepoting in a different way.
On my own system, I can now eliminate the pause entirely and the reteleport happens whilst the teleport screen is still up.
Trying this change to see if this is true for other people.
2013-03-29 01:16:29 +00:00
Melanie 4cb8967f0a Merge commit '6a9630d2bdc27ed702936f4c44e6978f728a9ef0' into careminster 2013-03-29 01:08:33 +00:00
Justin Clark-Casey (justincc) 285bd3abc8 Eliminate code which tries to restart attachment scripts in ScenePresence.MakeRootAgent(), since this is already done in AttachmentsModule 2013-03-29 00:49:55 +00:00
Justin Clark-Casey (justincc) c92654fb43 Stop attempts to update/add existing attachments in user inventory when teleporting between regions.
This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
2013-03-28 23:57:35 +00:00
Justin Clark-Casey (justincc) 2b142f2f9e Add "debug attachments" console command to allow highly verbose attachment logging to be switched on and off.
Default is off.
2013-03-28 23:09:35 +00:00
Justin Clark-Casey (justincc) feffc8081d minor: remove some mono compiler warnings from EntityTransferModule 2013-03-28 22:56:30 +00:00
Justin Clark-Casey (justincc) 03e421bf3d minor: comment out unused Scene.AgentCrossing() to reduce code complexity 2013-03-28 22:55:13 +00:00
Justin Clark-Casey (justincc) 4ad9b27530 If the viewer has already rezzed any attachments itself, then ignore the simulator-side rez attachments call.
This is a further effort to reduce v3 viewer race conditions where this call may clash with the viewer signalling attachment wearing from its current outfit folder.
2013-03-28 22:51:59 +00:00
Justin Clark-Casey (justincc) 3b377f16b2 Fix regression tests by making a new NPC always trigger simulator side attachment code when created.
Regression from previous commit c2093ccc.  Failed because NPCs don't set the ViaLogin flag
2013-03-28 22:44:59 +00:00
Justin Clark-Casey (justincc) e97567e227 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-28 22:35:24 +00:00
Justin Clark-Casey (justincc) c2093ccce1 Move the simulator-side RezAttachments call on login to SP.MakeRootAgent with the other attachments code, using TeleportFlags.ViaLogin check to fire if necessary.
This is to simplify the code (no tricky 'wasChild' signalling required)
and to reduce the risk of a thread clash between simulator-side attaching (necessary for v1 viewers)
and the viewer-side attaching the v3 viewers perform.
2013-03-28 22:07:58 +00:00
Robert Adams 6a9630d2bd BulletSim: fix race condition when creating very large mega-regions.
The symptom was exceptions while creating physical terrain.
Reduce default terrain mesh magnification to 2 from 3 because the
higher resolution uses a lot of memory and doesn't solve the terrain
smoothness for vehicles.
Added comments here and there and improved some debugging log messages.
2013-03-28 10:59:18 -07:00
Robert Adams 3f9b274180 BulletSim: tweaks to terrain boundry computation. No functional changes. 2013-03-28 10:59:16 -07:00
Justin Clark-Casey (justincc) 9ca54d00d8 Add back a log message when we attempt a megaregion auto-reteleport 2013-03-28 02:29:34 +00:00
Melanie f548a41fb8 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
2013-03-28 02:29:07 +00:00
Justin Clark-Casey (justincc) afd0d6af07 minor: Only try to deregister stats in EntityTransferModule.RemoveRegion() if module was enabled. 2013-03-28 02:23:09 +00:00
Justin Clark-Casey (justincc) d9c049fd9f Fix a bug in HGEntityTransferModule to call base.RemoveRegion() when a region is removed rather than base.AddRegion() 2013-03-28 02:20:43 +00:00
Justin Clark-Casey (justincc) b05ed4ffa6 Instead of going via GodLikeRequestTeleport, auto-teleport the agent directly in a megaregion, in the same manner at the "teleport user" console command.
This is to bypass an issue with the HGLureModule which stops the auto-teleport from happening.
2013-03-28 02:17:32 +00:00
Justin Clark-Casey (justincc) 506d5e41bf On the North and East sides of a megaregion, only consider regions within 256m to be neighbours rather than regions up to 512 distant.
This looks like an off-by-one bug since the view distance was already only 256 on the west and south sides.
This reduces the number of child agents being logged into regions neighbouring a megaregion.
2013-03-28 01:54:11 +00:00
Justin Clark-Casey (justincc) 617637c788 minor: Fix usage error message for "debug eq" console command 2013-03-28 01:41:41 +00:00
Justin Clark-Casey (justincc) b5b01e5bb5 Make HGLureModule track god like lures as well as normal lures, to see if this fixes issues where second megaregion auto-teleport hangs on black teleport screen when HG is active. 2013-03-28 01:37:52 +00:00
Justin Clark-Casey (justincc) 876d0d310f Add "show eq" console command to show numbers of messages in agent event queues.
For debugging purposes.
2013-03-28 01:36:34 +00:00
Justin Clark-Casey (justincc) f32027f3b5 Remove some Console.WriteLines accidentally left in last commit cfb20f09 2013-03-28 01:08:47 +00:00
Justin Clark-Casey (justincc) cfb20f09a9 refactor: combine the checks for megaregion view range into a single place. 2013-03-28 00:57:43 +00:00