aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.Fernando Oliveira2013-10-1247-0/+16078
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * * pushing testteravus2013-10-121-1/+1
| |
| * 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-0712-7/+1112
| | | | | | | | | | | | | | | | | | 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-0485-872/+2997
| |\ \
| * \ \ 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)
| * | | | * Fix a null ref that causes a stack unwind when crossing borders. Less ↵teravus2013-09-163-12/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stack unwinding.. the faster it goes. * Tweak XEngine so that it's partially functional again. It's still not great, but basic things work. (cherry picked from commit 01c3be27460fd3f28efd17b8d6606b883350f653)
* | | | | Merge branch 'master' into careminsterMelanie2013-10-0668-71/+242
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * | | * Added a unique and interesting WebSocket grid login processor by hijacking ↵teravus2013-10-042-0/+57
| | | | | | | | | | | | | | | | the LLSD login code. This sends the data through the normal login channels and spits out a JSON object back that mimics the login response. Feel free to comment on the best way to set this up as a config option.
| * | | * Add an initial complete frame timeout to the WebSocket processor to make ↵teravus2013-10-041-2/+65
| | | | | | | | | | | | | | | | it easier to write WebSocket service code that is resistant to Denial of Service attacks.
| * | | Added SimulatorFeatures/OpenSimExtras: say-range, whisper-range, ↵Diva Canto2013-10-041-0/+37
| | | | | | | | | | | | | | | | shout-range, at the request of Singularity dev Liru-Dargon
| * | | Update an AssmblyVersion property that I missed to 0.8.0Justin Clark-Casey (justincc)2013-10-041-1/+1
| | | |
| * | | Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-0462-62/+62
| | | |
| * | | Add OnChatToNPC and OnInstantMessageToNPC messages to NPCAvatar to allow ↵Justin Clark-Casey (justincc)2013-10-041-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | region modules to directly subscribe to chat and messages received by NPCs Currently still requires INPC from NPCModule.GetNPC() to be cast to an NPCAvatar.
* | | | Merge branch 'master' into careminsterMelanie2013-10-0485-872/+2997
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | minor: Disable logging left active on regression test ↵Justin Clark-Casey (justincc)2013-09-271-1/+1
| | | | | | | | | | | | TestSameSimulatorIsolatedRegionsV2()
| * | refactor: Rename Scene.AddNewClient() to AddNewAgent() to make it obvious in ↵Justin Clark-Casey (justincc)2013-09-2712-22/+23
| | | | | | | | | | | | the code that this is symmetric with CloseAgent()
| * | refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make ↵Justin Clark-Casey (justincc)2013-09-2716-53/+43
| | | | | | | | | | | | | | | | | | it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. Adds IScene.CloseAgent() to replace RemoveClient()
| * | minor code formatting for the sake of consistency and readabilitydahlia2013-09-261-18/+36
| | |
| * | minor: Make OpenSimDefaults.ini consistent (spacing and tabs to spaces)Justin Clark-Casey (justincc)2013-09-271-18/+33
| | |
| * | minor: Clean up tabbing and spacing issues in OpenSim.ini.exampleJustin Clark-Casey (justincc)2013-09-271-25/+26
| | |
| * | minor: correct attachment spelling mistake in log message in ↵Justin Clark-Casey (justincc)2013-09-261-1/+1
| | | | | | | | | | | | HGEntityTransferModule.OnIncomingSceneObject()
generated by cgit v1.1 at 2024-08-23 09:00:07 +0000