merge -r 1879-1884 https://svn.aws.productengine.com/secondlife/pe/stable-2
* Major Bugs: EXT-1248 EXT-1127 EXT-844 EXT-1160 * Changes: EXT-1139 (places context menu)
Showing
- indra/newview/llchannelmanager.cpp 1 addition, 1 deletionindra/newview/llchannelmanager.cpp
- indra/newview/lllandmarkactions.cpp 17 additions, 8 deletionsindra/newview/lllandmarkactions.cpp
- indra/newview/lllandmarkactions.h 9 additions, 0 deletionsindra/newview/lllandmarkactions.h
- indra/newview/llnotificationalerthandler.cpp 1 addition, 1 deletionindra/newview/llnotificationalerthandler.cpp
- indra/newview/lloutputmonitorctrl.cpp 1 addition, 7 deletionsindra/newview/lloutputmonitorctrl.cpp
- indra/newview/lloutputmonitorctrl.h 0 additions, 4 deletionsindra/newview/lloutputmonitorctrl.h
- indra/newview/llpanelteleporthistory.cpp 157 additions, 5 deletionsindra/newview/llpanelteleporthistory.cpp
- indra/newview/llpanelteleporthistory.h 26 additions, 0 deletionsindra/newview/llpanelteleporthistory.h
- indra/newview/llscreenchannel.cpp 2 additions, 2 deletionsindra/newview/llscreenchannel.cpp
- indra/newview/llsyswellwindow.cpp 2 additions, 1 deletionindra/newview/llsyswellwindow.cpp
- indra/newview/lltoast.cpp 1 addition, 26 deletionsindra/newview/lltoast.cpp
- indra/newview/lltoast.h 2 additions, 5 deletionsindra/newview/lltoast.h
- indra/newview/skins/default/xui/en/menu_teleport_history_item.xml 33 additions, 0 deletions...wview/skins/default/xui/en/menu_teleport_history_item.xml
- indra/newview/skins/default/xui/en/menu_teleport_history_tab.xml 19 additions, 0 deletions...ewview/skins/default/xui/en/menu_teleport_history_tab.xml
Loading
Please register or sign in to comment