Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | | | | | implement GlynnTuckerAssetCache.Check() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Properly implement CenomeAssetCache.Check() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -2/+4 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Simplify FlotsamAssetCache.CheckFromMemoryCache() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -6/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Elminate some copy/paste in FlotsamAssetCache.CheckFromFileCache() and use ↵ | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -33/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using() construct to ensure filestream is always closed | |||||
| | * | | | | | | | | elminate unnecessary asset != null check in FlotsamAssetCache.UpdateFileCache() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -50/+47 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passed in asset is always not null | |||||
| | * | | | | | | | | minor: reinsert some method doc back into IEntityTransferModule | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -0/+20 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | minor: since structs are values, assigning them to another variable copies ↵ | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it. Instantiation is unnecessary. | |||||
| | * | | | | | | | | Reorder checks in SP.CompleteMovement() to fix test failures | Justin Clark-Casey (justincc) | 2014-01-16 | 1 | -36/+33 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-16 | 2 | -57/+68 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | Actually put IsChildAgent = true inside the lock, otherwise there is still a ↵ | Justin Clark-Casey (justincc) | 2014-01-16 | 1 | -1/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | small window for race conditions on duplicate CompleteMovement calls | |||||
| | | * | | | | | | | Prevent duplicate invocations or race dontision in SP.CompleteMovement() | Justin Clark-Casey (justincc) | 2014-01-16 | 2 | -56/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happen under poor network conditions if a viewer repeats the message send If this happens, physics actors can get orphaned, which unecessarily raises physics frame times | |||||
| | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-16 | 4 | -127/+4 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | Remove old IInterRegionComms and references. This hasn't been used since ↵ | Justin Clark-Casey (justincc) | 2014-01-16 | 4 | -127/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2009 and was superseded by ISimulationService | |||||
| * | | | | | | | | | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 9 | -88/+164 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | * | | | | | | | | Fix crash in BulletSim which sometimes happens making a linkset physical | Robert Adams | 2014-01-10 | 1 | -7/+32 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (like sitting on and activating a vehicle) and crossing borders. This keeps better bookkeeping on compound shapes so BulletSim can identify them when being freed. | |||||
| | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-10 | 1 | -1/+1 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | Fixed llTextBox error message text | David Rowe | 2014-01-10 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-10 | 1 | -5/+5 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | Dynamically adjust to the number of visual params sent. | Melanie | 2014-01-10 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | When moving the root prim of an attachment: a) Change the attach position; ↵ | Oren Hurvitz | 2014-01-10 | 1 | -5/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b) Move the other prims in the reverse direction to compensate | |||||
| | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-10 | 6 | -138/+148 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | When creating a coalesced object, set its permissions to the ↵ | Oren Hurvitz | 2014-01-10 | 1 | -7/+16 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lowest-common-denominator of all the sub-objects | |||||
| | | * | | | | | | | When creating a coalesced object, set its Creator ID if all the objects have ↵ | Oren Hurvitz | 2014-01-10 | 1 | -4/+15 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the same creator | |||||
| | | * | | | | | | | Refactored: use a single function to apply an object's folded permissions to ↵ | Oren Hurvitz | 2014-01-10 | 4 | -32/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | its main permissions | |||||
| | | * | | | | | | | Refactored setting permissions when rezzing items: use the same function ↵ | Oren Hurvitz | 2014-01-10 | 4 | -94/+92 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when rezzing from user inventory and prim inventory. Also, fixed a bug: when rezzing a coalesced object from a prim's inventory, apply the coalesced object's name and description only to the first sub-object; not to all the objects in the coalescence. (This was already done correctly when rezzing from a user's inventory.) | |||||
| | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-08 | 2 | -8/+19 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | If an agent is sitting, then do send the rotation in the agent update ↵ | Justin Clark-Casey (justincc) | 2014-01-08 | 2 | -8/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of zeroing it to resolve mouselook camera problems Addresses http://opensimulator.org/mantis/view.php?id=6892 Thanks to tglion for this spot. This resolves a recent regression from 17b32b764acd815400d9eb903aaec6dcebd60ac7 | |||||
| * | | | | | | | | | Intermediate commit. Sill errors. | Melanie | 2014-01-05 | 21 | -8750/+10278 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs | |||||
| | * | | | | | | | | Some missing definitions needed for successful compilation. | Robert Adams | 2014-01-04 | 2 | -2/+4 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | varregion: Add region size to teleport event messages (EnableSimulator, | Robert Adams | 2014-01-04 | 5 | -34/+76 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CorssRegion, TeleportFinishEvent). Have Simian grid service return the region size. Many teleport related debug log messages. Can be removed when teleport works (like that's ever going to happen). Conflicts: OpenSim/Framework/RegionInfo.cs | |||||
| | * | | | | | | | | Dynamically adjust to the number of visual params sent. | Melanie | 2014-01-04 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8623/+10023 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | Add lsl arg syntax checking for control event | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -9386/+9716 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | refactor: rename internal lsl parser VectorDeclaration -> VecDeclaration for ↵ | Justin Clark-Casey (justincc) | 2013-12-21 | 1 | -7907/+7903 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | consistency | |||||
| | | * | | | | | | | Add arg checking for at_target lsl event | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8828/+9158 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Add lsl event arg checking for at_rot_target | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8915/+9306 | |
| | | | | | | | | | | ||||||
| | | * | | | | | | | Add lsl event argument checking for attach and on_rez | Justin Clark-Casey (justincc) | 2013-12-21 | 2 | -8593/+8946 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-19 | 2 | -6/+65 | |
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | ||||||
| | | * | | | | | | | Create regression test TestSendAgentGroupDataUpdate() for groups agent data ↵ | Justin Clark-Casey (justincc) | 2013-12-18 | 2 | -6/+65 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sending | |||||
| | * | | | | | | | | Fix issue with editing notes for other avatars | BlueWall | 2013-12-16 | 1 | -2/+2 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-12-16 | 9 | -67/+80 | |
| | |\ \ \ \ \ \ \ \ | ||||||
| | | * \ \ \ \ \ \ \ | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -1/+1 | |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | ||||||
| | | | * | | | | | | | Extend TestLlGetNotecardLine() regression test to contain chars that are two ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bytes in utf8 | |||||
| | | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-14 | 3 | -21/+22 | |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | ||||||
| | | | * | | | | | | | Wrap analysis of the particle system in the UUID Gatherer in a separate ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -3/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | try/catch as sometimes it appears that this can be corrupt. As per Oren's suggestion. | |||||
| | | | * | | | | | | | After previous discussion, put eye-catcher 'SCRIPT READY' messages to ↵ | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | console rather than log as warning The problem with logging at warn is that these aren't actually warnings, and so are false positives to scripts that monitor for problems. Ideally, log4net would have a separate "status" logging level, but currently we will compromise by putting them to console, as they are user-oriented | |||||
| | | | * | | | | | | | Convert if-blocks to return statements in small functions such as ↵ | Eva Comaroski | 2013-12-14 | 1 | -15/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | GetStartParameter(). | |||||
| | | * | | | | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -16/+22 | |
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | ||||||
| | | | * | | | | | | | Make WindParamSet success a console message rather than a log message. | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This effectively disables the log message as requested by http://opensimulator.org/mantis/view.php?id=6890 | |||||
| | | | * | | | | | | | minor: Make wind console commands print out to console rather than log | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -14/+21 | |
| | | | | | | | | | | |