aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-224-7/+21
|\
| * Implement chat across region borders since we can tell if avatars in neighbou...Justin Clark-Casey (justincc)2013-03-221-1/+1
| * On the later forms of teleport failure, tell the user if this was because vie...Justin Clark-Casey (justincc)2013-03-201-2/+8
| * Prevent multiple instances of the same item ID being appended to an AvatarApp...Justin Clark-Casey (justincc)2013-03-192-4/+12
| * Process default attachment point in AttachObjectInternal before we check whet...Justin Clark-Casey (justincc)2013-03-191-27/+27
| * Fix tests for multiattachMelanie2013-03-182-6/+6
| * Merge branch 'master' into newmultiattachMelanie2013-03-182-82/+305
| |\
| * \ Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
| |\ \
| * | | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| * | | Multiattach, part 1Melanie2013-03-182-33/+31
* | | | Fix merge artefactsMelanie2013-03-192-6/+6
* | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-192-143/+351
|\ \ \ \ | | |_|/ | |/| |
| * | | Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| * | | Fix recent regression where an item worn to an attachment point that was alre...Justin Clark-Casey (justincc)2013-03-182-89/+153
* | | | Merge branch 'master' into careminsterMelanie2013-03-081-2/+0
|\ \ \ \ | |/ / /
| * | | minor: remove some completely unused string local vars added recently in comm...Justin Clark-Casey (justincc)2013-03-061-2/+0
| | |/ | |/|
* | | Merge branch 'avination' into careminsterMelanie2013-03-062-30/+38
|\ \ \
| * | | Limit each attachment point to 5 items as per specMelanie2013-03-051-3/+13
| * | | Multiattach, part 1Melanie2013-03-052-30/+20
* | | | Merge branch 'master' into careminsterMelanie2013-03-051-144/+165
|\ \ \ \ | | |/ / | |/| |
| * | | Get attachment script state before taking sp.AttachmentsSyncLock() to avoid r...Justin Clark-Casey (justincc)2013-03-051-140/+161
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-02-281-1/+2
|\ \ \ | |/ /
| * | Switched to using the other Util function with a default value.Diva Canto2013-02-271-1/+2
| * | Moved the HG default variables out of [Startup] and into their own section [H...Diva Canto2013-02-271-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-02-231-1/+1
|\ \ \ | |/ /
| * | Added new Util function for reading config vars that's more generic than the ...Diva Canto2013-02-221-1/+1
* | | Merge branch 'master' into careminsterMelanie2013-02-222-2/+4
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-211-1/+1
| |\ \
| | * | minor: Change summary in "show appearance" console command to "incomplete" ra...Justin Clark-Casey (justincc)2013-02-211-1/+1
| * | | Simplification of HG configs: HomeURI and GatekeeperURI now are defined as de...Diva Canto2013-02-211-1/+3
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-02-166-271/+435
|\ \ \ | |/ /
| * | Separate IAR tests into separate files for load/save/loadpath testsJustin Clark-Casey (justincc)2013-02-163-245/+198
| * | Make it so that "load iar / ..." does not save the 'root' "My Inventory" folder.Justin Clark-Casey (justincc)2013-02-162-1/+60
| * | Add regression test TestSaveNonRootFolderToIarJustin Clark-Casey (justincc)2013-02-165-27/+179
* | | Merge branch 'master' into careminsterMelanie2013-02-081-0/+18
|\ \ \ | |/ /
| * | On IAR loading, if loading of a coaleseced item entirely fails, then continue...Justin Clark-Casey (justincc)2013-02-081-0/+18
| * | Implement a workaround solution for saving manual script state changes by the...Justin Clark-Casey (justincc)2013-01-111-5/+19
| * | Save attachments on detach/exit if a contained script state has been changed.Justin Clark-Casey (justincc)2013-01-111-1/+17
* | | Merge branch 'avination' into careminsterMelanie2013-02-071-12/+23
|\ \ \ | | |/ | |/|
| * | * This Checks the asset of each wearable asynchronously and repairs if it's r...teravus2013-01-291-12/+23
* | | Merge branch 'avination' into careminsterMelanie2013-01-311-13/+10
|\ \ \ | |/ /
| * | Change default avatar replacements to be ruth rather than urban maleMelanie2013-01-281-13/+10
* | | Merge branch 'avination' into careminsterMelanie2013-01-271-4/+259
|\ \ \ | |/ /
| * | * This update is ugly as sin, but it 'fills in the blanks' of your appearance...teravus2013-01-261-4/+259
* | | Merge branch 'avination'Melanie2013-01-192-262/+71
|\ \ \ | |/ /
| * | Remove the core groups moduleMelanie2013-01-191-252/+0
| * | Kill the dumb Opensimulator Testing group again - for good.Melanie2013-01-191-8/+3
| * | * Enables loading cached bakes on teleport by filling in the appropriate avat...teravus2013-01-161-2/+71
* | | Merge branch 'master' into careminsterMelanie2013-01-101-0/+3
|\ \ \ | | |/ | |/|
| * | On baked texture save, replace any HG ID with an ordinary asset ID so the HGA...Justin Clark-Casey (justincc)2013-01-101-0/+3