Commit Graph

5265 Commits

Author SHA1 Message Date
Latif Khalifa
6708019a40 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-24 01:37:27 +02:00
Latif Khalifa
8565616c9d Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-10-24 01:37:19 +02:00
Shyotl
8e94c43a54 Fix a tp crash, and rework sound preloading slightly. 2013-10-23 17:23:20 -05:00
Inusaito Sayori
2b7e78cb3b That commit where I touch all the ascentprefs headers to make them conform to standard because it's been annoying me too long. 2013-10-23 17:47:33 -04:00
Inusaito Sayori
41303d0c9c Added "Log button opens external text editor (Windows only)" to Adv. Chat UI 2013-10-23 17:44:27 -04:00
Inusaito Sayori
4821d02051 Sometimes UI get this syncing feeling... but then everything seems fine. 2013-10-22 23:59:50 -04:00
Inusaito Sayori
fd42029a61 LLViewerWindow::handleKey(): Partial Fix for Issue 704: Keyboard shortcuts that should be passed to focused text fields are instead passed to selected prims when building
All edit keys now work, but Ctrl-A still doesn't work right, it must be grabbed by something else...
Adds LLFocusMgr::keyboardFocusHasAccelerators()
Adds virtual bool LLView::hasAccelerators() which returns false by default, overrides returning true placed in LLPreviewScript and LLPreviewNotecard
Shortcut keys added to notecard and script menu xmls

I'm thinking Qarl's Align tool handling may be receiving the Ctrl-A, we do seem to handle it differently than Exodus and Firestorm something modern could have broken the old way..
Come to think of it, those two features(Align and Select all prims) have a longstanding shortcut conflict in shortcuts... that's pretty nasty
2013-10-22 23:35:53 -04:00
Inusaito Sayori
574d0dab8d LLViewerWindow::handleKey(): Also handle keys for navigating through the displayed menu 2013-10-22 22:39:15 -04:00
Inusaito Sayori
1aee941cb6 LLViewerWindow::handleKey(): The work in progress bits of the sync, commented out 2013-10-22 09:19:38 -04:00
Inusaito Sayori
75ee99f4d5 LLViewerWindow::handleKey(): More harmlessness (sync)
Handle Tabbing through elements/floaters earlier.
Combine g*Menu*View handleKey() checks.
2013-10-22 09:08:41 -04:00
Inusaito Sayori
45cd0157ef LLViewerWindow::handleKey(): Code cleanup, bit of harmless sync
Moved Notifications Console into the advanced menu for login, so it's not shoved in as a hack, also a bit easier to access
2013-10-22 08:16:12 -04:00
Inusaito Sayori
9ec10cf246 Reworked LLToolCompGun so piemenu in mouselook plays nicer with zoom feature
Switches to exodus implementation
Includes relicensing of LLViewerCamera and LLToolComp
Maintains use of the old saved zoomed setting
2013-10-22 07:47:43 -04:00
Inusaito Sayori
dde18dfc0f Added a setting, LiruMouselookMenu, in case people don't want this feature. 2013-10-21 16:01:31 -04:00
Inusaito Sayori
d95e1800e1 Miscellaneous touchups
Fixes chatbar not handling ctrl+shift+arrow for word selection
lltoolmgr.cpp sync
Removes some pointless dead code from llviewertexteditor.cpp
2013-10-21 15:15:17 -04:00
Inusaito Sayori
a33efc61a2 Feature request by StephiDreamEvermore Doune: Implement the convenience of being able to set view offsets while modifier keys are held during scroll in third person camera (Play with camera position/angle) 2013-10-19 20:54:02 -04:00
Inusaito Sayori
bd4e988397 Fix crash signature 222 2013-10-19 20:38:50 -04:00
Inusaito Sayori
65d2775e2a Address jonhboy's Request: Round land impact instead of chopping off the decimal 2013-10-18 08:58:13 -04:00
Inusaito Sayori
ef3f78175c Satisfy Issue 699: Let Alt-right clicking in mouselook bring up pie menu
Also lltoolpie.cpp cleanup
2013-10-18 08:28:39 -04:00
Inusaito Sayori
7813ca03da LLFloaterInspect: bit of cleanup and allow sorting by creation date regardless of format 2013-10-18 08:21:57 -04:00
Inusaito Sayori
ec5aaa2af8 Modernize LLSelectMgr and fix leaks 2013-10-18 08:20:19 -04:00
Latif Khalifa
4feb1985b0 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-10-18 09:28:19 +02:00
Shyotl
addd687bf8 What is this? Where am I? Oh god. (Fix mistake in openal audioimpl) 2013-10-18 02:27:09 -05:00
Latif Khalifa
153f783922 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-10-18 08:51:51 +02:00
Shyotl
e2954fdbfd Fixed a bug where multisampled renderbuffers were being attached to non-FBO-enabled LLRenderTargets. 2013-10-18 01:43:32 -05:00
Shyotl
6fd73ee8bb Use GL_RED instead of GL_LUMINANCE for post-process noise texture. 2013-10-17 22:07:58 -05:00
Shyotl
19d7186508 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2013-10-17 21:08:30 -05:00
Latif Khalifa
c67f848b5c Merge branch 'master' of https://github.com/siana/SingularityViewer 2013-10-17 05:25:14 +02:00
Latif Khalifa
683bd9375f Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-10-17 05:25:02 +02:00
Shyotl
d18fa5ba42 Modified LLRenderTarget to handle sCurFBO and mPreviousFBO as pointers instead of arbiturary indexes. 2013-10-16 21:35:04 -05:00
Shyotl
03c4535648 Made further refinements to the audioengine:
-Looping syncslaves are stopped when there is no syncmaster.
-Hardened against edge cases regarding soundsource priority sorting.
-Fixed issue with syncmasters being marked as having looped when instead they just started playing (caused double-start of syncslaves).
-Updated some comments.
2013-10-16 21:32:08 -05:00
Aleric Inglewood
811f670199 AIStateMachine fixes.
Things (one debug code only) that don't happen currently,
but that I ran into with AIMultiGrid.
2013-10-16 00:30:28 +02:00
Inusaito Sayori
9dd995a287 Old dead code poofpoof 2013-10-15 17:21:54 -04:00
Aleric Inglewood
e40d622b8c Merge remote-tracking branch 'singu/master' 2013-10-15 23:07:34 +02:00
Aleric Inglewood
09708b6318 Added AICondition.
AICondition is like AIThreadSafeSimpleDC (it is derived from it),
and wraps some variable, protecting it with a builtin mutex.

While in a statemachine, one can call wait(condition) to make
the state machine go idle, and call condition.signal() to
wake it (or another) up again.

While normally a condition variable is used as follows:

condition.lock();
while (!whatwerewaitingfor)
{
  condition.wait();
}
// Here the condition is guaranteed to be true and we're
// still in the critical area of the mutex.
condition.unlock();

where the thread blocks in wait(), the statemachine actually
returns CPU to the thread (the AIEngine), so there is no
while loop involved, and our wait() doesn't even unlock
the mutex: that happens because the state machine returns:

condition_wat condition_w(condition);		// Lock condition.
if (!condition_w->whatwerewaitingfor())		// The variable(s) involved can only be accessed when condition is locked.
{
  wait(condition);				// Causes the state machine to go idle. This does not block.
  break;					// Leave scope (unlock condition) and return to the mainloop - but as idle state machine.
}
// Here the condition is guaranteed to be true and we're
// still in the critical area of the condition variable.

In this case, when condition.signal() is called, the thread
doesn't return from wait() with a locked mutex - but the
statemachine executes the same state again, and enters from
the top: locking the condition and doing the test again,
just like it would be when this was a while loop.
2013-10-15 22:30:53 +02:00
Aleric Inglewood
9114f04ef6 Add AIStateMachine::yield_if_not
This can be used to switch to a specific engine.
If the state machine is not running in the passed engine,
then it performs a yield to that engine, otherwise it keeps
running. Hence, putting this at the top of a state
guarantees that it runs in that engine.

For example:

    case FrontEnd_done:
    {
      // Unlock must be called by the same thread that locked it.
      if (yield_if_not(&gStateMachineThreadEngine))
      {
        break;
      }
      // Here we are running in gStateMachineThreadEngine.
    ...
2013-10-15 22:30:16 +02:00
Aleric Inglewood
9db6bc0557 Add AIStateMachine::mSMDebug
The patch is exclusively libcwd related.

Turns off output from statemachines to dc::statemachine by default.
Allows to turn on the debug output on a per statemachine basis (at
compile time).
2013-10-15 22:29:52 +02:00
Inusaito Sayori
9ea59b06d5 Fix crash signature 140 2013-10-15 08:58:32 -04:00
Latif Khalifa
897392f7e0 Don't log debug level info during shader loading 2013-10-15 07:23:23 +02:00
Latif Khalifa
7f52f78517 Breaking pad: restore 'Ask' preference for sending reports, cleanup remaining out-of-process bits 2013-10-15 07:20:57 +02:00
Latif Khalifa
bb7793283d Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-10-15 07:18:58 +02:00
Inusaito Sayori
43f25fed9b [Warnings] Fix linux32 warnings again (missed some spots) 2013-10-14 19:42:08 -04:00
Shyotl
4da896682d Fixed a couple obscure crashes. 2013-10-13 19:37:01 -05:00
Shyotl
6155e64086 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2013-10-13 19:27:03 -05:00
Shyotl
dbfd0cb7a6 Fixed a shutdown crash in LLAudioEngine::assetCallback, and fixed behavior when soundsource re-issues a sound whilst a sound is currently playing for same source. (LLAudioChannel[Impl]::play now re-starts sound if already playing) 2013-10-13 16:22:24 -05:00
Siana Gearz
19625ea6b8 MAINT-2968 disable client GL namegen, go spec 2013-10-13 17:07:45 +02:00
Latif Khalifa
aa077032b7 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-12 22:45:05 +02:00
Aleric Inglewood
1389bf76ce Bug fix. 2013-10-12 22:36:27 +02:00
Latif Khalifa
f096f181f3 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-10-12 22:09:37 +02:00
Aleric Inglewood
1df09dec35 Remove assert that 100% reproducible fired - stopping me from logging in.
I wanted to fix the problem, but:
[21:45] <Aleric> Talking about dense - you guys want this to be fixed or not???
[21:45] <lkalif> no
2013-10-12 21:48:51 +02:00
Aleric Inglewood
8e0e532ea8 Merge remote-tracking branch 'singu/master' 2013-10-12 21:48:32 +02:00