Skip to content
Snippets Groups Projects
Select Git revision
  • main default protected
  • next protected
  • UI-EvenMoreTweaks
  • merge/materials_featurette protected
  • merge/webrtc protected
  • darl/linux-sh-installer
  • xenhat/maint/bolt
  • xenhat/features/cinematic-mode-new
  • screensquare
  • ssestuff
  • spdlog
  • 7.1.7.2486-beta
  • 7.1.4.2442-beta
  • 7.1.4.2413-beta
  • 7.1.3.2338-beta
  • 7.1.3.2332-beta
  • 7.1.2.2304-beta
  • 7.1.1.2251-beta
  • 7.0.1.2244-beta
  • 7.0.1.2240-beta
  • 7.0.1.2230-beta
  • 7.0.1.2206-beta
22 results

lllineeditor.cpp

  • Andrey Lihatskiy's avatar
    ec9b9898
    Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint · ec9b9898
    Andrey Lihatskiy authored
    # Conflicts:
    #	indra/newview/llinventorybridge.cpp
    #	indra/newview/llinventorypanel.cpp
    #	indra/newview/lltexturectrl.cpp
    #	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
    ec9b9898
    History
    Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
    Andrey Lihatskiy authored
    # Conflicts:
    #	indra/newview/llinventorybridge.cpp
    #	indra/newview/llinventorypanel.cpp
    #	indra/newview/lltexturectrl.cpp
    #	indra/newview/skins/default/xui/de/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/es/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/fr/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/it/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/ja/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/pt/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/ru/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/tr/floater_texture_ctrl.xml
    #	indra/newview/skins/default/xui/zh/floater_texture_ctrl.xml
Code owners
Assign users and groups as approvers for specific file changes. Learn more.