aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Avatar (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge branch 'avination' into careminsterMelanie2013-01-101-6/+1
|\ \ \ | | |/ | |/|
| * | * This finishes the implementation of AgentCachedTexture. Requires the XBak...teravus2012-12-291-6/+1
* | | Merge branch 'avination' into careminsterMelanie2013-01-062-11/+27
|\ \ \ | |/ /
| * | * Partial Commit for Avatar Appearance to include the functionality of Cached...teravus2012-12-212-11/+27
* | | Merge branch 'master' into careminsterMelanie2013-01-042-12/+13
|\ \ \ | | |/ | |/|
| * | minor: Add some doc to the extremely unhelpful 'fudge....' comment as to why ...Justin Clark-Casey (justincc)2013-01-031-1/+4
| * | Fix problem where object attached from ground often does not get attached pro...Justin Clark-Casey (justincc)2013-01-031-9/+1
| * | If Save OAR/IAR times-out while waiting for assets then notify the caller tha...Oren Hurvitz2013-01-021-2/+8
* | | Merge branch 'avination' into careminsterMelanie2012-12-181-16/+65
|\ \ \ | | |/ | |/|
| * | add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-131-13/+38
| * | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-8/+23
| * | *TEST* Use new avatar size in ubitODE.UbitUmarov2012-12-071-1/+10
* | | Merge branch 'master' into careminsterMelanie2012-12-091-70/+68
|\ \ \ | | |/ | |/|
| * | Re-enable code disabled in f605a62 to allow a TaskInventoryAccepted message t...Justin Clark-Casey (justincc)2012-12-081-70/+68
* | | Merge branch 'master' into careminsterMelanie2012-12-071-5/+5
|\ \ \ | |/ /
| * | minor: also comment out the debug log message which reports searching for chi...Justin Clark-Casey (justincc)2012-12-041-2/+2
| * | minor: Comment out "Delivering IM to..." messages for now.Justin Clark-Casey (justincc)2012-12-041-3/+3
| * | Bug fix in OfflineMessageModule. Mantis #6446Diva Canto2012-12-041-1/+1
* | | Merge branch 'master' into careminsterMelanie2012-11-302-14/+21
|\ \ \ | |/ /
| * | Bug fix in Offline IM for inventory transfers. The items were being placed tw...Diva Canto2012-11-271-11/+15
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-11-272-2/+2
| |\ \