summaryrefslogtreecommitdiff
path: root/indra/newview/llimconversation.cpp
AgeCommit message (Expand)Author
2012-06-07Merge : pull from lindenlab/viewer-releaseMerov Linden
2012-06-01Build fixAlexanderP ProductEngine
2012-05-31CHUI-119 WIPSeth ProductEngine
2012-05-30Build fixAlexanderP ProductEngine
2012-05-30CHUI-119 WIP Prepare the nearby chat for hosting it by the IM-containerAlexanderP ProductEngine