aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-0825-7617/+7967
|\ | | | | | | | | 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
| |/
| * 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-281-7/+7
| |\
| | * 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: 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-0363-252/+13356
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Call ScriptSleep() instead of llSleep() in routine for llEmail.Kevin Cozens2013-10-181-1/+1
| | | | | | | | Signed-off-by: teravus <teravus@gmail.com>
| * 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.)
| * 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-162-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.
| * 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
| |
| * Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.Fernando Oliveira2013-10-1240-0/+11892
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added PostGreSQL support * Added MySQL/MySQLXGroupData.cs * PostgreSQL data access implementation * PostgreSQL dll binarie and RegionStore.migrations * Migrations Scripts from MSSQL to POSTGRES * Postgres SQL Type fixes * Postgres SQL Connection string * Data type issues * more fixes * tests and +tests * UUID x string - FIGHT! * Fixed PG types to internal csharp types * More data type fix (PostgreSQL fields are case sensitive) :( * more field case sensitive fixes * changed the migration files to be case sensitive for fields. * fixed fields case * finished converting, now search for hidden bugs. * some more fixes * bool type fixed * more case fixes; * creatorID case fixed * case fields fixed * fixed default now() for TMStamp fields with don't allow nulls. * fix case sensitve for Region name and Estate name * fixed case for names for search * fix class name Error * Bug fixed on select and migrations * Un-Reverting my change due to Postgres issue with the ILIKE function * Fixed some issued for Diva Distro * Fixes for integration with Diva Distro * Added System.Core to prebuild.xml for PG project * Configured to make DIff for Push to OpenSim Project * Diffs only to PostgreSQL mods.
| * BulletSim: Fix snap back from edge of region problem. Mantis 6794.Robert Adams2013-10-111-2/+13
| |
| * * Add a session concurrency option per key. Allows developer/config to ↵teravus2013-10-094-23/+102
| | | | | | | | specify number of concurrent requests on a service.
| * * Remove a test *cleanup*teravus2013-10-071-10/+2
| |
| * * Move the BasicDOSProtector.cs to OpenSim.Framework (all useful classes ↵teravus2013-10-071-1/+29
| | | | | | | | | | | | belong there.....) * Add an IsBlocked(string Key) method so it can be used more generically. (think.. if we want to rate limit login failures, we could have a call in the Login Service to IsBlocked(uuid.ToString()) and ignore the connection if it returns true, if IsBlocked returns false, we could run the login information and if the login fails we could run the Process method to count the login failures.
| * * Refactorteravus2013-10-077-415/+218
| | | | | | | | * Break out common BasicDOSProtector code into separate class.
| * * Added a Basic DOS protection container/base object for the most common ↵teravus2013-10-079-6/+1059
| | | | | | | | | | | | | | | | | | HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice. * Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2013-10-066-6/+34
|\ \ | | | | | | | | | careminster
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it ↵teravus2013-10-054-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | shouldn't * Fixes cases where Last Attachment Point doesn't get written when it should. * Fixes Null Reference in BaseHttpServer when shutting down, null path provided. * Drop then Wear retains Last Attachment Point
| * | Merge branch 'master' of careminster:/var/git/careminsterteravus2013-10-0470-673/+2748
| |\ \
| * \ \ Merge branch 'master' of careminster:/var/git/careminsterteravus2013-09-1611-76/+98
| |\ \ \
| * | | | * This fixes the border crossing offsets by storing the final keyframe ↵teravus2013-09-161-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | location in the hijacked variable KeyFrame.AngularVelocity. When steps in OnTimer <= 0.0, normalize the final position by Constants.RegionSize and move the object there. The hack here is KeyFrame.AngularVelocity probably isn't the right name for this variable because it's the un-mucked with keyframe position. When you determine the feasibility of changing the name without affecting the serialization of existing objects in world... It's simply a name change to KeyFrame.FinalPosition or something proper. (cherry picked from commit e0399ccaec68889c12e4679b4d62142b49b379df)
generated by cgit v1.1 at 2024-11-05 11:58:12 +0000