aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-0834-7618/+7968
|\ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * If the LSL state_entry() event definition contains any parameters, then ↵Justin Clark-Casey (justincc)2013-11-024-7471/+7692
| | | | | | | | | | | | | | | | 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.
| * add null check for jpeg2000 sculpt image decode failure. Note: the ↵dahlia2013-11-011-0/+9
| | | | | | | | j2kDecodeCache folder should be cleared after updating to this revision so that sculpts containing alpha can be re-decoded and successfully meshed.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-11-011-1/+1
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-11-011-1/+5
| | |\
| | * | For individual bots, seed random number generator with a random number from ↵Justin Clark-Casey (justincc)2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | discard alpha in 4-plane sculpt textures before generating physics proxy meshdahlia2013-11-011-12/+7
| | |/ | |/|
| * | add new particle system blending rule enumerationsdahlia2013-10-311-1/+5
| |/
| * minor: change "bot" pCampBot help cateogry to "Bots"Justin Clark-Casey (justincc)2013-11-011-12/+12
| |
| * Start counting resent packets in the places that I missed when the stat was ↵Justin Clark-Casey (justincc)2013-10-312-0/+8
| | | | | | | | first added a few commits ago
| * minor: remove mono compiler warnings in AvatarPickerSearchModule and ↵Justin Clark-Casey (justincc)2013-10-312-7/+3
| | | | | | | | UploadBakedTextureModule
| * Add OutgoingPacketsResentCount clientstack stat.Justin Clark-Casey (justincc)2013-10-312-1/+32
| | | | | | | | | | | | 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.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-10-311-0/+13
| |\
| | * add new LSL constants associated with new "ribbon", "glow", and "blend" ↵dahlia2013-10-311-0/+13
| | | | | | | | | | | | particle system functionality. Note that this does *not* complete required server side changes for implementing the new particle system
| * | minor: update pCampbot usage/help statementJustin Clark-Casey (justincc)2013-10-311-4/+4
| |/
| * update libomv to 5b4c1e8694479629f7cacd72dd6bc39a6b327f9c (git master as of ↵dahlia2013-10-304-0/+0
| | | | | | | | time of this commit)
| * Make "fcache status" command also display information on disk/mem cache hit ↵Justin Clark-Casey (justincc)2013-10-301-18/+38
| | | | | | | | rate that is currently only displayed if LogLevel >=1 in [AssetCache] config
| * Put fcache commands output to console, not logJustin Clark-Casey (justincc)2013-10-301-28/+25
| |
| * Give the caller AddMapTile a valid reason response if this failed due to ↵Justin Clark-Casey (justincc)2013-10-291-8/+11
| | | | | | | | | | | | blank response from server or connection failure. Raise log lines which indicate problems to warning from debug
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-10-285-7/+7
| |\
| | * BulletSim: restore collision flags when clear collision cache.Robert Adams2013-10-264-0/+0
| | | | | | | | | | | | | | | THis fixes the extranious addition of objects to the collision cache which created extra CPU overhead.
| | * BulletSim: update collision flags to make sure they fit in the shorts provided.Robert Adams2013-10-261-7/+7
| | |
| * | Remove legacy sqlite lines added internally by OpenSimulator to the ↵Justin Clark-Casey (justincc)2013-10-283-8/+1
| |/ | | | | | | | | | | [Startup] section. These are long unused but confusingly will be seen in the [Startup] section on a "config save".
| * minor: Fix commented out GridInfo service URL to be 8002 in ↵Justin Clark-Casey (justincc)2013-10-251-1/+1
| | | | | | | | Robust.ini.example rather than 9000 (already done in Robust.HG.ini.example)
| * minor: Add commented out code for apparent passing of texture IDs in ↵Justin Clark-Casey (justincc)2013-10-241-0/+26
| | | | | | | | | | | | | | 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.
| * Show texture ids for full object/part info console commmdsJustin Clark-Casey (justincc)2013-10-241-1/+16
| |
| * Comment out LLUDPServer.BroadcastPacket() to reduce code complexity. ↵Justin Clark-Casey (justincc)2013-10-241-38/+38
| | | | | | | | Appears to be a never used method.
| * Only set the data present event if we actually queued an outoing packet (not ↵Justin Clark-Casey (justincc)2013-10-241-4/+17
| | | | | | | | if we sent immediately)
| * BulletSim: change collision flags for groundplane to not interact with ↵Robert Adams2013-10-234-7/+13
| | | | | | | | | | | | static objects. Reorder collision flag setting code for terrain to fit pattern used elsewhere.
* | Merge branch 'master' into careminsterMelanie2013-11-0380-259/+17602
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Add current .NET windows framework requirement to README.Justin Clark-Casey (justincc)2013-10-221-0/+2
| |
| * BulletSim: update SOs and DLLs with version that enables compressedRobert Adams2013-10-194-0/+0
| | | | | | | | | | AABB maps for Bvh meshes. This greatly reduces the memory usage for large meshes and for mesh terrain in particular.
| * Call ScriptSleep() instead of llSleep() in routine for llEmail.Kevin Cozens2013-10-181-1/+1
| | | | | | | | Signed-off-by: teravus <teravus@gmail.com>
| * BulletSim: update lib32/libBulletSim.dylib to current BulletSim C++ API.Robert Adams2013-10-181-0/+0
| |
| * After finishing to edit an attachment, let other avatars see the changes. ↵Oren Hurvitz2013-10-172-8/+4
| | | | | | | | (The changes weren't visible before because updates to attachments aren't sent while the attachment is selected.)
| * Readding Mono.Security.dll. This comes from ↵Justin Clark-Casey (justincc)2013-10-171-0/+0
| | | | | | | | | | | | 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
| * Removing Mono.Security.dll temporarily so that it can be re-added with ↵Justin Clark-Casey (justincc)2013-10-171-0/+0
| | | | | | | | origin information
| * Corrected estateID to EstateID on getEstates function at PGSQLEstateData.csFernando Oliveira2013-10-161-1/+1
| |
| * * One More thing, add an appdomain data element to ensure that we don't ↵Fernando Oliveira2013-10-162-4/+15
| | | | | | | | duplicate the assembly resolving.
| * * Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - ↵Fernando Oliveira2013-10-163-0/+47
| | | | | | | | 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.
| * BulletSim: implement the SL bug where VEHICLE_HOVER_UP_ONLY disablesRobert Adams2013-10-151-0/+12
| | | | | | | | | | | | | | | | | | | | | | 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.
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-155-134/+188
| | | | | | | | Previously only the first object in the Coalesced Object was rezzed. Now all the objects are rezzed.
| * As discussed on many previous occasions, switch the default physics engine ↵Justin Clark-Casey (justincc)2013-10-151-6/+5
| | | | | | | | | | | | | | | | 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
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-10-154-9/+40
| |\
| | * * Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled)fernando2013-10-154-9/+40
| | | | | | | | | | | | * Please test
| * | Added support for attachments to group notices when using Flotsam groups.Kevin Cozens2013-10-151-50/+122
| |/
| * Made terrain uploads thread-safeOren Hurvitz2013-10-154-22/+45
| |
| * This is Npgsql2.0.12.0-bin-ms-net3.5sp1Justin Clark-Casey (justincc)2013-10-141-0/+0
| | | | | | | | | | 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, removed and readded to check and record version
| * Remove to re-add with version information for future referenceJustin Clark-Casey (justincc)2013-10-141-0/+0
| |
| * fix missing " for variable SRV_IMServerURI in example fileMichael Cerquoni2013-10-121-1/+1
| |
generated by cgit v1.1 at 2024-08-22 17:51:51 +0000