Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

XDG Integration
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

17d87b0f

Commit 17d87b0f authored 14 years ago by Oz Linden

Downloads
- Plain Diff

Automated merge with ssh://hg.lindenlab.com/richard/viewer-social

parents a024493c d27a695b

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 4 additions, 0 deletions

.hgtags
BuildParams 7 additions, 57 deletions

BuildParams
doc/contributions.txt 1 addition, 0 deletions

doc/contributions.txt
indra/llcommon/llversionviewer.h 1 addition, 1 deletion

indra/llcommon/llversionviewer.h
indra/newview/llchathistory.cpp 33 additions, 10 deletions

indra/newview/llchathistory.cpp
indra/newview/llchathistory.h 1 addition, 1 deletion

indra/newview/llchathistory.h
indra/newview/llnearbychatbar.cpp 11 additions, 0 deletions

indra/newview/llnearbychatbar.cpp
indra/newview/llnearbychatbar.h 2 additions, 0 deletions

indra/newview/llnearbychatbar.h
indra/newview/llviewermessage.cpp 0 additions, 1 deletion

indra/newview/llviewermessage.cpp
indra/newview/skins/default/xui/en/panel_people.xml 13 additions, 13 deletions

indra/newview/skins/default/xui/en/panel_people.xml

with 73 additions and 83 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment