Fix release merge issues (included upstream changes not yet in release from bear)
Showing
- indra/llcommon/llsd.cpp 0 additions, 5 deletionsindra/llcommon/llsd.cpp
- indra/llcommon/llsd.h 1 addition, 5 deletionsindra/llcommon/llsd.h
- indra/llcommon/llsys.cpp 7 additions, 38 deletionsindra/llcommon/llsys.cpp
- indra/llinventory/llparcel.cpp 111 additions, 0 deletionsindra/llinventory/llparcel.cpp
- indra/llinventory/llparcel.h 17 additions, 0 deletionsindra/llinventory/llparcel.h
- indra/llmath/llvolume.cpp 2 additions, 4 deletionsindra/llmath/llvolume.cpp
- indra/llui/llcombobox.cpp 0 additions, 7 deletionsindra/llui/llcombobox.cpp
- indra/llui/llcombobox.h 0 additions, 2 deletionsindra/llui/llcombobox.h
- indra/llui/llcommandmanager.cpp 0 additions, 2 deletionsindra/llui/llcommandmanager.cpp
- indra/llui/llcommandmanager.h 0 additions, 4 deletionsindra/llui/llcommandmanager.h
- indra/llui/llfloater.cpp 3 additions, 3 deletionsindra/llui/llfloater.cpp
- indra/llui/llfloater.h 1 addition, 1 deletionindra/llui/llfloater.h
- indra/llui/llmodaldialog.cpp 3 additions, 34 deletionsindra/llui/llmodaldialog.cpp
- indra/llui/llscrollcontainer.cpp 1 addition, 1 deletionindra/llui/llscrollcontainer.cpp
- indra/llui/lltabcontainer.cpp 14 additions, 31 deletionsindra/llui/lltabcontainer.cpp
- indra/llui/lltabcontainer.h 1 addition, 10 deletionsindra/llui/lltabcontainer.h
- indra/llui/lltexteditor.cpp 1 addition, 12 deletionsindra/llui/lltexteditor.cpp
- indra/llui/lltexteditor.h 0 additions, 2 deletionsindra/llui/lltexteditor.h
- indra/llui/lltoolbar.cpp 0 additions, 1 deletionindra/llui/lltoolbar.cpp
- indra/newview/app_settings/commands.xml 0 additions, 7 deletionsindra/newview/app_settings/commands.xml
Loading
Please register or sign in to comment