Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,404 Commits 20 Branches 51 Tags
d4f5c25612b74a1ce6490df4c909c003f2ca7c2f
Commit Graph

4404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shyotl
d4f5c25612 Fix up some of the broken SLURL<->HippoGridManager logic. 2013-06-16 21:47:55 -05:00
Shyotl
be94087bee Fixed a focus issue that prevented face media floater from updating on face change if said floater had current focus. 2013-06-15 20:08:05 -05:00
Shyotl
ad89c3e401 Added media support to prim face editor. Todo: Translations for all these floaters and panels. 2013-06-15 05:14:27 -05:00
Shyotl
5f4091b4d2 Update LLFloaterTools to use commit callback registrar where convenient. 2013-06-14 03:55:40 -05:00
Shyotl
9d0f7bacfc Tweak focus handling so media faces behave properly, and tweaked tooltip handling for media faces. 2013-06-13 20:10:24 -05:00
Shyotl
dceb1a64fe Added mouse entry/mouse leave ui callback support. Works manually or through CommitCallbackRegistry (*.mouseenter_callback & *.mouseleave_callback attributes) 2013-06-13 04:33:49 -05:00
Shyotl
e617ff0763 New LLLayoutStack, and cursory LLPanelPrimMediaControl panel. 2013-06-13 04:28:15 -05:00
Shyotl
72c186f0f4 Fixed some unused variable warnings/errors when not compiling with assertions enabled. (eg 'release' configuration). Also snagged a nullcheck from upstream. 2013-06-06 02:12:45 -05:00
Shyotl
909fc0d9ce Blah blah fix non-windows builds. 2013-06-04 17:08:59 -05:00
Shyotl
3a7955192e Temporary super-obsessive audioengine debugging/diagnostics. 2013-06-04 04:39:51 -05:00
Shyotl
821fd1f7d6 Handle fmodex internal channel release by registering channel callbacks. Harden channel<->source associations. Assign console output for audio system "AudioEngine" and "AudioImpl" tags. Added base LLAudioChannel::cleanup() vfunc to handle non-impl-related variable cleanup. Killed some redundant code. 2013-06-04 03:46:26 -05:00
Shyotl
9c8cfcfd0a Fixed crash upon clicking media prim (disabled prim media control floater for now). Fleshed out media browser replacement (LLFloaterWebContent). 2013-06-02 23:47:47 -05:00
Shyotl
c2cc65ecdc Removed dead STATE_LOGIN_AUTHENTICATE login state, and added login redirect response ('indeterminate'). 2013-06-01 05:13:56 -05:00
Shyotl
d4a545fb16 More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs. 2013-06-01 05:11:18 -05:00
Shyotl
ef3e918558 Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)! 2013-05-31 05:33:41 -05:00
Shyotl
641ada030e Didn't actually want to commit the latter ui-scale related change, but rebasing is too annoying, so revert. 2013-05-27 19:23:36 -05:00
Shyotl
ba9c8f3d6d Merge branch 'master' into UICleanup 2013-05-27 19:19:38 -05:00
Shyotl
d5e1a0dd4b Unbreak ui scaling. 2013-05-27 19:18:47 -05:00
Shyotl
00269e8358 Unbork ui scaling. 2013-05-27 19:18:11 -05:00
Lirusaito
ee1f1cdde2 Use isNull instead of checking equal to LLUUID::null in hbfloatergrouptitles 2013-05-27 08:11:09 -04:00
Lirusaito
6b83dd5210 LLPanelDebug isn't doing anything, it goes poof. 2013-05-27 08:10:12 -04:00
Lirusaito
4eae554812 Merge branch 'UICleanup' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/llappearance/llwearable.h
	indra/llui/llcombobox.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llpanelgrouproles.cpp
	indra/newview/llpanelgrouproles.h
	indra/newview/llviewermenu.cpp - Plugged in new MenuFloaterDict for AssetBlacklist and SoundExplorer in menu_viewer.xml and removed the old listeners for them.
	indra/newview/skins/default/xui/es/floater_inventory.xml
Compile Fixes:
	indra/llcommon/llstl.h - error: expected nested-name-specifier before ‘const’
	indra/llui/llmultisliderctrl.cpp:283:12: error: ‘caller’ was not declared in this scope
	indra/llui/lltexteditor.cpp
		- error: operands to ?: have different types ‘const LLPointer<LLTextSegment>’ and ‘long int’
		- error: passing ‘const LLPointer<LLTextSegment>’ as ‘this’ argument of ‘LLPointer<Type>& LLPointer<Type>::operator=(const LLPointer<Type>&) [with Type = LLTextSegment]’ discards qualifiers
	indra/newview/llfloaterpermissionsmgr.cpp - Silly Shyotl, boost bind, not std bind.
	indra/newview/llfloaterproperties.* - error: ‘LLInstanceTracker<LLFloaterProperties, LLUUID>’ is an inaccessible base of ‘LLFloaterProperties’
	indra/newview/llgivemoney.cpp - Again, boost::ref, not std::ref
	indra/newview/llpreviewscript.cpp - no known conversion for argument 1 from ‘std::vector<const LLPointer<LLTextSegment> >’ to ‘std::vector<LLPointer<LLTextSegment> >&
 2013-05-27 08:09:28 -04:00
Lirusaito
a10708e9be Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-05-27 04:07:38 -04:00
Lirusaito
8769b98b31 Add Bottom offset spinner to the Chat Console section of Text Chat prefs, thanks Ratany! 2013-05-27 03:08:09 -04:00
Siana Gearz
6fca791632 Fortify on release doesn't work and throws warnings on F18 2013-05-27 08:48:45 +02:00
Siana Gearz
7c675af943 Merge branch 'master' of https://github.com/MelanieT/SingularityViewer 2013-05-27 08:40:26 +02:00
Siana Gearz
074e6c135b Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer 2013-05-27 08:37:39 +02:00
Siana Gearz
e9a323af9f Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer 2013-05-27 08:36:56 +02:00
Siana Gearz
8b085bd03d Matching movement rebuild code with V3 again 2013-05-27 08:35:07 +02:00
Siana Gearz
772f5e0e5d Somebody just won the prize for the least working contributed code. 
Just made it compile and look like it does something sane, don't have time to test it at the moment.
 2013-05-27 08:12:39 +02:00
Siana Gearz
62be5ae913 Merge branch 'v2URI' of https://github.com/Swiftkill/SingularityViewer 2013-05-27 06:48:51 +02:00
Siana Gearz
3cd16c84ef Dirty patch Intel HD4000 shader-confusion 2013-05-27 06:47:00 +02:00
Aleric Inglewood
b6f6dfbe99 Fix french assert. 
Fixes a possible ASSERT(!(need_new_run && !mYieldEngine &&
sub_state_r->run_state == run_state)).

When over all multiplex_impl functions and this is the only case that I
found where it could return without changing the state and without
calling either idle() or yield().
 2013-05-27 02:15:28 +02:00
Melanie
4abe27f7f5 Move the octopus so the swirlies will not happen when CCS is attached in SL 2013-05-26 17:10:23 +02:00
Siana Gearz
c61415d785 Canonicalize detach crash fix to RLVa 2013-05-26 15:56:22 +02:00
Siana Gearz
89e7decc12 Bring chat focus behaviour closer to Phoenix by default, and an option 2013-05-26 14:34:19 +02:00
Siana Gearz
d4251e3f69 This should fix bridge detach and crash, thx Ansariel 2013-05-26 05:45:00 +02:00
Siana Gearz
bc145c95fb Silence VC10 warnings 2013-05-26 05:43:28 +02:00
Lirusaito
9b4748ae71 Fix deleting all scripts in selection 
Two real changes: 1. Don't tell the user we're counting scripts when they just want them gone; 2. When deleting a script, counter-iterate to avoid a crash
Adds a bit more debug spew commented out, helped me out with this.

Thanks to Sentinel for catching this early!
 2013-05-25 20:51:15 -04:00
Lirusaito
9d3cc2a03b Fix the issue with chat bubbles having the chatter's name at the start of normal messages, also connect the italicize actions option to chat bubbles. 
Moves the "We have a real utterance now" block back above the concatenation of names and verbs and the message.
Maybe italicize should be tied to a separate setting for bubble chat, but for now let's see if it is fine in its current state.
 2013-05-25 16:19:59 -04:00
Aleric Inglewood
a8880983c4 Fix WARNING: addData: Type mismatch in LLMsgVarData::addData for Set 2013-05-25 22:07:50 +02:00
Lirusaito
67c6864f5e Update to french translation, thanks Nomade. 2013-05-25 15:30:55 -04:00
Melanie
326008c553 Correct curreny display in "serverside is now viewerside" currency dialogs on OpenSim 2013-05-25 05:36:11 +02:00
Aleric Inglewood
b1be8802ca Fix URL to correct section for store creation. 2013-05-25 03:20:14 +02:00
Aleric Inglewood
3af2c13cd3 Compile fix for libcwd. 2013-05-25 03:19:33 +02:00
Lirusaito
1abd7f18f5 Tweak the increment and the minimum value of the draw distance slider on the graphics prefs panel to display the same values as seen on the quick prefs. 
Thanks to Xanthe Yordstorm for pointing out this inconsistency!
 2013-05-24 20:53:15 -04:00
Lirusaito
6cfaeeb37b Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Frosting 2013-05-24 17:30:54 -04:00
Latif Khalifa
bd2b25b12b Merge remote-tracking branch 'lirusaito/master' 2013-05-24 19:56:34 +02:00
Latif Khalifa
f67ac97fcf Revert the last change of VSTool.exe 2013-05-24 06:00:22 +02:00
Lirusaito
19996468c1 Correct a flipped bool 2013-05-23 17:37:19 -04:00