| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit '327320d1a7acbba969d26c281f92f64ce8ff365f' into careminster | Melanie | 2012-09-27 | 0 | -0/+0 |
|\ |
|
| * | Enforce existing 5 action hardcoded undo limit. | Justin Clark-Casey (justincc) | 2012-09-26 | 3 | -27/+65 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-09-26 | 7 | -12/+41 |
| |\ |
|
| * | | Add basic undo/redo regression tests. | Justin Clark-Casey (justincc) | 2012-09-26 | 3 | -8/+137 |
* | | | Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster | Melanie | 2012-09-27 | 12 | -19/+147 |
|\ \ \
| | |/
| |/| |
|
| * | | Use GridUser properly for foreign users. | Diva Canto | 2012-09-26 | 5 | -8/+35 |
| * | | Show the user's home url too on the console command. | Diva Canto | 2012-09-26 | 1 | -4/+3 |
| * | | 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 |
| * | | | | 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 commit 'ddd9384b3901f532243c1e8018334385b84290d1' into careminster | Melanie | 2012-09-27 | 0 | -0/+0 |
|\ \ \ \ \
| | |/ / /
| |/| | | |
|
| * | | | | Fix very recently introduced race condition where a CreateNewItem outracing a... | Justin Clark-Casey (justincc) | 2012-09-25 | 1 | -19/+18 |
| | |_|/
| |/| | |
|
| * | | | Comment out old m_storeLocal from AssetXferUploader. | Justin Clark-Casey (justincc) | 2012-09-25 | 1 | -6/+6 |
| * | | | Insert transaction ID into AssetXferUploader constructor rather than at Uploa... | Justin Clark-Casey (justincc) | 2012-09-25 | 2 | -36/+49 |
| * | | | Move UDP update task item code to AssetXferUploader to match existing create ... | Justin Clark-Casey (justincc) | 2012-09-25 | 3 | -64/+52 |
| * | | | Fix occasional race condition failure when creating new clothing/body parts i... | Justin Clark-Casey (justincc) | 2012-09-25 | 3 | -110/+94 |
* | | | | Fix very recently introduced race condition where a CreateNewItem outracing a... | Justin Clark-Casey (justincc) | 2012-09-27 | 1 | -19/+18 |
* | | | | Comment out old m_storeLocal from AssetXferUploader. | Justin Clark-Casey (justincc) | 2012-09-27 | 1 | -6/+6 |
* | | | | Format OpenSim.ini.example | BlueWall | 2012-09-27 | 1 | -35/+65 |
* | | | | Insert transaction ID into AssetXferUploader constructor rather than at Uploa... | Justin Clark-Casey (justincc) | 2012-09-27 | 2 | -36/+49 |
* | | | | Move UDP update task item code to AssetXferUploader to match existing create ... | Justin Clark-Casey (justincc) | 2012-09-27 | 3 | -50/+52 |
* | | | | Fix occasional race condition failure when creating new clothing/body parts i... | Justin Clark-Casey (justincc) | 2012-09-27 | 3 | -110/+93 |
* | | | | Merge commit '77355295dadaf3be54ac29d6b3d30901e95c0a32' into careminster | Melanie | 2012-09-27 | 2 | -4/+190 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | 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 |
| | |/
| |/| |
|
* | | | Merge branch 'master' into careminster | Melanie | 2012-09-24 | 108 | -455/+13520 |
|\ \ \
| |/ / |
|
| * | | 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 go.... | Diva Canto | 2012-09-22 | 3 | -4/+136 |
| * | | 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 |
| | * | 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 |
| | |/
| |/| |
|
| * | | 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 c... | Justin Clark-Casey (justincc) | 2012-09-22 | 2 | -8/+150 |
| * | | | Moved the small HGUuidGatherer class to the file where its parent class is. N... | Diva Canto | 2012-09-21 | 3 | -74/+38 |
| | |/
| |/| |
|
| * | | Removed redundant asset fetches on HGAssetMapper. The UuidGatherer already do... | Diva Canto | 2012-09-21 | 1 | -18/+24 |
| * | | Minor: may avoid crashes of sims that still don't have this configuration sec... | Diva Canto | 2012-09-21 | 2 | -1/+4 |
| |/ |
|
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-09-21 | 8 | -180/+210 |
| |\ |
|