Anonymous avatar Anonymous committed 19547b9 Merge

Eliminate the bad merge at "2026f824953f"

Comments (0)

Files changed (229)

Add a comment to this file

indra/llcharacter/llmultigesture.cpp

File contents unchanged.

Add a comment to this file

indra/llcommon/llformat.cpp

File contents unchanged.

Add a comment to this file

indra/llcommon/llformat.h

File contents unchanged.

Add a comment to this file

indra/llcommon/llmd5.cpp

File contents unchanged.

File contents unchanged.

Add a comment to this file

indra/llcommon/llstring.cpp

File contents unchanged.

Add a comment to this file

indra/llcommon/llstring.h

File contents unchanged.

Add a comment to this file

indra/llmessage/llcurl.cpp

File contents unchanged.

Add a comment to this file

indra/llmessage/llcurl.h

File contents unchanged.

Add a comment to this file

indra/llrender/llimagegl.cpp

File contents unchanged.

Add a comment to this file

indra/llui/llaccordionctrl.cpp

File contents unchanged.

Add a comment to this file

indra/llui/llaccordionctrl.h

File contents unchanged.

Add a comment to this file

indra/llui/llaccordionctrltab.cpp

File contents unchanged.

Add a comment to this file

indra/llui/llaccordionctrltab.h

File contents unchanged.

Add a comment to this file

indra/llui/llcheckboxctrl.cpp

File contents unchanged.

Add a comment to this file

indra/llui/llflatlistview.cpp

File contents unchanged.

Add a comment to this file

indra/llui/llfloater.cpp

File contents unchanged.

File contents unchanged.

Add a comment to this file

indra/llui/llmenugl.cpp

File contents unchanged.

File contents unchanged.

Add a comment to this file

indra/llui/llnotifications.cpp

File contents unchanged.

Add a comment to this file

indra/llui/llnotifications.h

File contents unchanged.

Add a comment to this file

indra/llui/llresmgr.cpp

File contents unchanged.

Add a comment to this file

indra/llui/lltextbase.cpp

File contents unchanged.

Add a comment to this file

indra/newview/app_settings/settings.xml

File contents unchanged.

Add a comment to this file

indra/newview/gpu_table.txt

File contents unchanged.

Add a comment to this file

indra/newview/llagent.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llagentcamera.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llagentlanguage.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llagentlanguage.h

File contents unchanged.

Add a comment to this file

indra/newview/llagentwearables.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llagentwearables.h

File contents unchanged.

Add a comment to this file

indra/newview/llappearancemgr.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llappearancemgr.h

File contents unchanged.

Add a comment to this file

indra/newview/llappviewer.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llavataractions.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llchathistory.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llcofwearables.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llcofwearables.h

File contents unchanged.

Add a comment to this file

indra/newview/llcurrencyuimanager.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lldrawpoolbump.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lldynamictexture.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llface.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llfloatergroups.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llfloaterland.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llfloatervoicedevicesettings.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llfloaterworldmap.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llfloaterworldmap.h

File contents unchanged.

Add a comment to this file

indra/newview/llfolderview.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llgroupmgr.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llinventorybridge.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llinventorybridge.h

File contents unchanged.

Add a comment to this file

indra/newview/llinventoryfunctions.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llinventoryicon.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llinventorymodel.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llinventorymodel.h

File contents unchanged.

Add a comment to this file

indra/newview/llinventoryobserver.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llinventoryobserver.h

File contents unchanged.

Add a comment to this file

indra/newview/llinventorypanel.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lllogininstance.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llmoveview.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llmoveview.h

File contents unchanged.

Add a comment to this file

indra/newview/llnearbychatbar.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llnearbychatbar.h

File contents unchanged.

Add a comment to this file

indra/newview/lloutfitobserver.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lloutfitobserver.h

File contents unchanged.

Add a comment to this file

indra/newview/lloutfitslist.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lloutfitslist.h

File contents unchanged.

Add a comment to this file

indra/newview/llpaneleditwearable.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpaneleditwearable.h

File contents unchanged.

Add a comment to this file

indra/newview/llpanelgroup.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpanelgroup.h

File contents unchanged.

Add a comment to this file

indra/newview/llpanelgrouplandmoney.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpanelgrouproles.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpanelmaininventory.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpanelobjectinventory.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpaneloutfitedit.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpaneloutfitedit.h

File contents unchanged.

Add a comment to this file

indra/newview/llpaneloutfitsinventory.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpanelplaceinfo.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpanelplaceprofile.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpanelplaceprofile.h

File contents unchanged.

Add a comment to this file

indra/newview/llpanelplaces.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llplacesinventorybridge.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpreviewgesture.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llpreviewtexture.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llsidepanelappearance.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llsidepanelinventory.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llsidepaneltaskinfo.h

File contents unchanged.

Add a comment to this file

indra/newview/llsurface.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lltexlayer.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lltexlayer.h

File contents unchanged.

Add a comment to this file

indra/newview/lltexlayerparams.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lltexturecache.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lltexturectrl.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lltexturefetch.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lltextureview.cpp

File contents unchanged.

Add a comment to this file

indra/newview/lltoolmorph.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llviewerattachmenu.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llviewerinventory.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llviewerinventory.h

File contents unchanged.

Add a comment to this file

indra/newview/llviewermenu.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llviewermessage.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llviewerregion.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llviewertexteditor.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llviewertexteditor.h

File contents unchanged.

Add a comment to this file

indra/newview/llviewertexture.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llviewertexture.h

File contents unchanged.

Add a comment to this file

indra/newview/llviewertexturelist.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llviewerwindow.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llvoavatar.h

File contents unchanged.

Add a comment to this file

indra/newview/llvoavatarself.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llvograss.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llvotree.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llvotree.h

File contents unchanged.

Add a comment to this file

indra/newview/llwearable.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llwearableitemslist.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llwearableitemslist.h

File contents unchanged.

Add a comment to this file

indra/newview/llworldmap.cpp

File contents unchanged.

Add a comment to this file

indra/newview/llworldmap.h

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/da/floater_camera.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/da/menu_inventory.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/da/menu_inventory_add.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/da/menu_object.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/da/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/da/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/da/panel_nearby_media.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/da/sidepanel_item_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/da/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/floater_camera.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/menu_inventory.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/menu_inventory_add.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/menu_object.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/panel_nearby_media.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/panel_people.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/sidepanel_item_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/de/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/floater_about_land.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/floater_buy_land.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/floater_preview_gesture.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/floater_world_map.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/menu_attachment_self.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/menu_inspect_object_gear.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/menu_object.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_classified.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_classified_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_classifieds_list_item.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_edit_classified.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_edit_pick.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_edit_wearable.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_group_notices.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_group_roles.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_my_profile.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_nearby_media.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_pick_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_pick_list_item.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_preferences_sound.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/panel_teleport_history.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/sidepanel_item_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/en/widgets/accordion.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/es/floater_camera.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/es/menu_inventory.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/es/menu_inventory_add.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/es/menu_object.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/es/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/es/panel_nearby_media.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/es/sidepanel_item_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/es/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/floater_buy_currency.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/floater_camera.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/floater_inventory_item_properties.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/floater_water.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/floater_windlight_options.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/menu_attachment_self.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/menu_inspect_object_gear.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/menu_inventory_add.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/menu_object.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/menu_place.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/panel_edit_wearable.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/panel_login.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/panel_nearby_media.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/panel_places.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/role_actions.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/sidepanel_item_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/fr/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/it/floater_camera.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/it/menu_inventory.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/it/menu_inventory_add.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/it/menu_object.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/it/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/it/panel_nearby_media.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/it/sidepanel_item_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/it/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/ja/floater_camera.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/ja/menu_inventory.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/ja/menu_inventory_add.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/ja/menu_object.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/ja/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/ja/panel_nearby_media.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/ja/sidepanel_item_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/ja/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pl/floater_camera.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pl/menu_inventory.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pl/menu_inventory_add.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pl/menu_object.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pl/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pl/panel_nearby_media.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pl/sidepanel_item_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pl/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/floater_camera.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/floater_land_holdings.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/floater_tools.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/menu_inventory.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/menu_inventory_add.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/menu_object.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/menu_viewer.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/notifications.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/panel_nearby_media.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/panel_region_general.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/sidepanel_item_info.xml

File contents unchanged.

Add a comment to this file

indra/newview/skins/default/xui/pt/strings.xml

File contents unchanged.

Add a comment to this file

indra/newview/tests/lllogininstance_test.cpp

File contents unchanged.

Add a comment to this file

indra/win_crash_logger/llcrashloggerwindows.cpp

File contents unchanged.

Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.