Commit Graph

23836 Commits (56f4adeb60622aaec687f3a6699a03c964f59d5b)

Author SHA1 Message Date
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 9b67027841 Merge branch 'master' into careminster 2013-04-25 00:25:09 +01:00
Melanie 6f3c905744 Add Avination's support for parcel eject and freeze 2013-04-25 00:24:48 +01:00
Melanie d36a52ea55 Merge branch 'master' into careminster 2013-04-25 00:22:28 +01:00
Robert Adams 1593d795ea BulletSim: version of libBulletSim.so for 32 bit systems that doesn't
crash on startup. Doesn't yet solve the new glibcxx dependencies.
2013-04-24 15:01:11 -07:00
Diva Canto 1868680848 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-24 12:46:23 -07:00
Diva Canto 70081a40a4 Bug fix: compare tolower. This should fix the issue where HG visitors currently in the region were not being found by the avatar picker window. 2013-04-24 12:45:19 -07:00
Robert Adams c22a2ab7d2 BulletSim: partial addition of BSShape class code preparing for
different physical mesh representations (simplified convex meshes)
and avatar mesh.
2013-04-24 08:05:42 -07:00
Robert Adams e324f6f3f0 BulletSim: update DLLs and SOs to they have no dependencies on newer
glibc (2.14) since that is not yet in some Linux distributions.
Add unmanaged API calls and code for creating single convex hull shapes.
2013-04-24 08:03:45 -07:00
Robert Adams 522ab85045 BulletSim: improve avatar stair walking up. Add more parameters to control force
of both position change and up force that move avatars over barrier.
Default parameters are for steps up to 0.5m in height.
2013-04-23 18:31:12 -07:00
dahlia ed22014646 revert CSJ2K.dll to version in use prior to commit d4fa2c69ed 2013-04-23 15:01:20 -07:00
Justin Clark-Casey (justincc) 115e0aaf83 Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if any number of avatars other than 1 was in the region.
I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
2013-04-23 21:55:51 +01:00
Robert Adams e1ac683154 BulletSim: fix crash when deleting llVolumeDetect enabled objects. Bullet's check for an object being linked into the world does not work for Bullet's ghost objects so BulletSim was deleting the object while it was still linked into the physical world structures. 2013-04-22 16:50:06 -07:00
Melanie 293a024c14 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:39:08 +01:00
Melanie 8b57ee4fd1 Merge branch 'master' into careminster 2013-04-22 22:38:58 +01:00
Melanie 3e818eaeb5 Add the enter uuid dialog 2013-04-22 22:58:33 +02:00
Melanie 671a97ef76 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-04-22 22:28:41 +02:00
Melanie a7a92e7339 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 2013-04-22 22:26:04 +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
Diva Canto 6ddc39a676 Clean up unused config and config comments. 2013-04-21 16:56:18 -07:00
Melanie 231c298ca5 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	bin/OpenMetaverse.StructuredData.XML
	bin/OpenMetaverse.XML
	bin/OpenMetaverseTypes.XML
2013-04-21 14:11:39 +01:00
dahlia 46e4ecadc8 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-04-21 00:21:42 -07:00
dahlia 69f07fdb34 Materials persistence via SceneObjectPart.dynAttrs. This appears to work across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving. 2013-04-20 23:39:07 -07:00
BlueWall 855c88a9c0 Fix spelling 2013-04-20 11:57:11 -04:00
BlueWall f40abc493a Small fix to prebuild xml for building with mono tools 2013-04-20 11:54:05 -04:00
dahlia 233f761779 handle PUT verb for RenderMaterials Cap 2013-04-20 02:08:22 -07:00
dahlia 258804cc04 RenderMaterials POST Cap now return material entries when invoked with an OSDArray of MaterialIDs 2013-04-19 22:19:57 -07:00
dahlia 9ae24cac2f Materials-capable viewers send ImageUpdate packets when updating materials that are normally sent via RenderMaterials CAP. This can cause a race condition for updating TextureEntry fields. Therefore filter any TextureEntry updates so they only update if something actually changed. 2013-04-19 00:35:06 -07:00
dahlia 06829c4082 remove default parameter value that apparently mono cant handle 2013-04-18 01:29:50 -07:00
dahlia d5419f0a46 Initial experimental support for materials-capable viewers. This is in a very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet. 2013-04-18 01:03:19 -07:00
dahlia 7c839f176f amend previous commit, a line was left out 2013-04-17 23:14:28 -07:00
dahlia 53122fad40 Thanks lkalif for a fix to SendRegionHandshake() which fixes a potential crash with Server-side baking enabled viewers 2013-04-17 23:10:02 -07:00
dahlia ce043c5141 Allow changes to TextureEntry to propagate to viewers when MaterialID changes 2013-04-17 22:41:12 -07:00
dahlia d4fa2c69ed update libomv to git master which adds support for MaterialID in TextureEntry 2013-04-17 21:31:18 -07:00
Melanie d3f288e27b Merge branch 'master' into careminster 2013-04-16 22:37:47 +01:00
Justin Clark-Casey (justincc) c5de9840b0 refactor: Remove IClientNetworkServer.NetworkStop() in favour of existing Stop().
This was an undocumented interface which I think was for long defunct region load balancing experiments.
Also adds method doc for some IClientNetworkServer methods.
2013-04-16 21:58:24 +01:00
Melanie 7cf377fff0 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Data/MySQL/MySQLAssetData.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-04-10 13:20:55 +01:00
Robert Adams 5f2cbfc0fd BulletSim: fixing problems with llMoveToTarget. Not all fixed yet. 2013-04-09 18:00:29 -07:00
Robert Adams b53713cdda BulletSim: some formatting changes. 2013-04-09 18:00:27 -07:00
Vegaslon 9cc41d5118 Another algorithm for AngularVerticalAttraction. This one Takes into account all rotations before it and makes the corrections more close to the time that sl does.
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-04-09 18:00:25 -07:00
Robert Adams 59135c9a31 BulletSim: add Bullet HACD library invocation. Turned off by default as not
totally debugged. Updated DLLs and SOs with more debugged HACD library code.
2013-04-09 18:00:23 -07:00
Robert Adams 17fd075f39 BulletSim: fix problem where large sets of mega-regions weren't registering
all the terrain with the base region.
2013-04-09 18:00:20 -07:00
Justin Clark-Casey (justincc) 148e46563f minor: fix mono compiler warning in ScriptsHttpRequests.cs 2013-04-10 00:07:58 +01:00
Justin Clark-Casey (justincc) 29e28f4b84 minor: remove mono compiler warnings in InventoryAccessModule 2013-04-10 00:05:03 +01:00
Justin Clark-Casey (justincc) e20b0d5695 minor: Make exceptions thrown by MySQLAssetData more consistent. 2013-04-10 00:03:37 +01:00
Justin Clark-Casey (justincc) 06068444e2 Comment out rez perms logging I accidentally left in at 7f07023 (Sat Apr 6 02:34:51 2013) 2013-04-09 23:21:13 +01:00
Justin Clark-Casey (justincc) 659c741ff5 Add more notes to async_call_method relating to UnsafeQueueUserWorkItem
UnsafeQueueUserWorkItem is so called because it allows the calling code to escalate its security privileges.
However, since we must already trust this code anyway in OpenSimulator this is not an issue.
2013-04-09 23:15:01 +01:00
Justin Clark-Casey (justincc) 8690a08881 minor: Log an exception if we aren't able to delete a script state file rather than simply ignoring it.
This should never normally happen but if it does then it can be valuable diagonstic information.
2013-04-09 23:02:11 +01:00