summaryrefslogtreecommitdiff
path: root/indra/newview/llscrollingpanelparam.cpp
AgeCommit message (Collapse)Author
2009-10-16Changing declaration of static constant member variables to match exact ↵Neal Orman
required format. Windows and Linux glossed over this issue, but mac was more picky. Fix code reviewed by Bigpapi.
2009-10-16merging in new wearable infrastructure to get a step closer to eventually ↵Neal Orman
supporting multiple wearables per type. Merge tested and compiles/working on linux and windows - no obvious regressions on appearance or appearance editor. Merge generated no conflicts due to being tested in fresh re-branch in avatar-pipeline/multiple-textures-12. Merge perfomed with following command: svn merge -r 136489:136510 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/multiple-textures-12 . Progress can be tracked in DEV-32551. -Nyx