diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-22 20:51:58 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-22 20:51:58 +0300 |
| commit | 6cc7dd09d5e69cf57e6de7fb568a0ad2693f9c9a (patch) | |
| tree | fab23811a5cedc1ebf01479c852ee92ff62b636c /indra/newview/llhudview.cpp | |
| parent | ef8f4819822288e044ea719feb6af7a1f4df4c4e (diff) | |
| parent | 7bb5afc11ee5a6af78302a8d76a9a619e2baaab2 (diff) | |
Merge pull request #1545 from Ansariel/DRTVWR-600-maint-A
Merge main into DRTVWR-600-maint-a
Diffstat (limited to 'indra/newview/llhudview.cpp')
| -rw-r--r-- | indra/newview/llhudview.cpp | 144 |
1 files changed, 72 insertions, 72 deletions
diff --git a/indra/newview/llhudview.cpp b/indra/newview/llhudview.cpp index e30d5e8759..c0a9670b3d 100644 --- a/indra/newview/llhudview.cpp +++ b/indra/newview/llhudview.cpp @@ -1,72 +1,72 @@ -/** - * @file llhudview.cpp - * @brief 2D HUD overlay - * - * $LicenseInfo:firstyear=2003&license=viewerlgpl$ - * Second Life Viewer Source Code - * Copyright (C) 2010, Linden Research, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; - * version 2.1 of the License only. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - * - * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA - * $/LicenseInfo$ - */ - -#include "llviewerprecompiledheaders.h" - -#include "llhudview.h" - -// library includes -#include "v4color.h" -#include "llcoord.h" - -// viewer includes -#include "llcallingcard.h" -#include "llviewercontrol.h" -#include "llfloaterworldmap.h" -#include "llworldmapview.h" -#include "lltracker.h" -#include "llviewercamera.h" -#include "llui.h" -#include "lluictrlfactory.h" - -LLHUDView *gHUDView = NULL; - -LLHUDView::LLHUDView(const LLRect& r) -{ - buildFromFile( "panel_hud.xml"); - setShape(r, true); -} - -LLHUDView::~LLHUDView() -{ -} - -// virtual -void LLHUDView::draw() -{ - LLTracker::drawHUDArrow(); - LLView::draw(); -} - -/*virtual*/ -bool LLHUDView::handleMouseDown(S32 x, S32 y, MASK mask) -{ - if (LLTracker::handleMouseDown(x, y)) - { - return true; - } - return LLView::handleMouseDown(x, y, mask); -} +/**
+ * @file llhudview.cpp
+ * @brief 2D HUD overlay
+ *
+ * $LicenseInfo:firstyear=2003&license=viewerlgpl$
+ * Second Life Viewer Source Code
+ * Copyright (C) 2010, Linden Research, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License only.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Linden Research, Inc., 945 Battery Street, San Francisco, CA 94111 USA
+ * $/LicenseInfo$
+ */
+
+#include "llviewerprecompiledheaders.h"
+
+#include "llhudview.h"
+
+// library includes
+#include "v4color.h"
+#include "llcoord.h"
+
+// viewer includes
+#include "llcallingcard.h"
+#include "llviewercontrol.h"
+#include "llfloaterworldmap.h"
+#include "llworldmapview.h"
+#include "lltracker.h"
+#include "llviewercamera.h"
+#include "llui.h"
+#include "lluictrlfactory.h"
+
+LLHUDView *gHUDView = NULL;
+
+LLHUDView::LLHUDView(const LLRect& r)
+{
+ buildFromFile( "panel_hud.xml");
+ setShape(r, true);
+}
+
+LLHUDView::~LLHUDView()
+{
+}
+
+// virtual
+void LLHUDView::draw()
+{
+ LLTracker::drawHUDArrow();
+ LLView::draw();
+}
+
+/*virtual*/
+bool LLHUDView::handleMouseDown(S32 x, S32 y, MASK mask)
+{
+ if (LLTracker::handleMouseDown(x, y))
+ {
+ return true;
+ }
+ return LLView::handleMouseDown(x, y, mask);
+}
|