Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | documentation (OnTerrainTainted) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | | | ||||||
| | | * | | documentation (OnClientMovement) | SignpostMarv | 2012-09-11 | 1 | -0/+7 | |
| | | | | | ||||||
| | | * | | Documenting some of the events on ↵ | SignpostMarv | 2012-09-11 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | | | | | OpenSim.Region.Framework.Scenes.EventManager (OnFrame) | |||||
| | * | | | Add levels 4 and 5 to "debug http" console command that will log a sample of ↵ | Justin Clark-Casey (justincc) | 2012-09-11 | 3 | -12/+90 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | incoming request data and the entire incoming data respectively. See "help debug http" for more details. | |||||
| * | | | | Fix prebuild.xml format for reference | BlueWall | 2012-09-11 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Mono.Data.SQL entry was bad | |||||
* | | | | | Merge branch 'avination' into careminster | Melanie | 2012-09-10 | 20 | -236/+394 | |
|\ \ \ \ \ | | |_|_|/ | |/| | | | ||||||
| * | | | | Remove commented code | Melanie | 2012-09-10 | 1 | -11/+0 | |
| | | | | | ||||||
| * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-10 | 2 | -12/+34 | |
| |\ \ \ \ | ||||||
| | * | | | | add a extra httppool thread to compensate for webfetchinventory | UbitUmarov | 2012-09-10 | 1 | -1/+2 | |
| | | | | | | ||||||
| | * | | | | webFetchInventory: change control event to simple flag, adjust locking | UbitUmarov | 2012-09-10 | 1 | -11/+32 | |
| | | | | | | ||||||
| * | | | | | Reduce max concurrent endpoint connections from 50 to 6 (was 2 before) | Melanie | 2012-09-09 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Catch zero UUIDs in LSL and shout as an error. Also catch attempts to send IM | Melanie | 2012-09-09 | 2 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | to UUID.Zero because it ties up XMLRPC handlers needlessly. | |||||
| * | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-08 | 4 | -23/+93 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | llClientView: try to have only one thread per client processing | UbitUmarov | 2012-09-08 | 1 | -4/+49 | |
| | | | | | | | | | | | | | | | | | | | | | | | | RegionHandleRequests. (code assumes packet handle is called async as it is not) | |||||
| | * | | | | One more redundante ParcelProprieties on login | UbitUmarov | 2012-09-07 | 1 | -0/+2 | |
| | | | | | | ||||||
| | * | | | | stop sending duplicated parcelProprieties at login | UbitUmarov | 2012-09-07 | 1 | -18/+39 | |
| | | | | | | ||||||
| | * | | | | remove fireandforget call to EnableChildAgents at end on CompleteMovement, | UbitUmarov | 2012-09-07 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | since this is already on own thread and its at the end of it. | |||||
| * | | | | | Set the maximum number of concurrent connections to a service endpoint | Melanie | 2012-09-07 | 1 | -0/+2 | |
| |/ / / / | | | | | | | | | | | | | | | | | | | | | to 50. This doesn't work on stock mono but it works in Avination and also under Windoze. | |||||
| * | | | | Prevent double slashes, try #4 | UbitUmarov | 2012-09-06 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Prevent double slashes, try #3 | Melanie | 2012-09-06 | 1 | -0/+3 | |
| | | | | | ||||||
| * | | | | Revert "Change string concatenation to Path.Combine to eliminate extra slashes." | Melanie | 2012-09-06 | 1 | -8/+6 | |
| | | | | | | | | | | | | | | | | | | | | This reverts commit b9d026666dbabb210cc013d29eb79fe214594dd9. | |||||
| * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-06 | 1 | -6/+8 | |
| |\ \ \ \ | ||||||
| | * | | | | Change string concatenation to Path.Combine to eliminate extra slashes. | Melanie | 2012-09-06 | 1 | -6/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Windoze barfs on them. | |||||
| | * | | | | Revert " remove extra '/' in assets url" | Melanie | 2012-09-06 | 1 | -13/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 041fcd6a72e1822656d58f87a398e3a0f065a486. | |||||
| | * | | | | remove extra '/' in assets url | UbitUmarov | 2012-09-06 | 1 | -6/+13 | |
| | | | | | | ||||||
| * | | | | | Make friend notifies and closing child agents async because both can | Melanie | 2012-09-04 | 3 | -43/+48 | |
| | | | | | | | | | | | | | | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive | |||||
| * | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-04 | 4 | -3/+19 | |
| |\ \ \ \ \ | | |/ / / / | ||||||
| | * | | | | bug fix | UbitUmarov | 2012-09-04 | 1 | -4/+6 | |
| | | | | | | ||||||
| | * | | | | a forgotten file plus minor changes. Imp and SL viewer seem to preserve | UbitUmarov | 2012-09-04 | 3 | -3/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | flight. FS 4.2.2 does not. | |||||
| | * | | | | let avatar keep flying in tps to same region. (still bad for other | UbitUmarov | 2012-09-04 | 1 | -0/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | regions ) | |||||
| * | | | | | Remove debug spam | Melanie | 2012-09-04 | 1 | -6/+6 | |
| | | | | | | ||||||
| * | | | | | Refactor avatar transfer so that the heavy (UpdateAgent) part is separated into | Melanie | 2012-09-04 | 3 | -97/+113 | |
| | | | | | | | | | | | | | | | | | | | | | | | | it's own sub-method | |||||
| * | | | | | Prevent a nullref if SimStatsReporter tries to report on a sim where psysics are | Melanie | 2012-09-03 | 1 | -14/+17 | |
| |/ / / / | | | | | | | | | | | | | | | | not yet initialized | |||||
| * | | | | try to reduce potencial recursive locking | UbitUmarov | 2012-09-01 | 1 | -26/+51 | |
| | | | | | ||||||
| * | | | | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-08-31 | 3 | -7/+60 | |
| |\ \ \ \ | ||||||
| * | | | | | move keyframemotion.copy from sop.copy to sog.copy, where there is | UbitUmarov | 2012-08-30 | 3 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | newgroup information avaiable. | |||||
* | | | | | | Merge branch 'master' into careminster | Melanie | 2012-09-10 | 4 | -6/+8 | |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | passing in the function name to MOD_Api.ConvertFromLSL for more ↵ | SignpostMarv | 2012-09-10 | 1 | -4/+4 | |
| | |_|/ / | |/| | | | | | | | | | | | | | user-friendly error messages | |||||
| * | | | | Adjust namespce of FlotsamCache | BlueWall | 2012-09-09 | 2 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | Place FloatsamCache in the same namespace as our other core asset caches | |||||
| * | | | | Revert "Move addin information to CoreModulePlugin.addin.xml" | BlueWall | 2012-09-09 | 3 | -3/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2ec34580ce3807cede97539488237040e1a8a6cc. Moving the attributes for mono addins back to the source file - this also fixes http://opensimulator.org/mantis/view.php?id=6278. | |||||
* | | | | | Merge branch 'master' into careminster | Melanie | 2012-09-09 | 24 | -122/+632 | |
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| * | | | | implementing per-region configuration of limits on the number of prims one ↵ | SignpostMarv | 2012-09-09 | 5 | -1/+57 | |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | can have in a linkset Applied with changes - patch was based on a repo different from core Signed-off-by: Melanie <melanie@t-data.com> | |||||
| * | | | refactoring to allow Scene.GetLandData to accept Vector3 as an argument. ↵ | SignpostMarv | 2012-09-08 | 5 | -12/+22 | |
| | | | | | | | | | | | | | | | | Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3 | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-08 | 11 | -64/+528 | |
| |\ \ \ | ||||||
| | * | | | BulletSim: update the DLLs and SOs | Robert Adams | 2012-09-07 | 4 | -0/+0 | |
| | | | | | ||||||
| | * | | | BulletSim: Add Bullet body and shape to BSPhysObject and rename | Robert Adams | 2012-09-07 | 6 | -62/+505 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'Body' to 'BSBody' for disambiguation when reading code. Complete the API2 interface so nearly all methods on bullet classes are available to the managed code. The efficient single call simulation step is kept in place while all other creation/destruction/parameterization can be done in the managed code. | |||||
| | * | | | BulletSim: Add some comments (gasp) and log messages. | Robert Adams | 2012-09-07 | 4 | -4/+13 | |
| | | | | | ||||||
| | * | | | BulletSim: PhysicsActorType() now returns the correct value rather than ↵ | Robert Adams | 2012-09-07 | 2 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | 'unknown'. | |||||
| | * | | | BulletSim: Modify collision flag calls to return the current flags. | Robert Adams | 2012-09-07 | 2 | -7/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Track current collision flags in BSPrim. Add BulletSimAPI calls for saving and restoring rigidBodies using construction information structure. | |||||
| * | | | | 4096 is used in various places as the maximum height of a region, ↵ | SignpostMarv | 2012-09-08 | 3 | -3/+4 | |
| |/ / / | | | | | | | | | | | | | refactoring to be a constant |