| Age | Commit message (Collapse) | Author | 
|---|
|  | # Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml | 
|  | # Conflicts:
#	doc/contributions.txt
#	indra/llcommon/llerrorthread.cpp | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | Introduce menu bloat logging code | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | # Conflicts:
#	indra/newview/llfloaterfixedenvironment.cpp
#	indra/newview/skins/default/xui/en/strings.xml | 
|  | # Conflicts:
#	indra/newview/skins/default/xui/en/menu_viewer.xml SL-12494 vs SL-15034 | 
|  |  | 
|  |  | 
|  | button on the context menu | 
|  | Changes were moved to DRTVWR-514 | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | does not allow parcel override. "Commit" button now reads "Apply to Parcel" or "Apply to Region" as needed. | 
|  |  | 
|  | should move keyboard focus in-world | 
|  | keyboard shortcut | 
|  | disabled | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | (long long round) in VS2013 | 
|  | variables [-Wunused-const-variable] |