Commit Graph

4380 Commits

Author SHA1 Message Date
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
Latif Khalifa
73e1a9ad78 WIP[win64]: we haz 64 bit webkit 2013-10-21 20:42:31 +02:00
Latif Khalifa
ea6adb7ae4 WIP[win64]: Sync this snipped with upstream to avoid texture indexing issues on Windows 64 2013-10-21 15:56:13 +02:00
Latif Khalifa
52c8c68d12 Reduce unbearable notification span when a plugin fails to load 2013-10-20 20:16:21 +02:00
Latif Khalifa
17c59f25f5 WIP[win64]: it builds, runs. webkit disabled in cmake for now 2013-10-20 17:03:48 +02: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
Andros Baphomet
c264607207 Merge remote-tracking branch 'upstream/master' 2013-10-19 10:03:17 -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
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
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
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
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
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
Andros Baphomet
e363aeb618 Merge remote-tracking branch 'upstream/master' 2013-10-12 21:23:07 -04: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
Andros Baphomet
ffb4abebdd Merge remote-tracking branch 'upstream/master' 2013-10-12 12:59:26 -04:00
Latif Khalifa
cb12a35102 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/llaudio/llaudioengine.cpp
2013-10-12 10:04:05 +02:00
Shyotl
7fb05e6a48 Audio engine changes:
-Idle tick is now responsible for dispatching all pending sound sources, as such improves priority sorting.
-Added ui sound precache mechanisms (to fetch sounds without associated soundsources)
-Audio engine no logner available pre-login or upon disconnect, for simplicity.
-General cleanup to the audio engine/impl.
-Fixed some gAudiop calls that were lacking prerequisite null checks.
-Added 'isUpstreamOK' procuedure to LLAssetStorage to allow avoidance of making requests when there is no upstream host connection.
2013-10-12 02:49:11 -05:00
Andros Baphomet
12abca8954 Merge remote-tracking branch 'upstream/master' 2013-10-12 01:50:26 -04:00
Latif Khalifa
69f273eb0e Don't crash if pay floater is closed before reply arrives from the server
Fix from upstream
Potentially fixes http://crash.singularityviewer.org/crashes.php?stacktrace=processPayPriceReply
2013-10-11 13:14:59 +02:00
Latif Khalifa
926e76adea Dump the whole login response to the log file only in the debug builds 2013-10-11 10:12:35 +02:00
Inusaito Sayori
9429b875aa Demote common "Splitting" warning to debugs 2013-10-11 04:06:38 -04:00
Inusaito Sayori
f268c26a3a [LLIMMgr/LLIMPanel] Fix the crashes in notifyParticularFriendObservers()
Forgot to write this line amidst everything else, my bad.
2013-10-11 03:25:32 -04:00
Inusaito Sayori
aa86730df2 [LLIMMgr/LLIMPanel] Fix race condition between name lookup and title setting 2013-10-11 00:45:23 -04:00
Inusaito Sayori
80bb529220 Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2013-10-10 22:16:39 -04:00
Damian Zhaoying
7cc99ebf72 update spanish messages in IM floaters 2013-10-10 23:15:33 -03:00
Inusaito Sayori
be5727548b Fix a warning typo and a minor bug I thought I'd fixed long ago indicated by some getString warning spam 2013-10-10 20:25:15 -04:00
Inusaito Sayori
54c08b3ea0 Localize the new Silent Accept/Decline messages 2013-10-10 18:28:06 -04:00
Inusaito Sayori
8964cfd58b [LLIMMgr/LLIMPanel Revision] Compile Fixies
How did these even
2013-10-10 17:01:18 -04:00
Latif Khalifa
2a830c3184 Merge branch 'master' of https://github.com/slabua/SingularityViewer 2013-10-10 21:58:25 +02:00
Latif Khalifa
c313d5fe28 Merge branch 'master' of https://github.com/AdeonWriter/SingularityViewer 2013-10-10 21:58:19 +02:00
Inusaito Sayori
390c097c6a Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2013-10-10 15:53:32 -04:00
Salvatore La Bua
ebc839d540 Rearrange silent keep/discard inventory offer buttons 2013-10-10 21:49:49 +02:00
Salvatore La Bua
20ee6cdb72 Add silent keep/discard inventory offer buttons
Adapted from Phoenix code
2013-10-10 20:21:46 +02:00
Inusaito Sayori
d503662b58 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-10-10 04:41:08 -04:00
Inusaito Sayori
91f6a4efa3 [OpenSim] Feature Request: Don't clamp max_import_scale to 240 on NonSL grids, and make max_import_scale start off based on the hippolimits' MaxPrimScale, not the SL-constant 2013-10-10 04:36:47 -04:00
Inusaito Sayori
13e25cfe6a Feature Request: Add MiniMapPrimMaxAltitudeDelta and MiniMapPrimMaxAltitudeDeltaOwn to debug settings for users to configure how much altitude difference prims can have to be shown on the minimap 2013-10-10 04:29:12 -04:00