Skip to content
Snippets Groups Projects
Commit 08a4180a authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Merge branch 'DRTVWR-559' of https://github.com/secondlife/viewer into cronchy

parents 35e9a966 2994833e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
indra/newview/llfloaterperformance.cpp
+ 0
− 2
View file @ 08a4180a
...@@ -56,8 +56,6 @@ const S32 BAR_LEFT_PAD = 2; ...@@ -56,8 +56,6 @@ const S32 BAR_LEFT_PAD = 2;
const S32 BAR_RIGHT_PAD = 5; const S32 BAR_RIGHT_PAD = 5;
const S32 BAR_BOTTOM_PAD = 9; const S32 BAR_BOTTOM_PAD = 9;
constexpr auto AvType {LLPerfStats::ObjType_t::OT_AVATAR};
class LLExceptionsContextMenu : public LLListContextMenu class LLExceptionsContextMenu : public LLListContextMenu
{ {
public: public:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment