merge changes for DRTVWR-302
Showing
- .hgtags 64 additions, 63 deletions.hgtags
- doc/contributions.txt 1 addition, 0 deletionsdoc/contributions.txt
- indra/llrender/llfontgl.cpp 5 additions, 0 deletionsindra/llrender/llfontgl.cpp
- indra/llui/llchatentry.cpp 9 additions, 0 deletionsindra/llui/llchatentry.cpp
- indra/llui/llfloater.cpp 1 addition, 1 deletionindra/llui/llfloater.cpp
- indra/llui/llfloater.h 1 addition, 1 deletionindra/llui/llfloater.h
- indra/llui/llfloaterreg.cpp 5 additions, 5 deletionsindra/llui/llfloaterreg.cpp
- indra/llui/lllineeditor.cpp 8 additions, 0 deletionsindra/llui/lllineeditor.cpp
- indra/llui/lltextbase.cpp 9 additions, 2 deletionsindra/llui/lltextbase.cpp
- indra/llui/lltexteditor.cpp 0 additions, 1 deletionindra/llui/lltexteditor.cpp
- indra/llui/llurlaction.cpp 24 additions, 7 deletionsindra/llui/llurlaction.cpp
- indra/llui/llurlaction.h 2 additions, 0 deletionsindra/llui/llurlaction.h
- indra/newview/app_settings/settings.xml 22 additions, 0 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llavataractions.cpp 1 addition, 1 deletionindra/newview/llavataractions.cpp
- indra/newview/llchathistory.cpp 21 additions, 1 deletionindra/newview/llchathistory.cpp
- indra/newview/llconversationlog.cpp 33 additions, 0 deletionsindra/newview/llconversationlog.cpp
- indra/newview/llconversationlog.h 2 additions, 0 deletionsindra/newview/llconversationlog.h
- indra/newview/llconversationloglist.cpp 46 additions, 23 deletionsindra/newview/llconversationloglist.cpp
- indra/newview/llconversationview.cpp 36 additions, 15 deletionsindra/newview/llconversationview.cpp
- indra/newview/llconversationview.h 2 additions, 0 deletionsindra/newview/llconversationview.h
Loading
Please register or sign in to comment