| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Change some ORs to assignments as they should be | Melanie Thielker | 2014-07-29 | 1 | -5/+5 |
| | | |||||
| * | fix the mess about exclusive fields and flags on land overlay | UbitUmarov | 2014-07-29 | 2 | -31/+34 |
| | | |||||
| * | change parcel overlay bytes adding LocalSound.. changed others also NEEDS | UbitUmarov | 2014-07-29 | 3 | -30/+66 |
| | | | | | checking | ||||
| * | dont mess with sound gain on stop | UbitUmarov | 2014-07-27 | 1 | -1/+1 |
| | | |||||
| * | change how sounds work. May be bad.. needs testing | UbitUmarov | 2014-07-27 | 1 | -94/+55 |
| | | |||||
| * | revert my change of not adding physcis to a failed avatar transfer. This | UbitUmarov | 2014-07-24 | 1 | -3/+0 |
| | | | | | may need a better fix later ( doing a stand elsewhere?) | ||||
| * | on transfer fail of sited avatars, only do | UbitUmarov | 2014-07-24 | 1 | -2/+2 |
| | | |||||
| * | fix line ending | UbitUmarov | 2014-07-24 | 1 | -4/+4 |
| | | |||||
| * | if sited avatar cross fails, dont add it to physics and dont mess scripts | UbitUmarov | 2014-07-22 | 1 | -1/+4 |
| | | | | | (?) | ||||
| * | Remove extremely spammy error message that isn't an actual error - user | Melanie Thielker | 2014-07-20 | 1 | -5/+5 |
| | | | | | | ids queried may not exist, since LSL can use this as well, with arbitrary ids | ||||
| * | Merge branch 'ubitworkmaster' | Melanie Thielker | 2014-07-20 | 1 | -1/+1 |
| |\ | |||||
| | * | replace old Attachoffset by AttachedPos. Comented out possible merge | UbitUmarov | 2014-07-20 | 1 | -1/+1 |
| | | | | | | | | | artifacts | ||||
| * | | Fix duplicate attach message being sent to objects picked up from the ground | Melanie Thielker | 2014-07-20 | 1 | -1/+4 |
| |/ | |||||
| * | Fix taking objects | Melanie Thielker | 2014-07-19 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'avination-current' | Melanie Thielker | 2014-07-19 | 1 | -5/+16 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs | ||||
| | * | Merge branch 'avination-current' into ubitwork | UbitUmarov | 2014-07-16 | 8 | -39/+90 |
| | |\ | |||||
| | * \ | Merge branch 'avination-current' into ubitwork | UbitUmarov | 2013-06-08 | 1 | -1/+1 |
| | |\ \ | |||||
| | * | | | try to suspend and resume keyframes on copy to inventory to take copy | UbitUmarov | 2013-06-06 | 1 | -1/+12 |
| | | | | | | | | | | | | | | | | | doesn't destroy state | ||||
| * | | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 84 | -1389/+6355 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * \ \ \ | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 18 | -477/+456 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * \ \ \ | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-24 | 4 | -320/+362 |
| | | |\ \ \ \ | |||||
| | | | * | | | | Properly dispose of drawing objects to reduce/stop memory leakage on ↵ | Justin Clark-Casey (justincc) | 2014-01-24 | 4 | -319/+343 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults) | ||||
| | | | * | | | | Add "generate map" console command to allow manual regeneration and storage ↵ | Justin Clark-Casey (justincc) | 2014-01-23 | 2 | -1/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of maptiles Primarily for test purposes though could be useful if one prefers to manually update the map tile | ||||
| | | * | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-20 | 2 | -4/+6 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | Stop exceptions being generated on agent connection if a telehub object has ↵ | Justin Clark-Casey (justincc) | 2014-01-20 | 2 | -4/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | been deleted or has no spawn points. | ||||
| | | * | | | | | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵ | Oren Hurvitz | 2014-01-20 | 6 | -22/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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'. | ||||
| | | * | | | | | Remove redundant methods in FlotsamAssetCache | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -10/+0 |
| | | | | | | | | |||||
| | | * | | | | | implement CoreAssetCache.Check() | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -1/+2 |
| | | | | | | | | |||||
| | | * | | | | | 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: since structs are values, assigning them to another variable copies ↵ | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | it. Instantiation is unnecessary. | ||||
| | | * | | | | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-16 | 2 | -4/+4 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | Remove old IInterRegionComms and references. This hasn't been used since ↵ | Justin Clark-Casey (justincc) | 2014-01-16 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2009 and was superseded by ISimulationService | ||||
| | * | | | | | | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 2 | -31/+36 |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -67/+56 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | 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 | 2 | -18/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | its main permissions | ||||
| | | | * | | | | Refactored setting permissions when rezzing items: use the same function ↵ | Oren Hurvitz | 2014-01-10 | 1 | -37/+14 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.) | ||||
| | * | | | | | | Intermediate commit. Sill errors. | Melanie | 2014-01-05 | 3 | -30/+47 |
| | |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 1 | -11/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| | | * | | | | | Fix issue with editing notes for other avatars | BlueWall | 2013-12-16 | 1 | -2/+2 |
| | | | | | | | | |||||
| | | * | | | | | 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 |
| | | | | | | | | |||||
| | | * | | | | | Committing the Avination Scene Presence and related texture code | Melanie | 2013-12-11 | 7 | -130/+631 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Parts of region crossing code - New bakes handling code - Bakes now sent from sim to sim without central storage - Appearance handling changes - Some changes to sitting - A number of unrelated fixes and improvements | ||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |