Merge
Showing
- indra/llplugin/slplugin/CMakeLists.txt 18 additions, 1 deletionindra/llplugin/slplugin/CMakeLists.txt
- indra/llplugin/slplugin/slplugin-objc.h 40 additions, 0 deletionsindra/llplugin/slplugin/slplugin-objc.h
- indra/llplugin/slplugin/slplugin-objc.mm 87 additions, 0 deletionsindra/llplugin/slplugin/slplugin-objc.mm
- indra/llplugin/slplugin/slplugin.cpp 17 additions, 0 deletionsindra/llplugin/slplugin/slplugin.cpp
- indra/llui/llview.h 2 additions, 1 deletionindra/llui/llview.h
- indra/llwindow/llwindowmacosx-objc.mm 2 additions, 0 deletionsindra/llwindow/llwindowmacosx-objc.mm
- indra/newview/llcofwearables.cpp 15 additions, 19 deletionsindra/newview/llcofwearables.cpp
- indra/newview/llfloaterpay.cpp 3 additions, 0 deletionsindra/newview/llfloaterpay.cpp
- indra/newview/llfolderview.cpp 2 additions, 1 deletionindra/newview/llfolderview.cpp
- indra/newview/llimview.cpp 4 additions, 2 deletionsindra/newview/llimview.cpp
- indra/newview/llinspecttoast.cpp 2 additions, 2 deletionsindra/newview/llinspecttoast.cpp
- indra/newview/llinventorybridge.cpp 25 additions, 9 deletionsindra/newview/llinventorybridge.cpp
- indra/newview/llinventoryfunctions.cpp 58 additions, 3 deletionsindra/newview/llinventoryfunctions.cpp
- indra/newview/llinventoryfunctions.h 3 additions, 0 deletionsindra/newview/llinventoryfunctions.h
- indra/newview/llmoveview.cpp 6 additions, 17 deletionsindra/newview/llmoveview.cpp
- indra/newview/llmoveview.h 0 additions, 1 deletionindra/newview/llmoveview.h
- indra/newview/lloutfitslist.cpp 23 additions, 0 deletionsindra/newview/lloutfitslist.cpp
- indra/newview/llpaneloutfitedit.cpp 5 additions, 2 deletionsindra/newview/llpaneloutfitedit.cpp
- indra/newview/llsidepanelappearance.cpp 2 additions, 0 deletionsindra/newview/llsidepanelappearance.cpp
- indra/newview/skins/default/xui/de/floater_map.xml 3 additions, 0 deletionsindra/newview/skins/default/xui/de/floater_map.xml
Loading
Please register or sign in to comment