| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Melanie Thielker | 2014-06-21 | 577 | -18116/+55262 |
| |\ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | Merge branch 'master' into careminster | Melanie | 2014-01-28 | 54 | -1518/+1993 |
| | |\ | | | | | | | | | | | | | | | | | | | | | | 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-28 | 4 | -24/+75 |
| | | |\ | |||||
| | | | * | Added osGetRegionSize(), which returns the region size in meters and ↵ | Oren Hurvitz | 2014-01-28 | 3 | -0/+29 |
| | | | | | | | | | | | | | | | | | recognizes megaregions | ||||
| | | | * | Convert tabs to spaces from previous commit 8c2b41b01 | Justin Clark-Casey (justincc) | 2014-01-28 | 1 | -27/+27 |
| | | | | | |||||
| | | | * | Make inidirectory files supercede distro files | Dev Random | 2014-01-27 | 1 | -27/+49 |
| | | | | | |||||
| | | * | | 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 | ||||
| | | * | | Re-enabled NPCModuleTests.TestCreate() | Justin Clark-Casey (justincc) | 2014-01-27 | 1 | -3/+1 |
| | | | | | |||||
| | | * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -21/+19 |
| | | |\ \ | | | |/ | |||||
| | | | * | minor: remove long unused state queue from "show queues" console reports | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -5/+3 |
| | | | | | |||||
| | | | * | minor: correct the usage statement on the "show image queues" console ↵ | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | command - should not have been "image queues show" | ||||
| | | | * | Skip IClientAPIs that don't implement IStatsCollector (such as NPCAvatar) ↵ | Justin Clark-Casey (justincc) | 2014-01-24 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | from the "show queues" console report to stop screwing up formatting. "show pquques" already did this | ||||
| | | * | | 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 | ||||
| | | * | | Adds a configuration option to cannibalize bandwidth from the | Mic Bowman | 2014-01-20 | 2 | -0/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | udp texture throttle and move it to the task throttle. Since most viewers are using http textures, the udp texture throttle is holding onto bw that could be used for more responsive prims updates. See the documentation for CannibalizeTextureRate in OpenSimDefaults.ini. Option is disabled by default. | ||||
| | | * | | 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 | ||||
| | | * | | rather than converting existing materials to assets, just retrieve them and ↵ | dahlia | 2014-01-20 | 1 | -32/+12 |
| | | | | | | | | | | | | | | | | | make them available for viewing. Any new materials added to the scene will become assets. | ||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | dahlia | 2014-01-20 | 11 | -43/+467 |
| | | |\ \ | |||||
| | | | * \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2014-01-20 | 4 | -3/+281 |
| | | | |\ \ | |||||
| | | | | * | | Clean up orphaned json stores. This can happen when an object is | Mic Bowman | 2014-01-20 | 4 | -3/+281 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 7 | -40/+186 |
| | | | |\ \ \ | | | | |/ / | | | |/| / | | | | |/ | |||||
| | | | | * | Stop exceptions being generated on agent connection if a telehub object has ↵ | Justin Clark-Casey (justincc) | 2014-01-20 | 7 | -40/+186 |
| | | | | | | | | | | | | | | | | | | | | | been deleted or has no spawn points. | ||||
| | | * | | | add null texture entry face check before converting legacy materials | dahlia | 2014-01-20 | 1 | -2/+2 |
| | | |/ / | |||||
| | | * | | force SOG update when converting legacy materials to ensure changes are ↵ | dahlia | 2014-01-20 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | persisted | ||||
| | | * | | delay texture entry parsing until absolutely necessary while converting ↵ | dahlia | 2014-01-20 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | legacy materials | ||||
| | | * | | Add code to convert legacy materials stored in DynAttrs to new asset format ↵ | dahlia | 2014-01-20 | 1 | -20/+102 |
| | | | | | | | | | | | | | | | | | and store them as assets | ||||
| | | * | | Check agent permissions before modifying an object's materials. Also, when ↵ | Oren Hurvitz | 2014-01-20 | 1 | -10/+21 |
| | | | | | | | | | | | | | | | | | creating a Material asset, set the current agent as the Creator. | ||||
| | | * | | When asked to change the Material for one face, change only that face; not ↵ | Oren Hurvitz | 2014-01-20 | 1 | -18/+5 |
| | | | | | | | | | | | | | | | | | the default material | ||||
| | | * | | Materials module: a) Store materials as assets; b) Finalized it (removed the ↵ | Oren Hurvitz | 2014-01-20 | 11 | -453/+301 |
| | | | | | | | | | | | | | | | | | | | | | | | | | "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'. | ||||
| | | * | | Renamed MaterialsDemoModule to MaterialsModule | Oren Hurvitz | 2014-01-20 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | - Materials: support the viewer removing the material (in which case ↵ | Oren Hurvitz | 2014-01-20 | 1 | -35/+42 |
| | | | | | | | | | | | | | | | | | matsMap["Material"] is missing) - Reduced logging | ||||
| | | * | | Fix casting error for float type INI file parameter parsing. | Robert Adams | 2014-01-19 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -12/+39 |
| | | |\ \ | | | |/ | |||||
| | | | * | Following on from 50ea2e0, only fetch scene presence for check if ↵ | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -17/+38 |
| | | | | | | | | | | | | | | | | | lightscript function has failed initial IsEstateManagerOrOwner() check | ||||
| | | | * | Fixed: Windlight functions caused an error if called when the script's owner ↵ | Oren Hurvitz | 2014-01-18 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | isn't in the scene | ||||
| | | | * | Revert "Fixed: Windlight functions caused an error if called when the ↵ | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -9/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | script's owner isn't in the scene" This reverts commit 39e5785c0f5bfa9fce2549757ac895920c88825a. Did not mean to apply this yet. | ||||
| | | | * | Fixed: Windlight functions caused an error if called when the script's owner ↵ | Oren Hurvitz | 2014-01-17 | 1 | -3/+9 |
| | | | | | | | | | | | | | | | | | isn't in the scene | ||||
| | | * | | 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 |
| | | | | | |||||
| | | * | | minor: Add method doc to IImproveAssetCache | Justin Clark-Casey (justincc) | 2014-01-18 | 1 | -1/+25 |
| | | | | | |||||
| | | * | | 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 |
| | | | | | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |