| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | CrossPrimGroupIntoNewRegion does keyframes and physics crossing fails, so | UbitUmarov | 2014-07-22 | 1 | -91/+86 | |
| | | | | | revert previus change assuming it didnt. remove a no longer needed else {} | |||||
| * | consider that CrossPrimGroupIntoNewRegion removes DIE_AT_EDGE and | UbitUmarov | 2014-07-22 | 1 | -0/+2 | |
| | | | | | RETURN_AT_EDGE from simulation | |||||
| * | make ResetChildPrimPhysicsPositions only do what it is supposed to do and | UbitUmarov | 2014-07-22 | 1 | -1/+11 | |
| | | | | | not what AbsolutePosition does | |||||
| * | tell scripts about positions changes after they are actually changed | UbitUmarov | 2014-07-22 | 1 | -10/+18 | |
| | | ||||||
| * | dont try to cross with avatars on DIE_AT_EDGE or RETURN_AT_EDGE sog | UbitUmarov | 2014-07-22 | 1 | -84/+96 | |
| | | ||||||
| * | bug fix. Child position got broken because first prim i parts array may | UbitUmarov | 2014-07-22 | 1 | -0/+5 | |
| | | | | | not be the root prim | |||||
| * | send updates on selected attachments as sl ( warinin if reverted then a | UbitUmarov | 2014-07-22 | 1 | -3/+3 | |
| | | | | | fix is needed elsewhere since the changes are never sent) | |||||
| * | change presence movetotarget avoiding trying to go undergroud or fly when | UbitUmarov | 2014-07-21 | 1 | -1/+4 | |
| | | | | | it can walk. ( still needs better code ) | |||||
| * | make sittarget camera relative to root prim | UbitUmarov | 2014-07-20 | 1 | -17/+18 | |
| | | | | | Please enter the commit message for your changes. Lines starting | |||||
| * | another change to standup | UbitUmarov | 2014-07-20 | 1 | -1/+1 | |
| | | ||||||
| * | change avatar standup code | UbitUmarov | 2014-07-20 | 1 | -28/+25 | |
| | | ||||||
| * | physicsSit SendSitResponse also relative to parent prim | UbitUmarov | 2014-07-20 | 1 | -5/+11 | |
| | | ||||||
| * | physics engine cannot change internal positions of linksets, at least not | UbitUmarov | 2014-07-20 | 1 | -2/+2 | |
| | | | | | in teaseupdates | |||||
| * | replace old Attachoffset by AttachedPos. Comented out possible merge | UbitUmarov | 2014-07-20 | 3 | -11/+9 | |
| | | | | | artifacts | |||||
| * | Merge branch 'avination-current' | Melanie Thielker | 2014-07-19 | 1 | -15/+64 | |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | |||||
| | * | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | UbitUmarov | 2014-07-16 | 2 | -17/+19 | |
| | |\ | | | | | | | | | | into avination-current | |||||
| | * \ | Merge branch 'avination-current' of ssh://3dhosting.de/var/git/careminster ↵ | UbitUmarov | 2013-09-19 | 7 | -17/+26 | |
| | |\ \ | | | | | | | | | | | | | into avination-current | |||||
| | * | | | keyframe: add more locks, change timming stop, added Suspend and resume | UbitUmarov | 2013-06-06 | 1 | -15/+64 | |
| | | | | | ||||||
| * | | | | fix attachments | UbitUmarov | 2014-07-19 | 1 | -7/+9 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 44 | -1033/+2889 | |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | |||||
| | * | | | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 9 | -280/+367 | |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs | |||||
| | | * | | | Reinsert attachments list taking code in SP.MakeRootAgent() | Justin Clark-Casey (justincc) | 2014-01-27 | 1 | -14/+30 | |
| | | | | | | | | | | | | | | | | | | | | | Locking attachments then launching script instances on a separate thread will not work, attachments will simply be unlocked and vulnerable to race conditions. | |||||
| | | * | | | refactor: Remove identical part.ParentGroup.AddAvatar(UUID); calls which ↵ | Justin Clark-Casey (justincc) | 2014-01-27 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | occur no matter which branch of the conditional is executed | |||||
| | | * | | | Add back code to UuidGatherer to retrieve UUIDs for materials stored in ↵ | dahlia | 2014-01-20 | 1 | -0/+73 | |
| | | | | | | | | | | | | | | | | | | | | | DynAttrs. This is unfortunately still necessary until a better solution for handling existing legacy materials can be implemented | |||||
| | | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2014-01-20 | 1 | -0/+7 | |
| | | |\ \ \ | ||||||
| | | | * | | | Clean up orphaned json stores. This can happen when an object is | Mic Bowman | 2014-01-20 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | removed, when a script is removed, or when a script is reset. Also added a stats command to track the number of json stores used by a region. Will probably add some more commands later. | |||||
| | | * | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-20 | 2 | -15/+154 | |
| | | |\ \ \ \ | | | |/ / / | | |/| | | | ||||||
| | | | * | | | Stop exceptions being generated on agent connection if a telehub object has ↵ | Justin Clark-Casey (justincc) | 2014-01-20 | 2 | -15/+154 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | been deleted or has no spawn points. | |||||
| | | * | | | | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵ | Oren Hurvitz | 2014-01-20 | 2 | -97/+53 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Demo" label; removed most of the logging); c) Enabled by default Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'. | |||||
| | | * | | | | minor: reinsert some method doc back into IEntityTransferModule | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -0/+20 | |
| | | | | | | | ||||||
| | | * | | | | 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 | 2 | -123/+0 | |
| | | |\ \ \ \ | | | |/ / / | ||||||
| | | | * | | | Remove old IInterRegionComms and references. This hasn't been used since ↵ | Justin Clark-Casey (justincc) | 2014-01-16 | 2 | -123/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | 2009 and was superseded by ISimulationService | |||||
| | * | | | | | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 5 | -50/+95 | |
| | |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-10 | 1 | -5/+5 | |
| | | |\ \ \ \ | | | |/ / / | ||||||
| | | | * | | | 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 | 4 | -71/+92 | |
| | | |\ \ \ \ | | | |/ / / | ||||||
| | | | * | | | Refactored: use a single function to apply an object's folded permissions to ↵ | Oren Hurvitz | 2014-01-10 | 2 | -14/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | its main permissions | |||||
| | | | * | | | Refactored setting permissions when rezzing items: use the same function ↵ | Oren Hurvitz | 2014-01-10 | 3 | -57/+78 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -0/+2 | |
| | | |\ \ \ \ | | | |/ / / | ||||||
| | | | * | | | If an agent is sitting, then do send the rotation in the agent update ↵ | Justin Clark-Casey (justincc) | 2014-01-08 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 8 | -36/+79 | |
| | |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -1/+2 | |
| | | | | | | | ||||||
| | | * | | | | varregion: Add region size to teleport event messages (EnableSimulator, | Robert Adams | 2014-01-04 | 2 | -4/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |||||
| | | * | | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2013-12-16 | 3 | -15/+39 | |
| | | |\ \ \ \ | ||||||
| | | | * \ \ \ | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2013-12-14 | 1 | -3/+12 | |
| | | | |\ \ \ \ | | | | |/ / / | ||||||
| | | | | * | | | 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. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |