| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | | | BulletSim: complete code for managed code shape and body tracking. Not debugged. | Robert Adams | 2012-09-27 | 5 | -130/+675 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Eliminate some null exceptions created adding the above code. Add and remove some detailed logging statements. | |||||
| | | * | | | | BulletSim: add class and infrastructure for shape and object | Robert Adams | 2012-09-27 | 5 | -39/+192 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tracking in the C# code. Needed for the changing body type (to and from GhostObjects) for volumeDetect. | |||||
| | | * | | | | BulletSim: Convert BSCharacter to use common BSPhysObject code and variables. | Robert Adams | 2012-09-27 | 5 | -117/+113 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix avatar height calculation to properly account for the capsule ends. Rearrange some locking in TerrainManager to eliminate possible race conditions. Move DetailLog() definition into common BSPhysObject class. Some variable renaming to make usage clearer (refactor.rename makes this so easy). | |||||
| | | * | | | | BulletSim: move a bunch of common logic out of BSPrim and BSCharacter | Robert Adams | 2012-09-27 | 7 | -416/+361 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and into the parent class BSPhysObject. Rework collision logic to enable extra collision after done colliding. Rename 'Scene' to 'PhysicsScene' to differentiate it from the simulator 'Scene'. | |||||
| | * | | | | | Extend attachment regression test to check for appropriate attach event firing. | Justin Clark-Casey (justincc) | 2012-09-29 | 1 | -25/+49 | |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | This reveals that the event is not being fired when an object is attached from ground, which is incorrect. This check is temporairly disabled. | |||||
| | * | | | | Comment out unused RestPlugins text in OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2012-09-28 | 1 | -24/+25 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-28 | 6 | -47/+1 | |
| | |\ \ \ \ | | | |_|/ | | |/| | | ||||||
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-27 | 9 | -118/+314 | |
| | | |\ \ \ | ||||||
| | | | * | | | another osgitbot test from github.. mistakes were made! | nebadon | 2012-09-27 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | | * | | | another test to see if gitbot is alive yet | nebadon | 2012-09-27 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | Removed the bits about the TOSModule. That module doesn't go into core. ↵ | Diva Canto | 2012-09-27 | 5 | -47/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | WARNING: migration on GridUser withdrawn too, but left the migration number there. | |||||
| | * | | | | | Lock GDI+ portion og VectorRenderModule.GetDrawStringSize() to prevent ↵ | Justin Clark-Casey (justincc) | 2012-09-28 | 1 | -6/+11 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | concurrent thread use provoking mono crashes. Same rationale as commit 13690582. | |||||
| * | | | | | | Merge branch 'avination' into careminster | Melanie | 2012-09-27 | 36 | -475/+1637 | |
| |\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs OpenSim/Region/Framework/Scenes/Scene.cs | |||||
| | * | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-26 | 1 | -5/+1 | |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | ||||||
| | | * | | | | create a new PollServiceHttpRequest req per loop since they can be sent to | UbitUmarov | 2012-09-27 | 1 | -5/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | another working thread | |||||
| | * | | | | | Streamline and improve llGetMass | Melanie | 2012-09-26 | 1 | -23/+17 | |
| | |/ / / / | ||||||
| | * | | | | don't send a partial contents report if we are sending all data | UbitUmarov | 2012-09-26 | 1 | -10/+15 | |
| | | | | | | ||||||
| | * | | | | add assettype mesh to list of binary assets | UbitUmarov | 2012-09-26 | 1 | -1/+2 | |
| | | | | | | ||||||
| | * | | | | fix GetTextureHandler range | UbitUmarov | 2012-09-26 | 1 | -1/+5 | |
| | | | | | | ||||||
| | * | | | | missing file | UbitUmarov | 2012-09-26 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | just remove the damm thing | UbitUmarov | 2012-09-26 | 7 | -29/+7 | |
| | | | | | | ||||||
| | * | | | | Seems nothing actually need the request body for getevents. so change | UbitUmarov | 2012-09-26 | 5 | -15/+12 | |
| | | | | | | | | | | | | | | | | | | | | | control flag to false | |||||
| | * | | | | UriModule GetEvents also doesn't need a request body | UbitUmarov | 2012-09-26 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | keep watchdog happy using it to kill his threads | UbitUmarov | 2012-09-26 | 1 | -9/+1 | |
| | | | | | | ||||||
| | * | | | | more changes to PollService | UbitUmarov | 2012-09-26 | 4 | -25/+25 | |
| | | | | | | ||||||
| | * | | | | fix priorityQueue to correctly use the fairness counts starting at 8 for | UbitUmarov | 2012-09-26 | 1 | -10/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | nonimediate queues. Imediate queues where not taken into account so it was unused. | |||||
| | * | | | | missed change | UbitUmarov | 2012-09-25 | 1 | -1/+2 | |
| | | | | | | ||||||
| | * | | | | do the same to webFecthInvDescModule | UbitUmarov | 2012-09-25 | 1 | -33/+25 | |
| | | | | | | ||||||
| | * | | | | change GetTextureModule processing | UbitUmarov | 2012-09-25 | 1 | -29/+31 | |
| | | | | | | ||||||
| | * | | | | Text changes for upload messages | Melanie | 2012-09-24 | 1 | -4/+4 | |
| | | | | | | ||||||
| | * | | | | more upload changes (plus untouch prebuild.xml) | UbitUmarov | 2012-09-24 | 3 | -69/+128 | |
| | | | | | | ||||||
| | * | | | | touch prebuild.xml | UbitUmarov | 2012-09-24 | 1 | -0/+1 | |
| | | | | | | ||||||
| | * | | | | add missing transactionID in SendInventoryItemCreateUpdate. and make use | UbitUmarov | 2012-09-24 | 7 | -7/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | of it on inventoryAccessModule, etc. Most likelly it's needs where there is a transactionID not zero | |||||
| | * | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-24 | 4 | -37/+38 | |
| | |\ \ \ \ | ||||||
| | | * | | | | If an asset upload transaction doesn't exist for a CreateInventory request, | Melanie | 2012-09-24 | 4 | -37/+38 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | simply process it as if UUID.Zero had been given. | |||||
| | * | | | | | Protect the responses map with a lock. Also remove ugly "this." type of | Melanie | 2012-09-23 | 2 | -18/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | member notation. | |||||
| | * | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-23 | 2 | -7/+39 | |
| | |\ \ \ \ \ | | |/ / / / | ||||||
| | | * | | | | Change the poll service to use a thread pool for replies to make sure the | Melanie | 2012-09-23 | 2 | -7/+39 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | event queues aren't blocked by other traffic. | |||||
| | * | | | | | Comment out asset error for sculpts/meshes. If an asset is missing it's missing. | Melanie | 2012-09-23 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | We can't put it back so we don't need to know. | |||||
| | * | | | | | Merge branch 'ubitwork' into avination | Melanie | 2012-09-23 | 6 | -203/+390 | |
| | |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/MeshCost.cs | |||||
| | | * | | | | try to allow free uploads for testing, if users prefix names with "TEST-". Let | UbitUmarov | 2012-09-23 | 3 | -41/+211 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | textures get into inventory again. Both features under config control. Have direct warnings to client, including a final one on upload complete since i see nothing. problems: textures don't showup in inventory til relog, also issues with permitions. A few more changes | |||||
| | | * | | | | report asset upload errors the right away | UbitUmarov | 2012-09-22 | 4 | -29/+87 | |
| | | | | | | | ||||||
| | | * | | | | removed AssetUploaderWithCost, fixing AssetUploader. add parsing of some | UbitUmarov | 2012-09-22 | 2 | -42/+28 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | more needed fields in request | |||||
| | | * | | | | removed unused data in MeshUploadFlag response | UbitUmarov | 2012-09-22 | 1 | -8/+8 | |
| | | | | | | | ||||||
| | | * | | | | read model upload cost parameters from config [Economy] section | UbitUmarov | 2012-09-21 | 2 | -4/+23 | |
| | | | | | | | ||||||
| | | * | | | | Fix model upload rotations and offsets ( i hope ) | UbitUmarov | 2012-09-20 | 1 | -103/+56 | |
| | | | | | | | ||||||
| | * | | | | | refix prior commit | Melanie | 2012-09-20 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | * | | | | | Make uploads free for now - we will have to announce this | Melanie | 2012-09-20 | 1 | -3/+6 | |
| | | | | | | | ||||||
| | * | | | | | Change texture price back to 10 C$ | Melanie | 2012-09-19 | 1 | -3/+2 | |
| | |/ / / / | ||||||
| | * | | | | be more tolerant to small prims, skipping them, only failing if they are | UbitUmarov | 2012-09-19 | 2 | -16/+82 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | more than half of total. Add a state control to NewFileAgentInventory to avoid more than one at a time per client. ( Incomplete and possible not that good) | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |