Merge branch 'master' into DRTVWR-499
No related branches found
No related tags found
Showing
- .clang-format 119 additions, 0 deletions.clang-format
- .gitignore 35 additions, 45 deletions.gitignore
- .hgtags 1 addition, 0 deletions.hgtags
- autobuild.xml 1 addition, 1 deletionautobuild.xml
- build.sh 17 additions, 0 deletionsbuild.sh
- indra/llui/llcheckboxctrl.cpp 54 additions, 10 deletionsindra/llui/llcheckboxctrl.cpp
- indra/llui/llcheckboxctrl.h 17 additions, 0 deletionsindra/llui/llcheckboxctrl.h
- indra/llui/lltextbase.h 2 additions, 0 deletionsindra/llui/lltextbase.h
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/llappviewer.cpp 12 additions, 3 deletionsindra/newview/llappviewer.cpp
- indra/newview/llappviewer.h 3 additions, 1 deletionindra/newview/llappviewer.h
- indra/newview/llfloaterforgetuser.cpp 241 additions, 53 deletionsindra/newview/llfloaterforgetuser.cpp
- indra/newview/llfloaterforgetuser.h 11 additions, 1 deletionindra/newview/llfloaterforgetuser.h
- indra/newview/llpanellogin.cpp 76 additions, 23 deletionsindra/newview/llpanellogin.cpp
- indra/newview/llpanelobjectinventory.cpp 5 additions, 4 deletionsindra/newview/llpanelobjectinventory.cpp
- indra/newview/llsecapi.h 4 additions, 0 deletionsindra/newview/llsecapi.h
- indra/newview/llsechandler_basic.cpp 13 additions, 0 deletionsindra/newview/llsechandler_basic.cpp
- indra/newview/llsechandler_basic.h 4 additions, 0 deletionsindra/newview/llsechandler_basic.h
- indra/newview/llselectmgr.cpp 1 addition, 1 deletionindra/newview/llselectmgr.cpp
- indra/newview/llstartup.cpp 9 additions, 0 deletionsindra/newview/llstartup.cpp
Loading
Please register or sign in to comment