Commit Graph

4050 Commits

Author SHA1 Message Date
Inusaito Sayori
d04820507c [LLIMMgr/LLIMPanel Revision] LLFloaterIMPanel constructor combination and removal of LLFloaterIMPanel::init()
Also changes Session Label to Log Label because that's really what it is at this point
Also rearranges members in LLFloaterIMPanel, and war on BOOLs
Also removes mSessionInitialTargetIDs because it's no longer needed outside of the constructor
2013-10-10 03:26:51 -04:00
Inusaito Sayori
260723f2a4 [LLIMMgr/LLIMPanel Revision] Fix PinTalkViewOpen=false mechanics
If the user is holding a modifier key with enter, it bypasses the unpinned setting
If a chat is popped out, this setting now only minimizes that chat, not toggles the main communications floater.
LLIMPanel::closeIfNotPinned() now condenses the logic.

Also makes LLIMMgr::toggle() non-static and requiring no args.
2013-10-10 02:49:02 -04:00
Inusaito Sayori
9e312a3808 [LLIMMgr/LLIMPanel Revision] Cleanup of unused/useless classes, functions, members and xmls 2013-10-10 02:27:26 -04:00
Latif Khalifa
942f4ce225 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-07 16:59:20 +02:00
Inusaito Sayori
99f81daa99 Feature Request: Add a debug setting, LiruLegacyLogLaunch, to use the old, non-browser method to open chat logs. 2013-10-07 05:43:56 -04:00
Aleric Inglewood
8262e899f8 Merge remote-tracking branch 'singu/master' 2013-10-06 17:11:58 +02:00
Aleric Inglewood
f7614dced3 Fix possible problem with negative mQueuedCommands
mQueuedCommands was unsigned, but can become shortly negative.
Unfortunately this means I had to remove the assert that
keeps track of possible errors, but I believe that already
has been proven that it works anyway.

The reason it can become negative is because its meaning is
"Number of added ADD (request) commands minus number of REMOVE (request)
commands". Hence, it is incremented when an ADD command is added to the
queue and decremented when that ADD command is removed from the queue.
However, it is first decremented when a REMOVE command is added to the
queue and then incremented again when that REMOVE command is removed
again from the queue. Such a remove command is current extremely rare:
it only happens when curl fails to time out - and the backup timeout of
the statemachine fires after 10 minutes of a curl request being idle.
That should normally only happen if a request never reached curl of
course, and is queued in the curl thread, waiting to be added to curl,
aka: -0-0-1,{...} for 10 minutes...

Now that, in turn should be impossible (since the "don't count long poll
connections) unless the Curl* Debug Setting variables are changed to
wrong values.. but ok, can only guess here.
2013-10-06 15:27:40 +02:00
Latif Khalifa
85f4fa9000 Merge branch 'boost152' 2013-10-06 08:13:31 +02:00
Latif Khalifa
2c091a954f Breaking pad: try to send the correct log file 2013-10-06 08:12:17 +02:00
Latif Khalifa
aece3c7069 Don't copy pcre on linux64 2013-10-06 07:49:38 +02:00
Inusaito Sayori
337c0d9cbb [Warnings] Remove warning suppressions for colladadom
I have fixed the warnings internally, so this wraps up my work
But our colladadom source and our prebuilds must be updated with my changes before this change is tolerable
2013-10-05 19:02:17 -04:00
Inusaito Sayori
4423bef896 [Warnings] Reduce collada includes to bare minimum to lessen Mac warnings 2013-10-05 18:33:07 -04:00
Inusaito Sayori
23e72f3978 [Warnings] Fix signed/unsigned mismatches rather than disabling 4018 2013-10-05 18:23:13 -04:00
Latif Khalifa
4118afc146 Boost upgrade to 1.52 2013-10-05 20:27:20 +02:00
Inusaito Sayori
16a8b92d84 [OpenSimExtras] Added callback setters to for the new chat ranges
Though they're not in use yet.. they should be in use soon, either way should exist.
2013-10-05 03:39:59 -04:00
Inusaito Sayori
de1a459bcb [OpenSimExtras] Variable chat ranges viewer awareness, thanks Diva Canto!! 2013-10-05 03:20:25 -04:00
Inusaito Sayori
7448ca1046 Bit of cleanup for simfeature handler 2013-10-05 03:04:58 -04:00
Inusaito Sayori
8f5337cc67 Tooltip for grids combo box to clarify its new uses for unfamiliar users 2013-10-04 21:01:02 -04:00
Inusaito Sayori
d7782383f1 Brokepad Mountain: Fix mac compiler warning by removing unused function and its unused static variable 2013-10-04 18:29:25 -04:00
Latif Khalifa
5f5943548b Merge branch 'master', remote-tracking branch 'origin' 2013-10-04 23:06:24 +02:00
Latif Khalifa
4cd3291bd1 Merge branch 'master' of https://github.com/slabua/SingularityViewer 2013-10-04 23:05:52 +02:00
Latif Khalifa
d595eb3314 Breaking pad: link SLPlugin.app with the exacption handler
Fixes loading of SLPlugin on OS X
2013-10-04 23:00:48 +02:00
Inusaito Sayori
f770cb1a29 There's no such thing as ATI Geforce... this seems to have been added because of VWR-29593, but there's no such thing... 2013-10-04 04:43:14 -04:00
Inusaito Sayori
36d658c4c4 Feature Request: Make Log viewing cross platform by opening in a browser window
INB4 Windows users express discomfort.
2013-10-03 19:59:11 -04:00
Inusaito Sayori
cfeb50ae4d Breaking pad: warning: 'OSStatus CarbonEventHandler(OpaqueEventHandlerCallRef*, OpaqueEventRef*, void*)' defined but not used 2013-10-03 13:46:16 -04:00
Inusaito Sayori
1c96fa09fd Fix a few signed unsigned mismatches 2013-10-03 12:41:10 -04:00
Salvatore La Bua
5183adbcaa Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-10-03 11:47:23 +02:00
Salvatore La Bua
6abffb2ce4 Merge branch 'master' of github.com:DamianZhaoying/SingularityViewer 2013-10-03 11:47:01 +02:00
Latif Khalifa
8bdc92c99b Breaking pad: don't add special pre-copy files to build dir 2013-10-03 07:53:43 +02:00
Latif Khalifa
8da3e86250 Don't copy files unless we need to extract the debug symbols 2013-10-03 07:19:14 +02:00
Latif Khalifa
2a8b424b85 Merge branch 'breakpad3' 2013-10-03 06:38:41 +02:00
Latif Khalifa
7e02a5825e Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-03 06:37:57 +02:00
Latif Khalifa
c49907e5a4 Breaking pad: typofix 2013-10-03 06:20:14 +02:00
Latif Khalifa
60cd95b31f Breaking pad: more cmake fun 2013-10-03 06:09:49 +02:00
Inusaito Sayori
a5928f4dbf Chatbar as cmdline, return false to avoid chatting certain commands 2013-10-02 20:34:20 -04:00
Latif Khalifa
9d4b978474 Breaking pad: Linux symbol dumping 2013-10-03 02:18:53 +02:00
Latif Khalifa
3447e9bd78 Brealpad: fixed symbol extraction on Mac 2013-10-03 00:26:54 +02:00
Latif Khalifa
a27dad4db0 Breakpad: added symbol extraction to the build.
Add -DRELEASE_CRASH_REPORTING:BOOL=ON to enable symbol extraction
on build time. Viewer without this set won't sent crash
reports to the crash server
2013-10-02 18:23:19 +02:00
Latif Khalifa
399a0038cb Breakpad: now working Mac OS X 2013-10-02 04:14:58 +02:00
Inusaito Sayori
a415b34c28 Fix a crash noticed while working on the last commit, when asserts aren't always, we should return before using null pointers. 2013-10-01 20:02:45 -04:00
Inusaito Sayori
ffd32542cc [VarRegions] Prevent crashing on regions at the edge of reality itself (such as Null, Null)
Demotes "Asking for patch out of bounds" to llwarns to prevent crashies, guards against some seemingly potent cases.
2013-10-01 20:00:54 -04:00
Latif Khalifa
90e71db462 Breakpad: removed merge artifact, fixes Linux build 2013-10-02 01:26:27 +02:00
Latif Khalifa
b125ec8d51 Breakpad: untested update to linux/mac specific parts of llappviewer 2013-10-02 00:51:29 +02:00
Latif Khalifa
d20b7815df Check user pref for sending logs 2013-10-02 00:39:11 +02:00
Latif Khalifa
98d7721ab2 Breakpad: Commence nuclear bombardment of the unused stuff
Windows breakpad crash reports implemented and uploaded
TODO: llappviewer linux and mac port of breakpad3
2013-10-01 23:41:38 +02:00
Latif Khalifa
81fa147450 Breakpad: don't fork logger process on startup. Use singularity-debug as the dir for dumps 2013-10-01 21:47:12 +02:00
Aleric Inglewood
9f50b6942e Fix random crashes when opening HTTP debug console. 2013-10-01 18:49:53 +02:00
Latif Khalifa
c87f7b0576 Breakpad3: WIP, minidump files created
TODO: re-work sending crash logs
get rid of standalone loggers
2013-10-01 13:43:45 +02:00
Salvatore La Bua
9233f873ef Merge branch 'master' of github.com:singularity-viewer/SingularityViewer 2013-10-01 03:39:00 +02:00
Salvatore La Bua
aa54d82c5a Fix a render issue with Hightlight Transparent
The smoke texture is currently not applied to transparent objects.
This commit tweaks the red alpha overlay as a workaround for that.
2013-10-01 03:33:49 +02:00