DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling ignore dead branch
Showing
- indra/llcommon/lluri.cpp 2 additions, 1 deletionindra/llcommon/lluri.cpp
- indra/llui/llurlentry.cpp 21 additions, 8 deletionsindra/llui/llurlentry.cpp
- indra/llui/tests/llurlentry_test.cpp 24 additions, 0 deletionsindra/llui/tests/llurlentry_test.cpp
- indra/newview/CMakeLists.txt 9 additions, 2 deletionsindra/newview/CMakeLists.txt
- indra/newview/Info-SecondLife.plist 28 additions, 0 deletionsindra/newview/Info-SecondLife.plist
- indra/newview/installers/windows/installer_template.nsi 6 additions, 0 deletionsindra/newview/installers/windows/installer_template.nsi
- indra/newview/llagent.h 3 additions, 2 deletionsindra/newview/llagent.h
- indra/newview/llagentlistener.cpp 4 additions, 1 deletionindra/newview/llagentlistener.cpp
- indra/newview/llagentui.cpp 8 additions, 9 deletionsindra/newview/llagentui.cpp
- indra/newview/llagentui.h 2 additions, 1 deletionindra/newview/llagentui.h
- indra/newview/llappviewer.cpp 20 additions, 37 deletionsindra/newview/llappviewer.cpp
- indra/newview/llappviewermacosx.cpp 0 additions, 1 deletionindra/newview/llappviewermacosx.cpp
- indra/newview/llfloaterbuyland.cpp 1 addition, 1 deletionindra/newview/llfloaterbuyland.cpp
- indra/newview/llfloaterchat.cpp 1 addition, 1 deletionindra/newview/llfloaterchat.cpp
- indra/newview/llfloaterland.cpp 3 additions, 3 deletionsindra/newview/llfloaterland.cpp
- indra/newview/llfloaterpreference.cpp 2 additions, 2 deletionsindra/newview/llfloaterpreference.cpp
- indra/newview/llfloaterregioninfo.cpp 1 addition, 2 deletionsindra/newview/llfloaterregioninfo.cpp
- indra/newview/llfloaterreporter.cpp 3 additions, 3 deletionsindra/newview/llfloaterreporter.cpp
- indra/newview/llfloaterworldmap.cpp 7 additions, 16 deletionsindra/newview/llfloaterworldmap.cpp
- indra/newview/llfloaterworldmap.h 2 additions, 1 deletionindra/newview/llfloaterworldmap.h
Loading
Please register or sign in to comment