| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Not really a change, just added a reminder to fix something here. | Diva Canto | 2012-09-26 | 1 | -0/+3 | |
| |/ | ||||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-25 | 4 | -234/+248 | |
| |\ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-25 | 1 | -35/+65 | |
| | |\ | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-09-25 | 4 | -191/+364 | |
| | | |\ | ||||||
| | | * | | Format OpenSim.ini.example | BlueWall | 2012-09-25 | 1 | -35/+65 | |
| | | | | | | | | | | | | | | | | | Make lines fint in 80x24 terminal for easier reading | |||||
| | * | | | Fix very recently introduced race condition where a CreateNewItem outracing ↵ | Justin Clark-Casey (justincc) | 2012-09-25 | 1 | -19/+18 | |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | an UploadAsset request could throw an exception because m_asset did not yet exist. This was accidentally introduced in 4fc0cfb This commit also consistently removes the AssetXferUploader when the transaction completes, no matter if it completed on asset upload or item operation. The amount of data being retained was small, since this was clothing/bodypart metadata in the asset rather than textures themselves. | |||||
| | * | | Comment out old m_storeLocal from AssetXferUploader. | Justin Clark-Casey (justincc) | 2012-09-25 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | This was only used if none of new item, update item or update task item had been set. But since all transactions go through these paths this old code is redundant. | |||||
| | * | | Insert transaction ID into AssetXferUploader constructor rather than at ↵ | Justin Clark-Casey (justincc) | 2012-09-25 | 2 | -36/+49 | |
| | | | | | | | | | | | | | | | | | | | | | | UploadAsset() to prevent item creation failure when NewInventoryItem thread reachs the object first. This was preventing the previous race condition fix in 4fc0cfb from actually working. This commit also removes some of the pointless transaction id checks - these conditions are already being enforced in AgentAssetsTransactions. | |||||
| | * | | Move UDP update task item code to AssetXferUploader to match existing create ↵ | Justin Clark-Casey (justincc) | 2012-09-25 | 3 | -64/+52 | |
| | | | | | | | | | | | | | | | | | | | | | | user item and update user item mechanisms This is done for consistency and to allow removal or some access methods that increase code complexity. However, this path has not been used for a long time, not even by LL 1.23 - viewers use caps http upload for this instead | |||||
| | * | | Fix occasional race condition failure when creating new clothing/body parts ↵ | Justin Clark-Casey (justincc) | 2012-09-25 | 3 | -110/+94 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | in the viewer or updating existing assets. On creating these items, the viewer sends a UDP AssetUploadRequest followed by a CreateInventoryItem. It was possible for the CreateInventoryItem/UpdateInventoryItem to occasionally outrace the AssetUploadRequest and fail to find an initialized Xfer object, at which point the item create would fail. So instead we always set up a Xfer object on either the asset or inventory item update request. This does not introduce a new race because code already exists to delay the item operation until the asset is uploaded if necessary (but this only worked if the xfer object already existed) | |||||
| * | | | TOS module. WARNING: migration in GridUser table. | Diva Canto | 2012-09-25 | 7 | -5/+104 | |
| | | | | ||||||
| * | | | Oops, that should be inside the curly bracket. | Diva Canto | 2012-09-25 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-25 | 1 | -2/+190 | |
| |\ \ \ | |/ / | ||||||
| | * | | Documenting object-related events | SignpostMarv | 2012-09-24 | 1 | -0/+43 | |
| | | | | ||||||
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-24 | 9 | -27/+269 | |
| | |\ \ | | |/ | ||||||
| | * | | Documenting LSL script-related events | SignpostMarv | 2012-09-24 | 1 | -2/+147 | |
| | | | | ||||||
| * | | | Deleted extraneous debug message | Diva Canto | 2012-09-25 | 1 | -2/+0 | |
| | |/ |/| | ||||||
| * | | HG Rez object: warn the user if the item or asset cannot be found. | Diva Canto | 2012-09-22 | 1 | -2/+7 | |
| | | | ||||||
| * | | Guard against inventory get failures. | Diva Canto | 2012-09-22 | 1 | -0/+3 | |
| | | | ||||||
| * | | Make BaseHttpServer throws say something useful. | Diva Canto | 2012-09-22 | 1 | -2/+2 | |
| | | | ||||||
| * | | HG 2.0: User Agent Service now can also control where the local users can ↵ | Diva Canto | 2012-09-22 | 3 | -4/+136 | |
| | | | | | | | | | go. Domain-name and user-level based. \o/ | |||||
| * | | More HG 2.0: access control at the Gatekeeper. \o/ | Diva Canto | 2012-09-21 | 3 | -9/+76 | |
| | | | ||||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-21 | 2 | -74/+52 | |
| |\ \ | |/ | ||||||
| | * | Remove deprecated parameters for region_id. | Michelle Argus | 2012-09-22 | 1 | -74/+0 | |
| | | | | | | | | | Remove deprecated parameters for region_id as anounced in january 2012. | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-22 | 3 | -74/+38 | |
| | |\ | ||||||
| | * | | Documenting non-LSL script-related events | SignpostMarv | 2012-09-22 | 1 | -0/+52 | |
| | | | | ||||||
| * | | | This fixes HG attachments' missing assets (textures, etc). | Diva Canto | 2012-09-21 | 2 | -10/+45 | |
| | |/ |/| | | | | | Also, further improvements on HGUuidGatherer: if the assets are already in this grid don't fetch them again. | |||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-21 | 2 | -8/+150 | |
| |\ \ | |/ | ||||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-22 | 3 | -19/+28 | |
| | |\ | ||||||
| | * | | Fix llListFindList() returning no match when there is a match with a script ↵ | Justin Clark-Casey (justincc) | 2012-09-22 | 2 | -8/+150 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | constant component in the source list. Adds regression test for this case. Based on http://opensimulator.org/mantis/view.php?id=6156 Thanks SignpostMarv. | |||||
| * | | | Moved the small HGUuidGatherer class to the file where its parent class is. ↵ | Diva Canto | 2012-09-21 | 3 | -74/+38 | |
| | |/ |/| | | | | | No need to keep 2 separate files. | |||||
| * | | Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already ↵ | Diva Canto | 2012-09-21 | 1 | -18/+24 | |
| | | | | | | | | | downloads the assets, so we don't need to do it again... | |||||
| * | | Minor: may avoid crashes of sims that still don't have this configuration ↵ | Diva Canto | 2012-09-21 | 2 | -1/+4 | |
| |/ | | | | section. | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-21 | 8 | -180/+210 | |
| |\ | ||||||
| | * | minor: Make slow outgoing request log messages consistent with other log ↵ | Justin Clark-Casey (justincc) | 2012-09-21 | 1 | -7/+7 | |
| | | | | | | | | | messages | |||||
| | * | Rename UuidGather.m_assetCache to m_assetService. If HGUuidGatherer hasn't ↵ | Justin Clark-Casey (justincc) | 2012-09-21 | 2 | -9/+6 | |
| | | | | | | | | | been instantiated with an assetServerURL then call down to overriden UuidGatherer.GetAsset() instead of calling m_assetService.GetAsset() itself - these two codepaths are now identical. | |||||
| | * | Simplify UuidGatherer by performing asset fetch synchronously rather than ↵ | Justin Clark-Casey (justincc) | 2012-09-21 | 1 | -40/+44 | |
| | | | | | | | | | using the async call but waiting for completion anyway! | |||||
| | * | Comment out the long unused afaik HTTP agent handlers. | Justin Clark-Casey (justincc) | 2012-09-21 | 5 | -106/+112 | |
| | | | | | | | | | | | | | As far as I know, this was only used by the IBM Rest modules, much of which has been commented out for a very long time now. Other similar code uses HTTP or stream handlers instead. So commenting this out to reduce code complexity and the need to make this facility consistent with the others where it may not be used anyway. If this facility is actually being used then please notify me or uncomment it if you are core. | |||||
| | * | Add request number counting to incoming HTTP requests in the same way that ↵ | Justin Clark-Casey (justincc) | 2012-09-21 | 2 | -19/+42 | |
| | | | | | | | | | | | | | | | | | | | this was already being done for outgoing HTTP requests. This allows us to associate debug logging messages with the right request. It also allows us to put a request number on 'long request' logging even if other debug logging is not enabled, which gives us some idea of whether every request is suffering this problem or only some. This is a separate internal number not associated with any incoming number in the opensim-request-id header, this will be clarified when logging of this incoming request number is re-enabled. This commit also adds port number to HTTP IN logging to allow us to distinguish between different request numbers on different ports. | |||||
| * | | HG 2.0: added asset import/export policies at the sim too. | Diva Canto | 2012-09-21 | 4 | -10/+37 | |
| | | | ||||||
| * | | Minor: change the return value of unsuccessful posts to string.Empty. | Diva Canto | 2012-09-21 | 2 | -2/+2 | |
| | | | ||||||
| * | | Improvement over last commit: refactor the asset permissions code, so that ↵ | Diva Canto | 2012-09-20 | 4 | -66/+98 | |
| |/ | | | | it can be used by both the HG Asset Service and the simulator. Also renamed the config vars to something more intuitive | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-20 | 12 | -56/+288 | |
| |\ | ||||||
| | * | Insert a new log level 4 for HTTP IN and HTTP OUT that will log how long the ↵ | Justin Clark-Casey (justincc) | 2012-09-20 | 3 | -32/+87 | |
| | | | | | | | | | | | | | | | request took. This is only printed if debug http level >= 4 and the request didn't take more than the time considered 'long', in which case the existing log message is printed. This displaces the previous log levels 4 and 5 which are now 5 and 6 respectively. | |||||
| | * | Add ability to turn on/off logging of outgoing HTTP requests flowing through ↵ | Justin Clark-Casey (justincc) | 2012-09-20 | 3 | -35/+103 | |
| | | | | | | | | | | | | | | | | | | | WebUtil. This is for debugging purposes. This is controlled via the "debug http" command which can already log incoming requests. This now gains a mandatory parameter of in, out or all to control what is logged. Log messages are also shortened and labelled and HTTP IN or HTTP OUT to be consistent with existing UDP PACKET IN and PACKET OUT messages. | |||||
| | * | Don't fail to create an IRC nick if nick randomization is disabled in the ↵ | Justin Clark-Casey (justincc) | 2012-09-20 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | IRC module. Patch from http://opensimulator.org/mantis/view.php?id=6293 Thanks Starflower. | |||||
| | * | Documentation of teleport-related events | SignpostMarv | 2012-09-20 | 1 | -0/+19 | |
| | | | ||||||
| | * | minor tweaks to existing comments for IDE goodness | SignpostMarv | 2012-09-20 | 1 | -4/+7 | |
| | | | ||||||
| | * | Documentation of agent-related events | SignpostMarv | 2012-09-20 | 1 | -1/+34 | |
| | | | ||||||
| | * | Documentation of object-related events | SignpostMarv | 2012-09-20 | 1 | -1/+38 | |
| | | | ||||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |