svn merge -r73880:73879 svn+ssh://svn/svn/linden/release. backing out viewer auth merge
Showing
- indra/lib/python/indra/util/llmanifest.py 0 additions, 7 deletionsindra/lib/python/indra/util/llmanifest.py
- indra/llcommon/lluri.cpp 20 additions, 49 deletionsindra/llcommon/lluri.cpp
- indra/llcommon/lluri.h 1 addition, 6 deletionsindra/llcommon/lluri.h
- indra/newview/linux_tools/handle_secondlifeprotocol.sh 0 additions, 17 deletionsindra/newview/linux_tools/handle_secondlifeprotocol.sh
- indra/newview/linux_tools/register_secondlifeprotocol.sh 0 additions, 46 deletionsindra/newview/linux_tools/register_secondlifeprotocol.sh
- indra/newview/linux_tools/wrapper.sh 0 additions, 4 deletionsindra/newview/linux_tools/wrapper.sh
- indra/newview/llcommandhandler.cpp 5 additions, 6 deletionsindra/newview/llcommandhandler.cpp
- indra/newview/llcommandhandler.h 3 additions, 6 deletionsindra/newview/llcommandhandler.h
- indra/newview/llfloaterevent.cpp 3 additions, 3 deletionsindra/newview/llfloaterevent.cpp
- indra/newview/llfloaterparcel.cpp 2 additions, 2 deletionsindra/newview/llfloaterparcel.cpp
- indra/newview/llfloaterpreference.cpp 7 additions, 39 deletionsindra/newview/llfloaterpreference.cpp
- indra/newview/llfloaterpreference.h 0 additions, 1 deletionindra/newview/llfloaterpreference.h
- indra/newview/llpanellogin.cpp 381 additions, 241 deletionsindra/newview/llpanellogin.cpp
- indra/newview/llpanellogin.h 26 additions, 21 deletionsindra/newview/llpanellogin.h
- indra/newview/llstartup.cpp 128 additions, 64 deletionsindra/newview/llstartup.cpp
- indra/newview/lltoolpie.cpp 0 additions, 2 deletionsindra/newview/lltoolpie.cpp
- indra/newview/llurldispatcher.cpp 44 additions, 19 deletionsindra/newview/llurldispatcher.cpp
- indra/newview/llviewermenu.cpp 0 additions, 10 deletionsindra/newview/llviewermenu.cpp
- indra/newview/llviewermenu.h 0 additions, 1 deletionindra/newview/llviewermenu.h
- indra/newview/llviewerwindow.cpp 3 additions, 5 deletionsindra/newview/llviewerwindow.cpp
Loading
Please register or sign in to comment