Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ / | |||||
* | | update OpenMetaverse.StructuredData to git master ↵ | dahlia | 2014-01-20 | 2 | -117/+117 |
| | | | | | | | | (bf4e9f654ff99c85e20b53e56faac38e307dd8c2) which fixes JSON OSD serialization to a standards compliant means of encoding floating point NaN and Infinity | ||||
* | | 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 | 12 | -453/+307 |
| | | | | | | | | | | | | "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 | 2 | -20/+42 |
|\ \ | |/ | |||||
| * | 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. | ||||
| * | minor: Add Ai Austin to additional OpenSim contributors by request as he has ↵ | Justin Clark-Casey (justincc) | 2014-01-17 | 1 | -8/+3 |
| | | | | | | | | added config corrections and does extensive liaison with other projects | ||||
| * | 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 |
| | | |||||
* | | 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 | 11 | -140/+68 |
|\ \ | |/ | |||||
| * | Can delete the Offline Messages sent to/from a user. | Oren Hurvitz | 2014-01-16 | 5 | -0/+44 |
| | | | | | | | | This is useful if the user is deleted. | ||||
| * | In the offline message table, store the sender. | Oren Hurvitz | 2014-01-16 | 4 | -5/+16 |
| | | | | | | | | This data is useful for preventing abuse (e.g., someone who sends too many messages), or for deleting message if their sender has been deleted. | ||||
| * | Fixed offline IM | Oren Hurvitz | 2014-01-16 | 1 | -8/+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 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-14 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | minor: Add David Rowe to ctrlaltdavid handle by request | Justin Clark-Casey (justincc) | 2014-01-14 | 1 | -1/+1 |
| | | |||||
* | | 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-11 | 2 | -2/+4 |
|\ \ | |/ | |||||
| * | Allow Boolean nodes in XML to be specified as "0/1". AuroraSim does that. | Oren Hurvitz | 2014-01-11 | 2 | -2/+4 |
| | | |||||
* | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-10 | 2 | -4/+4 |
|\ \ | |/ | |||||
| * | In library inventory, correct asset id for llSay example script | Justin Clark-Casey (justincc) | 2014-01-10 | 2 | -4/+4 |
| | | | | | | | | | | From http://opensimulator.org/mantis/view.php?id=6917 Thanks to FreakyTech for this spot. | ||||
* | | Merge branch 'justincc-master' | Justin Clark-Casey (justincc) | 2014-01-10 | 2 | -1/+2 |
|\ \ | |/ | |||||
| * | minor: Add ctrlaltdavid to contributors list | Justin Clark-Casey (justincc) | 2014-01-10 | 1 | -0/+1 |
| | |