merge changes for storm-834
No related branches found
No related tags found
Showing
- .hgtags 8 additions, 0 deletions.hgtags
- doc/contributions.txt 6 additions, 0 deletionsdoc/contributions.txt
- indra/llaudio/llaudioengine.cpp 5 additions, 1 deletionindra/llaudio/llaudioengine.cpp
- indra/llcommon/llavatarname.cpp 1 addition, 1 deletionindra/llcommon/llavatarname.cpp
- indra/llcommon/llavatarname.h 1 addition, 1 deletionindra/llcommon/llavatarname.h
- indra/llimage/llpngwrapper.cpp 4 additions, 14 deletionsindra/llimage/llpngwrapper.cpp
- indra/llimage/llpngwrapper.h 0 additions, 3 deletionsindra/llimage/llpngwrapper.h
- indra/llmessage/llavatarnamecache.cpp 155 additions, 110 deletionsindra/llmessage/llavatarnamecache.cpp
- indra/llmessage/llavatarnamecache.h 3 additions, 0 deletionsindra/llmessage/llavatarnamecache.h
- indra/llui/llnotifications.cpp 2 additions, 4 deletionsindra/llui/llnotifications.cpp
- indra/newview/app_settings/lindenlab.pem 71 additions, 1 deletionindra/newview/app_settings/lindenlab.pem
- indra/newview/app_settings/settings.xml 0 additions, 11 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llappviewer.cpp 11 additions, 22 deletionsindra/newview/llappviewer.cpp
- indra/newview/llfeaturemanager.cpp 1 addition, 10 deletionsindra/newview/llfeaturemanager.cpp
- indra/newview/llfloatersettingsdebug.cpp 1 addition, 1 deletionindra/newview/llfloatersettingsdebug.cpp
- indra/newview/llimview.cpp 1 addition, 1 deletionindra/newview/llimview.cpp
- indra/newview/lllogininstance.cpp 48 additions, 52 deletionsindra/newview/lllogininstance.cpp
- indra/newview/lllogininstance.h 0 additions, 7 deletionsindra/newview/lllogininstance.h
- indra/newview/llpanellandmarks.cpp 85 additions, 0 deletionsindra/newview/llpanellandmarks.cpp
- indra/newview/llpanellandmarks.h 8 additions, 0 deletionsindra/newview/llpanellandmarks.h
Loading
Please register or sign in to comment