91b70bf3fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2013-11-08 17:55:01 +00:00
ba203ed94f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-11-03 21:34:36 +00:00
2b069a3b1e
If the LSL state_entry() event definition contains any parameters, then generate syntax error as seen on the LL grid
...
This is done through the parser and so generates the same syntax error message if any parameters are wrongly specified for this event.
We were already enforcing event names in the parser.
This is only for state_entry so far as an initial test of the approach - appears to work correctly.
2013-11-02 00:39:12 +00:00
7faf286d00
add null check for jpeg2000 sculpt image decode failure. Note: the j2kDecodeCache folder should be cleared after updating to this revision so that sculpts containing alpha can be re-decoded and successfully meshed.
2013-11-01 13:45:09 -07:00
ce94f990bb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-01 01:42:43 -07:00
f4ded3af63
discard alpha in 4-plane sculpt textures before generating physics proxy mesh
2013-11-01 01:40:56 -07:00
db32e5d304
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-11-01 02:05:12 +00:00
c6395240f0
For individual bots, seed random number generator with a random number from BotManager rather than Environment.Tickcount
...
Otherwise, since bots are now created all at once, a bunch will get exactly the same tickcount and hence number sequences
2013-11-01 02:04:04 +00:00
cc73ef4eb9
add new particle system blending rule enumerations
2013-10-31 17:49:01 -07:00
cc7065f9ee
minor: change "bot" pCampBot help cateogry to "Bots"
2013-11-01 00:04:18 +00:00
4c4a1cf715
Start counting resent packets in the places that I missed when the stat was first added a few commits ago
2013-10-31 23:59:22 +00:00
50794c9008
minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBakedTextureModule
2013-10-31 23:51:01 +00:00
3d5a7e9b19
Add OutgoingPacketsResentCount clientstack stat.
...
This allows one to monitor the total number of messages resent to clients over time.
A constantly increasing stat may indicate a general server network or overloading issue if a fairly high proportion of packets sent
A smaller constantly increasing stat may indicate a problem with a particular client-server connection, would need to check "show queues" in this case.
2013-10-31 23:45:52 +00:00
b7c57294cc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-10-31 23:45:19 +00:00
eb52d346c0
add new LSL constants associated with new "ribbon", "glow", and "blend" particle system functionality. Note that this does *not* complete required server side changes for implementing the new particle system
2013-10-31 16:13:03 -07:00
0e07fad2e1
minor: update pCampbot usage/help statement
2013-10-31 20:19:57 +00:00
46a4c32e27
update libomv to 5b4c1e8694479629f7cacd72dd6bc39a6b327f9c (git master as of time of this commit)
2013-10-30 22:01:34 -07:00
fdd1c63c3c
Make "fcache status" command also display information on disk/mem cache hit rate that is currently only displayed if LogLevel >=1 in [AssetCache] config
2013-10-30 18:57:51 +00:00
28f36d8db5
Put fcache commands output to console, not log
2013-10-30 18:32:53 +00:00
edaf0a98d6
Give the caller AddMapTile a valid reason response if this failed due to blank response from server or connection failure.
...
Raise log lines which indicate problems to warning from debug
2013-10-29 23:37:22 +00:00
26c2d9e627
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-10-28 23:48:43 +00:00
39de7614ec
Remove legacy sqlite lines added internally by OpenSimulator to the [Startup] section.
...
These are long unused but confusingly will be seen in the [Startup] section on a "config save".
2013-10-28 18:03:34 +00:00
d23ef79f98
BulletSim: restore collision flags when clear collision cache.
...
THis fixes the extranious addition of objects to the collision cache
which created extra CPU overhead.
2013-10-26 21:30:51 -07:00
93d5d66fbd
BulletSim: update collision flags to make sure they fit in the shorts provided.
2013-10-26 21:20:19 -07:00
5be8f6632b
minor: Fix commented out GridInfo service URL to be 8002 in Robust.ini.example rather than 9000 (already done in Robust.HG.ini.example)
2013-10-25 00:54:33 +01:00
df76e52310
minor: Add commented out code for apparent passing of texture IDs in ObjectProperties UDP replies to viewer
...
Not yet shown that this is used or resolves a bug where not all textures appear on objects with an "XML with textures" upload from singularity 1.8.3
Proper texture entries are actually present and appear properly on relog, but not on select from viewer until at least one face texture is changed.
2013-10-24 23:00:02 +01:00
31989bd51e
Show texture ids for full object/part info console commmds
2013-10-24 21:29:57 +01:00
cccdfcb59e
Comment out LLUDPServer.BroadcastPacket() to reduce code complexity. Appears to be a never used method.
2013-10-24 00:37:49 +01:00
5d61c4039d
Only set the data present event if we actually queued an outoing packet (not if we sent immediately)
2013-10-24 00:33:14 +01:00
511122834b
BulletSim: change collision flags for groundplane to not interact with static objects.
...
Reorder collision flag setting code for terrain to fit pattern used elsewhere.
2013-10-23 16:07:03 -07:00
4830431eb0
Add current .NET windows framework requirement to README.
2013-10-22 01:02:40 +01:00
a7e7bed660
BulletSim: update SOs and DLLs with version that enables compressed
...
AABB maps for Bvh meshes. This greatly reduces the memory usage for
large meshes and for mesh terrain in particular.
2013-10-19 11:44:27 -07:00
84a149ecbf
Call ScriptSleep() instead of llSleep() in routine for llEmail.
...
Signed-off-by: teravus <teravus@gmail.com>
2013-10-18 14:30:05 -05:00
571a75f934
BulletSim: update lib32/libBulletSim.dylib to current BulletSim C++ API.
2013-10-18 09:15:08 -07:00
0094971186
After finishing to edit an attachment, let other avatars see the changes. (The changes weren't visible before because updates to attachments aren't sent while the attachment is selected.)
2013-10-17 23:10:16 +01:00
1bd89ac287
Readding Mono.Security.dll. This comes from http://pgfoundry.org/frs/download.php/3354/Npgsql2.0.12.0-bin-ms.net3.5sp1.zip
...
This is identical to what was previously there but need to record origin information
2013-10-17 22:31:15 +01:00
6221356712
Removing Mono.Security.dll temporarily so that it can be re-added with origin information
2013-10-17 22:28:58 +01:00
67ffb64764
Corrected estateID to EstateID on getEstates function at PGSQLEstateData.cs
2013-10-16 21:58:22 -05:00
f83343d302
* One More thing, add an appdomain data element to ensure that we don't duplicate the assembly resolving.
2013-10-16 21:20:11 -05:00
8fdf70b87e
* Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - Mono.Security.dll missing. The root of the issue is that the Postgres driver relies on Mono.Security.dll from the mono project. Unfortunately, when using Mono, including the dll in the distribution causes conflicts. This solution puts Mono.Security.dll in bin/lib/NET/ and, if windows .NET is the runtime, informs the assembly loader to load bin/lib/NET/Mono.Security.dll when .NET is scanning for the Mono.Security namespace. On Mono, the included Mono.Security assembly is ignored.
2013-10-16 20:16:29 -05:00
766a31431e
BulletSim: implement the SL bug where VEHICLE_HOVER_UP_ONLY disables
...
the vehicle buoyancy if the vehicle is above its hover height.
This is a known misfeature of this vehicle flag which has been accepted
since it would break too many implementations. The problem is noticed
when creating a jetski-like vehicle that jumps over sand bars. A boat
normally is configured with neutral buoyancy and hovering at water
height. When it jumps the sandbar, it needs to have gravity applied
to get back to water level.
2013-10-15 17:02:22 -07:00
d0c1780839
Fixed rezzing coalesced objects from a prim's inventory
...
Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
2013-10-15 23:59:16 +01:00
acfe603a5f
As discussed on many previous occasions, switch the default physics engine in OpenSimulator from OpenDynamicsEngine to BulletSim.
...
The BulletSim plugin is higher performance and has a better implementation of vehicles amongst other things.
Many thanks to Robert Adams for making this possible with the enormous amount of work that he has done on this plugin.
If you want to continue using ODE, set physics = OpenDynamicsEngine in the [Startup] section of OpenSim.ini
2013-10-15 23:24:49 +01:00
d82d6bb1ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-10-15 23:18:50 +01:00
5ca7395e17
Added support for attachments to group notices when using Flotsam groups.
2013-10-15 23:07:49 +01:00
3e1ca2bd21
* Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled)
...
* Please test
2013-10-15 11:55:08 -05:00
f106ba87ca
Made terrain uploads thread-safe
2013-10-15 00:12:56 +01:00
a27c2432bb
This is Npgsql2.0.12.0-bin-ms-net3.5sp1
...
From http://pgfoundry.org/frs/download.php/3354/Npgsql2.0.12.0-bin-ms.net3.5sp1.zip
This is identical to the version added in ff8a7682
2013-10-14 23:59:49 +01:00
dbdcf2d995
Remove to re-add with version information for future reference
2013-10-14 23:58:12 +01:00
daf44cc65e
fix missing " for variable SRV_IMServerURI in example file
2013-10-12 20:47:10 -04:00
Melanie