summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelimcontrolpanel.h
AgeCommit message (Expand)Author
2009-08-13merge -r 130196-130356 skinning-20 -> viewer-2.0.0-3Steven Bennetts
2009-07-27Merged skinning-17 into viewer-2 for bug fixes. Commented out new IM window ...James Cook