Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Alchemy Viewer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Package Registry
Operate
Terraform modules
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Silent mode is enabled
All outbound communications are blocked.
Learn more
.
Show more breadcrumbs
Alchemy Viewer
Alchemy Viewer
Commits
80a0e1fd
Commit
80a0e1fd
authored
3 years ago
by
Rye Mutt
Browse files
Options
Downloads
Patches
Plain Diff
Fix apple warnings
parent
b7a953cc
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!16
Various package rebuilds and updates including movement to zlib-ng and mac support
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
indra/newview/llviewermedia.h
+19
-19
19 additions, 19 deletions
indra/newview/llviewermedia.h
with
19 additions
and
19 deletions
indra/newview/llviewermedia.h
+
19
−
19
View file @
80a0e1fd
...
...
@@ -199,7 +199,7 @@ class LLViewerMediaImpl
~
LLViewerMediaImpl
();
// Override inherited version from LLViewerMediaEventEmitter
virtual
void
emitEvent
(
LLPluginClassMedia
*
self
,
LLViewerMediaObserver
::
EMediaEvent
event
);
virtual
void
emitEvent
(
LLPluginClassMedia
*
self
,
LLViewerMediaObserver
::
EMediaEvent
event
)
override
;
void
createMediaSource
();
void
destroyMediaSource
();
...
...
@@ -313,29 +313,29 @@ class LLViewerMediaImpl
static
bool
handleSkinCurrentChanged
(
const
LLSD
&
newvalue
);
// need these to handle mouseup...
/*virtual*/
void
onMouseCaptureLost
();
/*virtual*/
BOOL
handleMouseUp
(
S32
x
,
S32
y
,
MASK
mask
);
/*virtual*/
void
onMouseCaptureLost
()
override
;
/*virtual*/
BOOL
handleMouseUp
(
S32
x
,
S32
y
,
MASK
mask
)
override
;
// Grr... the only thing I want as an LLMouseHandler are the onMouseCaptureLost and handleMouseUp calls.
// Sadly, these are all pure virtual, so I have to supply implementations here:
/*virtual*/
BOOL
handleMouseDown
(
S32
x
,
S32
y
,
MASK
mask
)
{
return
FALSE
;
};
/*virtual*/
BOOL
handleHover
(
S32
x
,
S32
y
,
MASK
mask
)
{
return
FALSE
;
};
/*virtual*/
BOOL
handleScrollWheel
(
S32
x
,
S32
y
,
S32
clicks
)
{
return
FALSE
;
};
/*virtual*/
BOOL
handleScrollHWheel
(
S32
x
,
S32
y
,
S32
clicks
)
{
return
FALSE
;
};
/*virtual*/
BOOL
handleDoubleClick
(
S32
x
,
S32
y
,
MASK
mask
)
{
return
FALSE
;
};
/*virtual*/
BOOL
handleRightMouseDown
(
S32
x
,
S32
y
,
MASK
mask
)
{
return
FALSE
;
};
/*virtual*/
BOOL
handleRightMouseUp
(
S32
x
,
S32
y
,
MASK
mask
)
{
return
FALSE
;
};
/*virtual*/
BOOL
handleToolTip
(
S32
x
,
S32
y
,
MASK
mask
)
{
return
FALSE
;
};
/*virtual*/
BOOL
handleMiddleMouseDown
(
S32
x
,
S32
y
,
MASK
mask
)
{
return
FALSE
;
};
/*virtual*/
BOOL
handleMiddleMouseUp
(
S32
x
,
S32
y
,
MASK
mask
)
{
return
FALSE
;
};
/*virtual*/
const
std
::
string
&
getName
()
const
;
/*virtual*/
void
screenPointToLocal
(
S32
screen_x
,
S32
screen_y
,
S32
*
local_x
,
S32
*
local_y
)
const
{};
/*virtual*/
void
localPointToScreen
(
S32
local_x
,
S32
local_y
,
S32
*
screen_x
,
S32
*
screen_y
)
const
{};
/*virtual*/
BOOL
hasMouseCapture
()
{
return
gFocusMgr
.
getMouseCapture
()
==
this
;
};
/*virtual*/
BOOL
handleMouseDown
(
S32
x
,
S32
y
,
MASK
mask
)
override
{
return
FALSE
;
};
/*virtual*/
BOOL
handleHover
(
S32
x
,
S32
y
,
MASK
mask
)
override
{
return
FALSE
;
};
/*virtual*/
BOOL
handleScrollWheel
(
S32
x
,
S32
y
,
S32
clicks
)
override
{
return
FALSE
;
};
/*virtual*/
BOOL
handleScrollHWheel
(
S32
x
,
S32
y
,
S32
clicks
)
override
{
return
FALSE
;
};
/*virtual*/
BOOL
handleDoubleClick
(
S32
x
,
S32
y
,
MASK
mask
)
override
{
return
FALSE
;
};
/*virtual*/
BOOL
handleRightMouseDown
(
S32
x
,
S32
y
,
MASK
mask
)
override
{
return
FALSE
;
};
/*virtual*/
BOOL
handleRightMouseUp
(
S32
x
,
S32
y
,
MASK
mask
)
override
{
return
FALSE
;
};
/*virtual*/
BOOL
handleToolTip
(
S32
x
,
S32
y
,
MASK
mask
)
override
{
return
FALSE
;
};
/*virtual*/
BOOL
handleMiddleMouseDown
(
S32
x
,
S32
y
,
MASK
mask
)
override
{
return
FALSE
;
};
/*virtual*/
BOOL
handleMiddleMouseUp
(
S32
x
,
S32
y
,
MASK
mask
)
override
{
return
FALSE
;
};
/*virtual*/
const
std
::
string
&
getName
()
const
override
;
/*virtual*/
void
screenPointToLocal
(
S32
screen_x
,
S32
screen_y
,
S32
*
local_x
,
S32
*
local_y
)
const
override
{};
/*virtual*/
void
localPointToScreen
(
S32
local_x
,
S32
local_y
,
S32
*
screen_x
,
S32
*
screen_y
)
const
override
{};
/*virtual*/
BOOL
hasMouseCapture
()
override
{
return
gFocusMgr
.
getMouseCapture
()
==
this
;
};
// Inherited from LLPluginClassMediaOwner
/*virtual*/
void
handleMediaEvent
(
LLPluginClassMedia
*
plugin
,
LLPluginClassMediaOwner
::
EMediaEvent
);
/*virtual*/
void
handleMediaEvent
(
LLPluginClassMedia
*
plugin
,
LLPluginClassMediaOwner
::
EMediaEvent
)
override
;
// LLEditMenuHandler overrides
/*virtual*/
void
undo
()
override
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment