-
- Downloads
Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts: # indra/newview/llagentlistener.cpp # indra/newview/llcommanddispatcherlistener.cpp # indra/newview/llfilepicker_mac.mm # indra/newview/llworldmapview.cpp
No related branches found
No related tags found
Showing
- autobuild.xml 7 additions, 7 deletionsautobuild.xml
- doc/contributions.txt 2 additions, 0 deletionsdoc/contributions.txt
- indra/llcommon/llsd.cpp 1 addition, 1 deletionindra/llcommon/llsd.cpp
- indra/llcommon/llsd.h 10 additions, 16 deletionsindra/llcommon/llsd.h
- indra/llcommon/lltimer.cpp 8 additions, 3 deletionsindra/llcommon/lltimer.cpp
- indra/llinventory/llsettingswater.cpp 13 additions, 0 deletionsindra/llinventory/llsettingswater.cpp
- indra/llmessage/llavatarnamecache.cpp 4 additions, 2 deletionsindra/llmessage/llavatarnamecache.cpp
- indra/llui/llfolderview.cpp 22 additions, 8 deletionsindra/llui/llfolderview.cpp
- indra/llui/llfolderviewitem.h 0 additions, 1 deletionindra/llui/llfolderviewitem.h
- indra/llui/llnotifications.cpp 1 addition, 1 deletionindra/llui/llnotifications.cpp
- indra/llwindow/llkeyboardwin32.cpp 1 addition, 23 deletionsindra/llwindow/llkeyboardwin32.cpp
- indra/newview/VIEWER_VERSION.txt 1 addition, 1 deletionindra/newview/VIEWER_VERSION.txt
- indra/newview/app_settings/settings.xml 11 additions, 0 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llagentlistener.cpp 2 additions, 2 deletionsindra/newview/llagentlistener.cpp
- indra/newview/llappviewer.cpp 1 addition, 0 deletionsindra/newview/llappviewer.cpp
- indra/newview/llappviewerwin32.cpp 157 additions, 94 deletionsindra/newview/llappviewerwin32.cpp
- indra/newview/llcommanddispatcherlistener.cpp 7 additions, 2 deletionsindra/newview/llcommanddispatcherlistener.cpp
- indra/newview/llcommandhandler.cpp 2 additions, 0 deletionsindra/newview/llcommandhandler.cpp
- indra/newview/llcommandhandler.h 2 additions, 0 deletionsindra/newview/llcommandhandler.h
- indra/newview/lleventpoll.cpp 3 additions, 2 deletionsindra/newview/lleventpoll.cpp
Loading
Please register or sign in to comment