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
Justin Clark-Casey (justincc)
aab2b032aa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-04-09 22:45:00 +01:00
Justin Clark-Casey (justincc)
8e04c752fc
If OpenSimulator is writing a PID file and finds the file already present on startup, logging an error since this is commonly due to an unclean shutdown.
...
Unclean shutdown can cause constantly moving objects to disappear if an OAR has just been loaded and they have not reached persistence time threshold, among other problems.
2013-04-09 22:38:47 +01:00
Robert Adams
4d2203ff52
BulletSim: Add dylib for BulletSim and add he who figured out building BulletSim
...
on a Mac to the CONTRIBUTORS file.
2013-04-08 09:15:20 -07:00
Jon Cundill
f68b963596
fixed bullet config for osx
...
Signed-off-by: Robert Adams <Robert.Adams@intel.com>
2013-04-08 09:09:30 -07:00
Robert Adams
99f39836a1
BulletSim: moving comments around. No functional change.
2013-04-08 06:27:45 -07:00
Robert Adams
a7a1b8b7e9
BulletSim: clean up actor code so routines use the same coding pattern.
...
Fix a few enabling problems.
2013-04-08 06:27:44 -07:00
Robert Adams
fe16dc09da
BulletSim: complete movement of physical object action code out of the
...
physical object and into actors for setForce, setTorque, hover, lock
axis and avatar move.
2013-04-08 06:27:43 -07:00
Mic Bowman
c7cd077e55
Optimize the number of Simian calls to get the initial presence
...
information for the friends list. This is a pretty big performance
improvement on login. Note that you must upgrade simian to incorporate
the corresponding GetSessions call.
2013-04-07 17:31:44 -07:00
Justin Clark-Casey (justincc)
7f070236f7
Fix taking (and rezzing) of coalesced objects in the non-root subregions of megaregions.
...
This fixes the combined bounding box location for regions bigger than 256x256.
It also fixes the position on taking coalesced objects in the non-root regions, where position checks are properly done on rez instead.
It also fixes the megaregion land channel to return null if the land does not exist, which should probably also be done for the ordinary land channels rather than returning a dummy region.
Inspiration from Garmin's commit in http://opensimulator.org/mantis/view.php?id=6595 . Thanks!
2013-04-06 02:34:51 +01:00
Justin Clark-Casey (justincc)
0f008d5f7d
When rezzing a coalesced object, check adjust position of all components.
2013-04-06 01:44:06 +01:00
teravus
d2367968e4
* In between the fog, a moment of clarity. This fixes mantis 6570
2013-04-04 19:10:23 -04:00
Melanie
c6b0942f97
Merge branch 'master' into careminster
2013-04-05 00:03:33 +01:00
Melanie
6a5f6ac04e
Merge branch 'master' into careminster
2013-04-04 03:17:57 +01:00
Melanie
967b523f49
Merge commit 'f281a994e8544d95961ef669a0fe14c0cba7f175' into careminster
2013-04-04 03:17:52 +01:00
Melanie
b16a560b77
Merge commit '94d44142e37a9191162a426f28dd23f40b0cf4aa' into careminster
2013-04-04 03:17:38 +01:00