Commit Graph

1680 Commits

Author SHA1 Message Date
Lirusaito
0494dc8d32 Fix Issue 432: Radar Keeps Popping Up and side issue I got still the window "An object owned by you ..."
Unified key message sending to function send_keys_message()
Switched a few getBOOLs to CachedControls
Added RadarChatKeysStopAsking, and RadarChatKeysRequest as a three button notification so the user can decide to permanently say no.
Corrected RadarChatKeys description to be more accurate.
If we want to know if the radar is open, we check instanceExists, not getInstance.
Also enabled using the announce button when RadarChatKeys is false to announce keys, for manual updates.
2013-01-14 06:34:27 -05:00
Latif Khalifa
3dd33518c4 Merge remote-tracking branch 'shyotl/master' 2013-01-14 10:53:27 +01:00
Shyotl
db8225a078 Fixup LLScrollListCtrl::setCommentText, and incorrect behaviors with script editor and bulk perm editor pertaining to setCommentText inherited from V3. 2013-01-14 03:36:04 -06:00
Damian Zhaoying
00fb7804da Spanish Translate for new Group/Chat/IM floaters and some general string fixed 2013-01-13 19:05:35 -03:00
Siana Gearz
188e42ee4a Merge branch 'meshupload' of git://github.com/AlericInglewood/SingularityViewer into meshup 2013-01-13 20:10:25 +01:00
Aleric Inglewood
e7dea2714e Merge branch 'master' into meshupload 2013-01-13 18:02:28 +01:00
Aleric Inglewood
dcc2e52c61 Merge remote-tracking branch 'singu/master' 2013-01-13 18:01:48 +01:00
Aleric Inglewood
db17b93156 Merge branch 'master' into meshupload
Conflicts:
	indra/newview/llmeshrepository.cpp

Added /* */ around the 'virtual' keyword in two places
that collided with changes in meshupload from lightdrake.
2013-01-13 17:59:49 +01:00
Latif Khalifa
cef7ea9f5e Merge remote-tracking branch 'lirusato/master' into 1.7.3-dev 2013-01-13 12:45:37 +01:00
Latif Khalifa
31d2a15957 Merge remote-tracking branch 'aleric/master' into 1.7.3-dev 2013-01-13 12:45:25 +01:00
Aleric Inglewood
e01567553e Added default message for feed uploads.
By default show 'Type your message here...' and if the text editor
never got focus, replace that with a default message.
2013-01-12 21:31:21 +01:00
Lirusaito
ece92a1b7c Optionally, have group chat and conference buttons on title line.
Adds UseConciseGroupChatButtons, and UseConciseConferenceButtons
Adds "Buttons on group chat name line (Affects new group chats)" and "Buttons on conference title line (Affects new conferences)" checkboxes to Adv. Chat's Chat UI tab.
Adds floater_instant_message_ad_hoc_concisebuttons.xml, floater_instant_message_group_concisebuttons.xml

Brings panel_speaker_controls.xml's speakers_list down by 7 pixels, which is necessary because it is awkwardly high in old places as well, such as Local Chat.
2013-01-12 14:42:55 -05:00
Lirusaito
82eb1a946e Fix group buttons in horizontal and allow the horizontal buttoned friends and groups floater to take up minimal space. 2013-01-11 19:17:06 -05:00
Siana Gearz
85855ecd85 Merge branch 'meshupload' of git://github.com/LightDrake/SingularityViewer into meshup 2013-01-12 01:12:33 +01:00
Siana Gearz
b6f1bb570f Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-01-12 00:59:06 +01:00
Lirusaito
a47dbf88bb Fix Issue 590: Debug Settings parameters setting is seriously bugged 2013-01-11 15:50:47 -05:00
Aleric Inglewood
5daf817e7e Upload larger original to profile feed. 2013-01-10 19:42:19 +01:00
Lirusaito
b7f1fdd9cc Vertical space recovered 2013-01-09 11:25:46 -05:00
Lirusaito
07f88d21bd Applied STORM-1209 and added string AGroupMemberNamed for translation. 2013-01-09 11:05:37 -05:00
Lirusaito
a7d1a4611f Optionally, have IM buttons on the same line as the person's name.
Adds UseConciseIMButtons.
Adds floater_instant_message_concisebuttons.xml
Adds Have buttons on the same line as name for IMs (Affects new IMs) checkbox to Adv. Chat's Chat UI tab.
2013-01-09 10:19:41 -05:00
Lirusaito
c96b840c53 Split off certain preferences into new Adv. Chat subtab Chat UI
From Text Chat: Disallow communicate shortcut opening detached friends list
From Vanity: Use horizontal buttons for contacts floater (needs restart)
The rest were in Chat/IM of Vanity.
2013-01-09 07:30:49 -05:00
Lirusaito
70445ab8a3 Add option for Horizontal buttons on Contacts floater.
Adds Use horizontal buttons for contacts floater (needs restart) to Vanity Preferences.
Adds ContactsUseHorizontalButtons.
Adds FloaterContactsHorizRect for saving horizontal contacts rect.
Adds panel_friends_horiz.xml, panel_group_horiz.xml, and floater_my_friends_horiz.xml

Also corrects string value for FloaterContactsRect
2013-01-08 20:21:15 -05:00
Siana Gearz
94edef2c3f Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-01-09 00:07:57 +01:00
Siana Gearz
1434e8d6e9 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-01-09 00:07:34 +01:00
Lirusaito
b485048f6b Show local chat bar in floater... (Needs restart) 2013-01-08 17:17:52 -05:00
Drake Arconis
2d9402fd2d Merge branch 'master' into meshupload 2013-01-08 14:37:25 -05:00
Lirusaito
68911876b9 Option to Disallow communicate shortcut opening detached friends list
Added CommunicateSpecificShortcut
Added checkbox to Text Chat preferences
2013-01-08 13:48:18 -05:00
Drake Arconis
10c19731b3 Merge remote-tracking branch 'Aleric/master' 2013-01-08 13:11:43 -05:00
Lirusaito
820b4ea358 Optionally, remove chatbar from local chat floater.
FloaterChatBarlessRect keeps the size of this separate, for those who want to switch by mood.
ShowLocalChatFloaterBar toggles this.
Show local chat bar in floater entry added to Adv. Chat prefs.
floater_chat_history_barless.xml added for this.
2013-01-08 12:16:51 -05:00
Drake Arconis
ca746f3b47 Merge remote-tracking branch 'Lirusaito/master' into altcompilers 2013-01-08 06:17:47 -05:00
Lirusaito
1b2c0ba02b v-d llviewermenufile.cpp functions (and order) for meshupload, decide when Upload Mesh entry should be enabled. 2013-01-07 18:08:42 -05:00
Aleric Inglewood
cbbe678f9e Remove FloaterModelPreviewRect 2013-01-07 23:31:40 +01:00
Aleric Inglewood
4b592f7507 Merge remote-tracking branch 'singu/master' 2013-01-07 17:58:53 +01:00
Aleric Inglewood
e7ef9eff4f Merge branch 'master' into meshupload 2013-01-07 17:50:03 +01:00
Aleric Inglewood
a9a308e5e9 Never freeze again.
Put snapshot related floaters always on top of the full screen preview.
Make having multiple running uploads more robust.
Fix infinite recursion when clicking on the bottom 'Snapshot' button
under certain conditions.
Unfreeze time more robust; unfreeze time out of precaution when
starting an upload (if 'Keep open' not checked).
Fixed a bug that caused all callbacks for successful feed uploads to be
ignored.
2013-01-06 23:40:53 +01:00
Lirusaito
e7f4fc7107 Added colors for mesh upload MeshImportTableNormalColor and MeshImportTableHighlightColor to default/colors_base.xml 2013-01-06 12:46:56 -05:00
Lirusaito
ac60260da2 Update LLFloaterModelPreview and make it compile~
Collada include_directories and llfloatermodelpreview.*s added to CMakeLists.txt
Update to v-d, compile with AIFilePicker, comment spelling fixes.
Upload Mesh... entry added to File menu.
Updated AIFilePicker to have FFLOAD_COLLADA with an mFilter of "dae"
And, finally, add floater_model_preview.xml~
2013-01-06 11:56:33 -05:00
Lirusaito
5ec116021a Feature request: Alt-R for Region/Estate floater 2013-01-05 01:45:55 -05:00
Lirusaito
a992333744 Zi Ree's Debug Setting Floater awesomeness (Search!!)
Made to work with Singularity, and also be a bit better..
Alphabetizes includes.
Switches settings combobox to a scrolllist, and Boolean combobox to a radiogroup.
Makes floater resizable, aligns a lot of the UI, and prepares it all for proper resize behavior.
Adds Copy button for copying the name of the debug setting.
Yay, verbosity! Also adds FloaterDebugSettingsRect to keep track of the floater's size.

Also somehow the getInstance line snuck out of last commit... tossed it in here.
2013-01-05 01:43:17 -05:00
Siana Gearz
509bdcb891 Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer 2013-01-03 23:36:55 +01:00
Lirusaito
9498375e75 Update LLFloaterSettingsDebug to match up with v-d.
Adds boost::bind and makes the floater a singleton.
2013-01-03 17:20:57 -05:00
Lirusaito
88de1b28a2 Add MoyMiniMapCustomColor swatch to Vanity Preferences.
Fixed spacing of MoyMiniMapCustomColor in settings_ascent_coa.xml and removed it from settings_per_account.xml

TODO: Make MoyMiniMapCustomColor more flexible.
-Added ColorCustomChat checkbox, pref code, and setting commented out.
2013-01-03 13:59:14 -05:00
Siana Gearz
1872337f5f Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-01-03 02:17:20 +01:00
Aleric Inglewood
b0fe12f597 Snapshot Freeze Time: add Langolier tag for new (invisible) avatars.
If an avatar TP's in while you are in Freeze Time mode, they now have a
visible tag with the tag 'Langolier' in it. After exiting Freeze Time
mode they become visible. Before they would stay invisible.
2013-01-03 00:02:28 +01:00
Aleric Inglewood
cc276ff232 More snapshot UI tweaks. 2013-01-01 22:34:22 +01:00
Aleric Inglewood
5538fe27e5 Snapshot improvements.
* Warn when it was not possible to make a snapshot because the difference
between the aspect of the required target size and the required target
aspect itself is too large.
* Reset Feed and Postcard Aspect to Default when making a new snapshot.
* Fixed a rounding error that caused one-pixel size error.
2013-01-01 21:30:13 +01:00
Lirusaito
4ec6f853d8 In-Group feature request: Ability to have chats torn off, by default.
Best viewed without space changes... or maybe it doesn't matter any more.
Debug setting OtherChatsTornOff added.
Added Open new IMs in separate floaters checkbox to  Adv. Chat.
Moved Show group name in chat to the right column on top of Adv. Chat panel.

So how's this work?
Two ways.. 1. The user opens a chat; 2. A chat is started from another party to the user.
In 1, we open the chat in a separate floater and focus the floater.
In 2, we check if there is a floater currently in focus before opening the chat
if so, we minimize the floater, setting focus back to whatever floater the user was focused on;
if not, we leave the new chat floater open and focused.

Note that this will NOT alter the default behavior at all, we can't be having that.
2012-12-31 17:06:30 -05:00
Lirusaito
ba57bb1396 In-group feature request: Allow coloring chat of special people (Friends, Estate Owner, Lindens, Muted Residents)
Added ColorFriendChat, ColorEstateOwnerChat, ColorLindenChat, and ColorMutedChat.
Did some spaces to tabs work, view without space changes.
Add checkboxes beneath corresponding color swatches and "Use colors for chat:" text to Vanity.
Fix Ascent*Color Comments strings.

Also fix the issue where clicking ones name in a group chat would result in it opening a random profile.
2012-12-31 06:24:35 -05:00
Lirusaito
f94f4a1191 Satisfy Issue 100: When timestamp it set to include seconds, the seconds do not get included with IM & chat logs.
Best viewed without space changes.
SecondsInLog debug setting added.
Seconds in Log timestamps checkbox added to Adv. Chat prefs.
2012-12-31 04:54:59 -05:00
Lirusaito
469f76e690 Added "Request New Feature..." to Help->Bug Reporting menu. 2012-12-30 16:21:01 -05:00