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

363 Commits

Author SHA1 Message Date
Shyotl
b865b92a6a Merge branch 'FMODStudio' 
Conflicts:
	indra/cmake/PNG.cmake
	indra/newview/llnetmap.cpp
	indra/newview/llviewermessage.cpp



PARAMETERS: CLEAN
 2015-01-26 17:15:46 -06:00
Inusaito Sayori
844444c33b Optimize loops calling endInstances() 
Thankies to Drake Arconis/Alchemy~
 2015-01-12 18:06:49 -05:00
Inusaito Sayori
794027d91e In (readonly) combo_boxes and flyout_buttons allow use of the font attribute. 2015-01-03 22:14:53 -05:00
Inusaito Sayori
0e48a2196f Update/Modernize LLAvatarName and LLAvatarNameCache and _EVERYTHING_ they touch 
Fairly certain this adds the feature in which the user may click the online notification to open a chat with the user coming online.

Translators may want to look at the xml changes of this change to see what to update

Removes old LegacyMultiAttachmentSupport patch
Moves LLAvatarName-centric functions into LLAvatarName from elsewhere.
Adds boost::signals2::connections to name polling places.
Removes more old icky static callbacks
Merge from Alchemy, credit where due~
Update notifications.xml to have a bunch of the tags from upstream to ease diffing
 2014-12-16 17:55:23 -05:00
Lirusaito
4387118d55 Remove silly redundant code in LLFloater::draw 
Thanks to Diva for pointing this out.
 2014-11-23 18:50:59 -05:00
Drake Arconis
29195e8460 Merged upstream/master 2014-08-22 10:26:58 -04:00
Inusaito Sayori
e3dd05ef21 Fix the broken radio groups 
Now can I go to sleep, Papa?
...
But I did my chores and fixed the bugs.
...
YAY! *runs off to bed*
 2014-08-22 07:14:19 -04:00
Drake Arconis
948ebe5213 All your codebase are belong to us. 2014-08-22 00:15:09 -04:00
Inusaito Sayori
8d4567b930 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2014-08-19 19:55:34 -04:00
Inusaito Sayori
435ab2ce77 Modernize llradiogroup, allows v3-style attributes: value, label for radio_item; allow_deselect for radio_group. 
LLRadioCtrl moves into llradiogroup.cpp
 2014-08-19 19:42:42 -04:00
Shyotl
b09f7f5ac7 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer.git 
Conflicts:
	indra/newview/llviewerobjectlist.cpp
	indra/newview/llviewerpartsim.cpp
 2014-08-18 23:55:03 -05:00
Shyotl
0e86b696c5 Added more verbose statemachine debug output. 2014-08-18 00:54:01 -05:00
Inusaito Sayori
ce7d0e81bd Toggle control_name in <floater/>'s like booleans for visibility, if they exist. 
Look out for this in the UI Overhaul merge, this is gonna clash big time.
 2014-08-05 12:48:28 -04:00
Inusaito Sayori
c6ef099e18 When we setTextEntry on a combo box, move the cursor to the beginning of the new text. 
This fixes the login location combo box not displaying the location cleanly after appending coordinates and such.
 2014-07-23 18:15:14 -04:00
Inusaito Sayori
601ff92871 Address Issue 1570: Make comboboxes scrollable 
Note: It appears that mLabel is never set by combo boxes, this should eventually be fixed.
Checking !getFirstSelected() is sufficient to test if we're in the list, however.
 2014-07-21 18:00:43 -04:00
Inusaito Sayori
5f6dcfa82a [UI Overhaul] Restore LLContextMenu::appendContextSubMenu definition, lost in last commit. (Thannks for catching this, Tazy!) 2014-05-29 20:12:31 -04:00
Inusaito Sayori
f2dd944acd [UI Overhaul] Migrate LLContextMenu (and LLPieMenu) to the bottom of llmenugl.cpp to better diff with upstream. 2014-05-28 23:33:53 -04:00
Inusaito Sayori
d0f69ebb75 [UI Overhaul] LLMenuGL sync: doIt() --> onCommit() 2014-05-28 23:03:00 -04:00
Inusaito Sayori
04737fb0e8 [UI Overhaul] Missed this in c640585 2014-05-28 22:59:52 -04:00
Inusaito Sayori
c640585bc3 [UI Overhaul] Introduce LLMenuGL::insert from upstream and remove append/addChild wrappers in favor of insert 2014-05-28 22:52:29 -04:00
Inusaito Sayori
a926cdc5be [UI Overhaul] LLMenuGL sync 2014-05-28 22:08:01 -04:00
Inusaito Sayori
43e66b57a0 [UI Overhaul] Scrollable Menus.. just the implementation for now, not actually used. 
This worked initially(early testing yesterday), but since then it seems not to, either way, implementation part is out of the way, so committing.
 2014-05-28 21:50:18 -04:00
Inusaito Sayori
bbe7f6adfb Enable Multiselect in groups, and enable EditMenuHandler when a scrollable list is focused! 
Allows Ctrl-A to select all in a list (Like for selecting all groups and unticking chat with a single click)
Ctrl-E to deselect
Ctrl-X/Ctrl-C to copy a list (useful for saving ban lists and such!)
 2014-05-23 19:37:32 -04:00
Inusaito Sayori
828941a204 Meeting Request: Pick up LL's changes to land impact (Also introduces Land Impact floater) 
Small change to lltextbox allowing us to use value attribute with <text/>'s YAY!!

Cleaned up in llfloatertools as well to better diff.
 2014-05-23 06:19:43 -04:00
Inusaito Sayori
b1d18c7f29 Address Issue 1298: Add Auto-replace text feature, borrowed from LL~ 2014-04-08 02:12:51 -04:00
Inusaito Sayori
5affacab70 Fixes, mainly for Clang/Mac, from Cinder. 2014-03-24 16:56:10 -04:00
Inusaito Sayori
2450b435a7 Combine commonly created scroll list menus into single menus identified by menu_num instead of their menu_file 
sScrollListMenus is an array such that it will hold more menus in the future, such as groups.
fmenu_file still exists and will still exhibit its old behavior if used.
 2014-01-24 21:41:56 -05:00
Lirusaito
7572674fdb Enforce xml follows flags in scroll containers, and allow the appearance floater to resize, enforcing minimum dimensions of its default size 
It was requested to let people resize the height to easily display more sections, and well, this is the easiest fix, if width changes in a nasty way, it can just be fixed since default is min.
 2014-01-23 19:07:53 -05:00
Lirusaito
63379105b5 Fix the local chat focu bug, yay! 2014-01-23 19:06:33 -05:00
Inusaito Sayori
2642a1c3ff [Warnings] Fix class/struct inconsistency. 2013-12-14 00:00:52 -05:00
Inusaito Sayori
edabdcf724 log_sStringTemplates_accesses now spews lldebugs, not llinfos 2013-12-11 15:57:05 -05:00
Inusaito Sayori
be369b5500 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-12-04 14:05:46 -05:00
Inusaito Sayori
8fb2812899 LLIconCtrl Params 2013-12-02 20:45:07 -05:00
Inusaito Sayori
4116ac75f6 LLUICtrl Params 
Also adds support for requests_front boolean attribute to lluictrl from upstream
 2013-12-02 20:17:48 -05:00
Inusaito Sayori
23958965aa LLInitParam/LLUI Params enhancement 
Specialized param handling for common linden types
And pre-viewer-interesting modernized llinitparam.* (includes llsdparam.cpp update)
 2013-12-02 00:27:50 -05:00
Inusaito Sayori
9723a45e72 Modernize LLIconCtrl 
Adds min_height and min_width attributes
Adds mPriority for controlling priority with which to call LLUI::getUIImage*
Moves specialized setImage()s into setValue
Removes mImageName and mImageID, value is stored in base as LLSD now
 2013-12-01 15:58:24 -05:00
Inusaito Sayori
bbb55b0b4d LLUICtrl support for "enabled_control" and "disabled_control" attributes from upstream. 2013-12-01 11:56:45 -05:00
Siana Gearz
faf5a8e694 Translation and debranding fixes 2013-11-29 08:47:25 +01:00
Siana Gearz
8a13599436 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer 2013-11-29 06:27:05 +01:00
Inusaito Sayori
7fd61c3bf1 Fix delete not working in text editors 2013-11-25 21:03:36 -05:00
Siana Gearz
c162b470b2 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2013-11-20 01:09:10 +01:00
Shyotl
5d2511e39e More font cleanup and updating. 2013-11-19 17:56:27 -06:00
Latif Khalifa
594eacb480 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 2013-11-19 04:44:55 +01:00
Shyotl
b9d2ad3132 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2013-11-18 10:38:39 -06:00
Shyotl
be249ac8a1 Font update. Minor refactor, and removed some pointless code that was leaking. 2013-11-18 09:56:49 -06:00
Aleric Inglewood
bddb1ba48c Merge remote-tracking branch 'singu/master' 2013-11-15 18:00:49 +01:00
Aleric Inglewood
a8cded0cf6 Allow calling LLNotificationsUtil::add from any thread. 
This makes LLStringUtil thread-safe by removing a rather unnecessary
LLFastTimer from LLStringUtil::format.

Same thing for LLTrans::getString and LLTrans::findString, where
even a comment stated that the author wasn't interested in measuring
cpu time at all. In this case I added some code back to make sure
that we're not calling LLTrans::getString() in an inner loop, which
was the reason that the LLFastTimer was added.

Made one string static to avoid 45000 look ups during login, which
kinda triggered the above test.

Finally, LLNotificationsUtil::add is made thread-safe by making
LLNotificationChannelBase::mItems thread-safe and defering a call
to LLNotifications::updateItem to the main thread when called
from another thread (using a little statemachine).
 2013-11-15 17:52:52 +01:00
Inusaito Sayori
2e7d80e9ba Let shift-left-clicking in the middle of subpiemenus move back to the parent piemenu! 2013-11-12 02:02:16 -05:00
Inusaito Sayori
d678735cf6 Code cleanup in pie menu 
Cleaned up hover logic and slice from x and y code duplication
(Best viewed without space changes)
 2013-11-12 02:00:21 -05:00
Latif Khalifa
c6a7ae51e6 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-11-10 11:13:55 +01:00