| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | | Merge branch 'master' into bulletsim4 | Robert Adams | 2013-05-02 | 27 | -6362/+6369 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Make default config directory "." | BlueWall | 2013-05-01 | 2 | -2/+2 | |
| | | | | | ||||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2013-05-01 | 24 | -6358/+6358 | |
| | | |\ \ | | | |/ | ||||||
| | | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-05-01 | 1 | -2/+3 | |
| | | | |\ | ||||||
| | | | * | | Fix SmartThreadPool line endings in recent update from dos to unix | Justin Clark-Casey (justincc) | 2013-05-01 | 24 | -6358/+6358 | |
| | | | | | | ||||||
| | | * | | | Fix inventory issue | BlueWall | 2013-05-01 | 1 | -0/+6 | |
| | | | |/ | | |/| | | | | | | | | | Fix issue where objects rezzed from Trash or Lost And Found then be placed back in the respective folder when taking the object or a copy back into inventory. | |||||
| | | * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-05-01 | 33 | -4827/+6726 | |
| | | |\ \ | | | |/ | ||||||
| | | * | | Fix the long standing bug of items being delivered to lost and found or ↵ | Melanie | 2013-05-01 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trash when takig copy. This bug was recently aggravated through the perms changes required for the export permission. | |||||
| | * | | | BulletSim: fix crash when mesh asset wasn't available when meshing | Robert Adams | 2013-05-01 | 2 | -10/+19 | |
| | | | | | | | | | | | | | | | | | | | | | the first time. Debugging added for mesh/hull asset fetch. | |||||
| | * | | | BulletSim: rework LinksetCompound to work with new BSShape system. | Robert Adams | 2013-05-01 | 1 | -106/+40 | |
| | | | | | | | | | | | | | | | | | Not all working yet. | |||||
| | * | | | Merge branch 'master' into bulletsim4 | Robert Adams | 2013-05-01 | 45 | -4928/+7293 | |
| | |\ \ \ | | | |/ | | |/| | ||||||
| | | * | | Add in-code exaplanation for the change in cancellation signalling in STP ↵ | Justin Clark-Casey (justincc) | 2013-05-01 | 2 | -2/+10 | |
| | | | | | | | | | | | | | | | | | 2.2.3. Remove left in Console.WriteLine accidentally inserted in recent 206fb306 | |||||
| | | * | | Add information about creating a PID file for robust to the Robust.ini and ↵ | Justin Clark-Casey (justincc) | 2013-05-01 | 2 | -25/+30 | |
| | | | | | | | | | | | | | | | | | Robust.HG.ini example files | |||||
| | | * | | Update SmartThreadPool to latest version 2.2.3 with a major and minor change. | Justin Clark-Casey (justincc) | 2013-05-01 | 31 | -4802/+6688 | |
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | SmartThreadPool code comes from http://www.codeproject.com/Articles/7933/Smart-Thread-Pool This version implements thread abort (via WorkItem.Cancel(true)), threadpool naming, max thread stack, etc. so we no longer need to manually patch those. However, two changes have been made to stock 2.2.3. Major change: WorkItem.Cancel(bool abortExecution) in our version does not succeed if the work item was in progress and thread abort was not specified. This is to match previous behaviour where we handle co-operative termination via another mechanism rather than checking WorkItem.IsCanceled. Minor change: Did not add STP's StopWatch implementation as this is only used WinCE and Silverlight and causes a build clash with System.Diagnostics.StopWatch The reason for updating is to see if this improves http://opensimulator.org/mantis/view.php?id=6557 and http://opensimulator.org/mantis/view.php?id=6586 | |||||
| | | * | Fix CAPS to work like they should - do not send caps to the viewer if ↵ | Melanie | 2013-04-30 | 3 | -4/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | they're not in the requested caps list. The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail on all viewers when turned off. UDB inventory would not be correctly used in that case. | |||||
| | | * | BulletSim: fix error messages created while an avatar has no initial | Robert Adams | 2013-04-30 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | collisions. Usually happens when logging in an avatar that had been previously flying. Uninitialized variable. | |||||
| | | * | minor: remove some mono compiler warnings in ServicesServerBase | Justin Clark-Casey (justincc) | 2013-04-29 | 1 | -5/+0 | |
| | | | | ||||||
| | | * | minor: Eliminate warning in LLimageManagerTests by properly calling through ↵ | Justin Clark-Casey (justincc) | 2013-04-29 | 1 | -0/+2 | |
| | | | | | | | | | | | | | to OpenSimTestCase.SetUp() | |||||
| | | * | Add TestRejectGivenFolder() and TestAcceptGivenFolder() regression tests | Justin Clark-Casey (justincc) | 2013-04-29 | 4 | -10/+262 | |
| | | | | ||||||
| | | * | Add regression test for inventory item give, reject and subsequent trash ↵ | Justin Clark-Casey (justincc) | 2013-04-29 | 2 | -1/+259 | |
| | | | | | | | | | | | | | | | | | | | folder purge by receiver. This commit also actually adds the InventoryTransferModuleTests file which I previously forgot | |||||
| | | * | Add regression test for offer, accept and subsequent receiver delete of an ↵ | Justin Clark-Casey (justincc) | 2013-04-29 | 3 | -80/+16 | |
| | | | | | | | | | | | | | item offered via instant message. | |||||
| | | * | Fix bug where an agent that declined an inventory offer and subsequently ↵ | Justin Clark-Casey (justincc) | 2013-04-29 | 1 | -2/+8 | |
| | | | | | | | | | | | | | | | | | | | emptied their trash would make the item invalid in the giver's inventory This was because the original item/folder ID was sent in the session slot of the offer IM rather than the copy. | |||||
| | * | | BulletSim: improvements to LinksetCompound and PrimDisplaced. Not all ↵ | Robert Adams | 2013-04-30 | 5 | -17/+50 | |
| | | | | | | | | | | | | | working yet. | |||||
| | * | | BulletSim: Add non-static BSShape.GetReference for getting another reference | Robert Adams | 2013-04-29 | 2 | -32/+102 | |
| | | | | | | | | | | | | | | | | | | | | | | to an existing shape instance. BSShapeNative rebuilds shape for all references. BSShapeCompound returns another reference copy if the compound shape already exists (for linksets). | |||||
| | * | | BulletSim: LinksetCompound work to disable collision for root and | Robert Adams | 2013-04-29 | 1 | -14/+30 | |
| | | | | | | | | | | | | | | | | | | | | | | child prims so compound shape can do all collisions. Don't try to build a compound linkset for non-physical linksets. Remove and replace root body when compound shape is added so collision cache is rebuilt. | |||||
| | * | | BulletSim: remove trailing white space to make git happier. No functional ↵ | Robert Adams | 2013-04-29 | 20 | -152/+152 | |
| | | | | | | | | | | | | | changes. | |||||
| | * | | BulletSim: rename variable 'PhysicsScene' to be either 'PhysScene' or ↵ | Robert Adams | 2013-04-29 | 11 | -282/+282 | |
| | | | | | | | | | | | | | 'm_physicsScene' to match coding conventions and reduce confusion. | |||||
| | * | | BulletSim: first cut at new linksetCompound shape building. | Robert Adams | 2013-04-29 | 1 | -63/+27 | |
| | | | | ||||||
| | * | | BulletSim: fix crash when creating new hull. | Robert Adams | 2013-04-29 | 1 | -13/+14 | |
| | | | | ||||||
| | * | | BulletSim: code for creating the avatar capsule shape. | Robert Adams | 2013-04-29 | 1 | -0/+13 | |
| | | | | ||||||
| | * | | BulletSim: massive refactor of shape classes. Removed shape specific code ↵ | Robert Adams | 2013-04-29 | 20 | -1050/+290 | |
| | | | | | | | | | | | | | from BSShapeCollection. Using BSShape* classes to hold references to shape. Simplified shape dependency callbacks. Remove 'PreferredShape' methods and have each class specify shape type. Disable compound shape linkset for a later commit that will simplify linkset implementation. | |||||
| | * | | BulletSim: complete BSShape classes. | Robert Adams | 2013-04-29 | 3 | -19/+316 | |
| | |/ | ||||||
| | * | Some more pieces of Avination's ban system - if an avatar isn't allowed on any | Melanie | 2013-04-29 | 1 | -7/+88 | |
| | | | | | | | | | parcel in the sim, keep them out entirely. | |||||
| * | | Minor reordering of operations on NewUserConnection. The agent circuit needs ↵ | Diva Canto | 2013-05-06 | 1 | -5/+17 | |
| |/ | | | | to be added earlier for some of the checks to work correctly. | |||||
| * | Fix wrong sql statement in offline im. | Diva Canto | 2013-04-28 | 1 | -5/+2 | |
| | | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-04-27 | 1 | -1/+1 | |
| |\ | ||||||
| | * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-04-27 | 2 | -1/+2 | |
| | |\ | ||||||
| | * | | Unbreak the sample money module | Melanie | 2013-04-27 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | Small oversight in EconomyDataRequest - this would have affected everyone ↵ | Melanie | 2013-04-27 | 1 | -2/+0 | |
| | | | | | | | | | | | | | NOT using a money module. | |||||
| * | | | Added an interface to an external ban service. With this commit, the ↵ | Diva Canto | 2013-04-27 | 2 | -4/+69 | |
| | |/ |/| | | | | | interface is used only in Hypergrided worlds (Gatekeeper), although in those, it applies to both local and foreign users. The Ban service itself is not in core; it is to be provided externally. | |||||
| * | | Better error reporting | Diva Canto | 2013-04-27 | 1 | -0/+1 | |
| | | | ||||||
| * | | Make method virtual | Diva Canto | 2013-04-27 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2013-04-25 | 4 | -18/+34 | |
| |\ | ||||||
| | * | Change EconomyDataRequest signature to use an IClientAPI rather than UUID. ↵ | Melanie | 2013-04-25 | 3 | -13/+8 | |
| | | | | | | | | | | | | | This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. Sending the reply requires having the IClientAPI. | |||||
| | * | Change copyright notice on DynamicMenuModule to proper BSD | Melanie | 2013-04-25 | 1 | -5/+26 | |
| | | | ||||||
| * | | Groups: make some methods protected. | Diva Canto | 2013-04-25 | 1 | -7/+7 | |
| |/ | ||||||
| * | Recover a lost "virtual". Downstream projects need this. | Diva Canto | 2013-04-25 | 1 | -1/+1 | |
| | | ||||||
| * | UUIDGatherer now includes UUIDs which reference texture assets used as materials | dahlia | 2013-04-24 | 1 | -0/+66 | |
| | | ||||||
| * | Make the kicked user's avie truly disappear when it's god-kicked. | Diva Canto | 2013-04-24 | 1 | -2/+1 | |
| | | ||||||
| * | Adding the dynamic menu module which allows registering new menu options in ↵ | Melanie | 2013-04-25 | 2 | -0/+339 | |
| | | | | | compliant viewers | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |