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
14f78c2e66
Merge branch 'ubitwork' into avination-current
2013-04-28 19:04:01 +02:00
ubit
61ea7ee5a9
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
bin/Regions/Regions.ini.example
2013-04-28 20:40:11 +02:00
ubit
7000b52aeb
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-04-28 19:46:57 +02: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
3e818eaeb5
Add the enter uuid dialog
2013-04-22 22:58:33 +02:00
Melanie
6571e7ead2
Allow callers to set the invoice parameter for GenericMessage
2013-04-22 22:24:41 +02:00
Melanie
4aa6f2bbba
Add the set object owner floater template
2013-04-22 22:23:42 +02:00
Robert Adams
84eb25da23
BulletSim: stop an avatar from moving if standing on a stationary
...
object. This will stop avatars from sliding down steep terrains
or objects while still allowing an avatar to be moved if standing
on a moving object.
2013-03-31 22:19:44 -07:00
Robert Adams
933ac60746
BulletSim: not quite functional axis lock code.
2013-03-31 22:19:43 -07:00
Robert Adams
7d50015a74
BulletSim: start the renaming of local variables to m_ form to match the OpenSim coding conventions.
2013-03-31 22:19:42 -07:00
Robert Adams
75b8cf428e
BulletSim: fix line endings in BSActor*
2013-03-31 22:19:42 -07:00
Robert Adams
747ece59d2
BulletSim: convert BSDynamic to a BSActor and change BSPrim to set
...
up the vehicle actor.
2013-03-31 22:19:41 -07:00
Robert Adams
2c581cae2a
BulletSim: Add physical 'actors' that operate on the physical object.
...
Add first 'actor' for locked axis.
2013-03-31 22:19:41 -07:00
Melanie
4bfc469584
Merge branch 'master' into careminster
2013-03-31 22:00:39 +01:00
Melanie
9b83e53b28
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 21:59:44 +01: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