diff options
| author | Jacek Antonelli | 2009-09-09 11:38:26 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2009-09-09 11:59:42 -0500 |
| commit | ced5a5f6a0e7d294f9e477409387674fcecc532c (patch) | |
| tree | e7500de0806009c2955bef6af7103ac60ae1e8e0 /linden/indra/llwindow/llwindow.h | |
| parent | Merge branch 'objectbackup' into next (diff) | |
| parent | Commented out permissions button (todo: backport this if there's time) (diff) | |
| download | meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.zip meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.gz meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.bz2 meta-impy-ced5a5f6a0e7d294f9e477409387674fcecc532c.tar.xz | |
Merge remote branch 'mccabe/1.2.0-next' into next
Moved "Backup" pie menu item to fit "Go Here" in top-left slot.
Conflicts:
linden/indra/newview/llviewermenu.cpp
linden/indra/newview/skins/default/xui/en-us/menu_pie_object.xml
Diffstat (limited to 'linden/indra/llwindow/llwindow.h')
| -rw-r--r-- | linden/indra/llwindow/llwindow.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h index ffc117f..821de2f 100644 --- a/linden/indra/llwindow/llwindow.h +++ b/linden/indra/llwindow/llwindow.h | |||
| @@ -184,9 +184,15 @@ public: | |||
| 184 | virtual void captureMouse() = 0; | 184 | virtual void captureMouse() = 0; |
| 185 | virtual void releaseMouse() = 0; | 185 | virtual void releaseMouse() = 0; |
| 186 | virtual void setMouseClipping( BOOL b ) = 0; | 186 | virtual void setMouseClipping( BOOL b ) = 0; |
| 187 | |||
| 187 | virtual BOOL isClipboardTextAvailable() = 0; | 188 | virtual BOOL isClipboardTextAvailable() = 0; |
| 188 | virtual BOOL pasteTextFromClipboard(LLWString &dst) = 0; | 189 | virtual BOOL pasteTextFromClipboard(LLWString &dst) = 0; |
| 189 | virtual BOOL copyTextToClipboard(const LLWString &src) = 0; | 190 | virtual BOOL copyTextToClipboard(const LLWString &src) = 0; |
| 191 | |||
| 192 | virtual BOOL isPrimaryTextAvailable(); | ||
| 193 | virtual BOOL pasteTextFromPrimary(LLWString &dst); | ||
| 194 | virtual BOOL copyTextToPrimary(const LLWString &src); | ||
| 195 | |||
| 190 | virtual void flashIcon(F32 seconds) = 0; | 196 | virtual void flashIcon(F32 seconds) = 0; |
| 191 | virtual F32 getGamma() = 0; | 197 | virtual F32 getGamma() = 0; |
| 192 | virtual BOOL setGamma(const F32 gamma) = 0; // Set the gamma | 198 | virtual BOOL setGamma(const F32 gamma) = 0; // Set the gamma |