Commit Graph

250 Commits

Author SHA1 Message Date
Inusaito Sayori
04c78a1d8a Merge in Storm-1838 2013-07-31 15:49:34 -04:00
Aleric Inglewood
f154ff8f8a Crash bug fix.
I ran into this on opensim.
The value of 'bucket' passed to parse_lure_bucket was empty.

In general, we should check we HAVE eight tokens, and not
just keep incrementing the iterator without checking.
2013-07-23 21:29:35 +02:00
Lirusaito
b4d33fe0e1 Fix up some logic with always allow fly
The fly button on the toolbar would enable itself despite RLVa restrictions
 - This was because always fly was checked after gAgent.canFly(), despite the fact that gAgent.canFly() itself checks always fly setting at the correct time.

When teleporting to a region that blocks flying, the agent would start flying due to a strange check inherited from upstream.. My opinion is, they want gods to fly, but that's kinda strange too, so I've changed it to set flying false in this case.
2013-07-19 18:10:02 -04:00
Lirusaito
ab19bfb70e Don't open inventory offers if busy, busy means busy. 2013-07-19 17:53:20 -04:00
Lirusaito
fe8df82c8d Allow autoaccept to work when in busy mode by handling it first 2013-07-19 17:24:24 -04:00
Lirusaito
4dd0daa942 Feature Request: Ability to automatically accept all inventory offers
Replaces the exposed setting in popups preferences
However, for users wanting the old behavior of just landmarks, notecards, and textures being automatically accepted, the original setting(AutoAcceptNewInventory) stays as is, it can be turned on and off in debug
2013-07-19 17:05:07 -04:00
Lirusaito
c0c561c605 Tiny changes to have llviewermessage.cpp line up better with upstream 2013-07-19 16:24:41 -04:00
Lirusaito
7912eb1748 Update rlva (mainly in llviewermessage.cpp) 2013-07-19 16:17:34 -04:00
Lirusaito
3be04fc90b Attempt to solve Issue 935: Script Chat Show The Owner? 2013-07-19 10:41:19 -04:00
Lirusaito
813bb5cc7f Don't send busy respond message when to_id is null, it will confuse the respondee 2013-07-18 10:14:29 -04:00
Lirusaito
080b807e38 Bug Fix: Don't use an empty string for the session name/label of autoresponse stuffs, that tries to log to nameless file. 2013-07-18 09:49:15 -04:00
Lirusaito
9db44e67e8 Oopsies, misplaced busy response block 2013-07-18 08:35:10 -04:00
Lirusaito
a5b8c173ac Do not autorespond when incoming message is to everyone (null to_id) 2013-07-18 08:06:37 -04:00
Lirusaito
f1e792fde0 Separate busy response block from autoresponse, and use busy_message() function to avoid duplicate code 2013-07-18 08:05:11 -04:00
Lirusaito
90590e20ec Fix issue with busy response to certain message types not respecting busy response settings such as wildcard resolution 2013-07-18 08:00:19 -04:00
Lirusaito
2b7c70d765 Update lsl stuffs (Adds support for all the new stuff we'd fallen behind on) 2013-07-17 12:59:01 -04:00
Lirusaito
a1d9473fde Move ScriptQuestion strings from floater_chat_history.xml to strings.xml 2013-07-17 11:56:02 -04:00
Lirusaito
c89a245323 Feature Request: Add Profile button to friendship offer notices 2013-07-16 17:34:36 -04:00
Melanie
c20cffa33d Change "Object say, text" to "Object: text" like it used to be. The former is just bad english. 2013-07-07 04:25:48 +02:00
Lirusaito
19367b517c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate
Conflicts:
	indra/llui/lluictrl.cpp - Silly mergestuffs
	indra/newview/llfloatermediabrowser.cpp - deleted
	indra/newview/llpanellogin.cpp - updated functions went poof

Compile Fixies:
	indra/newview/llfloaterwater.cpp - I missed a spot with notificationsutil, it seems.
2013-06-26 12:37:31 -04:00
Lirusaito
5a9a0e0b1b Upload code cleansing
I found our upload classes were in need of a tune up while researching Issue 896: Animation upload setting causes viewer crash
So I started working to clean up llfloaterbvhpreview which lead me to llfloaternamedesc and the rest of our upload floaters
I ended up pulling the sound upload hack out of LLFloaterNameDesc and into LLFloaterSoundPreview and moving LLFloaterAnimPreview into llfloaternamedesc.*
Updated llviewermenufile.cpp a bit
Removed setUploadAmount from LLFloaterImagePreview and LLFloaterBvhPreview as its purpose is served by LLGlobalEconomy::getPriceUpload and the hippogridmanager too.
Fixed an issue with floater_animation_anim_preview.xml using [AMOUNT] instead of [UPLOADFEE] for its label.

I'd say this might fix Issue 896, I certainly can't reproduce the crash I was having when testing for it anymore.
2013-06-26 03:51:27 -04:00
Lirusaito
d4bed6382c Merge branch 'master' of git://github.com/Lirusaito/SingularityViewer into VoiceUpdate 2013-06-23 02:25:15 -04:00
Latif Khalifa
a6a5983fbe Merge remote-tracking branch 'lirusaito/master' 2013-06-14 18:31:35 +02:00
Latif Khalifa
4552c5f878 Merge remote-tracking branch 'melanie_t/master' 2013-06-14 18:31:23 +02:00
Lirusaito
7e9c75ef6b Use the translatable string Saved_message everywhere needed, instead of just one place. 2013-06-11 15:43:27 -04:00
Lirusaito
fd453593b3 Merge branch 'Moap' of git://github.com/Shyotl/SingularityViewer into VoiceUpdate
Conflicts:
	indra/newview/llfloateravatarinfo.cpp - llpanelprofile.cpp update
	indra/newview/llfloatergroupinfo.cpp - llgroupactions.cpp update
	indra/newview/llfloaterobjectiminfo.cpp - simple merge
	indra/newview/llstartup.cpp - Followed Shyotl's directions from 07165961dc
	indra/newview/llviewermedia.cpp - includes conflict, simple stuff.

SLURL update:
	indra/newview/llavataractions.cpp
	indra/newview/llgroupactions.cpp
2013-06-11 15:32:18 -04:00
Lirusaito
9ffd531ce6 Missed a spot 2013-06-11 09:41:33 -04:00
Lirusaito
8a37ac2439 class LLOfferInfo update 2013-06-11 07:36:49 -04:00
Lirusaito
89963b018b [Voice Update] llfloateractivespeakers.* to llspeakers.*
Condenses the three moderation responders to one.
Adds Speakers settings.
Uses dedicated timer class to track speakers on the list
Adds temporary getSpeakerManager() function to LLFloaterIMPanel to play the role of LLIMModel::getSpeakerManager
2013-06-04 10:18:49 -04:00
Melanie
f497a8a3d5 Fox the Octopus break I caused 2013-06-03 03:27:25 +02:00
Lirusaito
9d6d82c4a0 GroupActions fixup.
Missed a tiny spot for displaying group notifications in profile, slipped by me.
2013-05-31 21:04:14 -04:00
Lirusaito
fcd6f217d2 LLGroupActions too! (Strengthens RLVa restrictions!)
Cleans up llfloatergroupinfo, makes it an instance tracker... pretty much as nice as llfloateravatarinfo now ^*^
Adds notifications JoinGroupNoCost and JoinedTooManyGroups (added to our existing translations, of course)
Cleans up all around, placing groupactions around.

Touches up bits for avataractions
2013-05-31 07:37:00 -04: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
Lirusaito
c701c61566 LLAvatarActions all hooked up!
Rlva style~ So update to RLVa stuff!
Adds support for @startim and @startimto
Enables hasOpenIM and hasOpenProfile, Yay functionality!
RLV_BHVR_STARTIM and RLV_BHVR_STARTIMTO added

While I was working, I was updating LLAgentHandler, after long enough it was identical enough to the one in llpanelprofile, so we're using that now.
Cleans up llfloateravatarinfo to the point of being a floater and instancetracker wrapper for a panelavatar (profile panel)
Bypasses looking up expired names that we know via get, this should avoid chats (and profiles, but that bug never got out) never opening for people we already know the name of on a bad connection; of course, this will only cause a faster reaction on the UI's part, messages may never get sent still (and profiles may never load) if the connection is truly terrible.
Cleans up llfloaterfriends and some parts of llfloateravatarlist (avatarlist could be cleaned up more from this perhaps in the future)
May slightly look better with copy detection and without space changes..

llgivemoney.cpp changes fix up some dummy view warnings I noticed while testing these changes
llpreview.cpp changes avoid segfault caused by llfloateravatarinfo not being a preview anymore but being inside a multipreview nonetheless.

Translators, don't worry, I covered this one with updates from v3 (Except German team)
2013-05-29 23:56:33 -04:00
Siana Gearz
7c675af943 Merge branch 'master' of https://github.com/MelanieT/SingularityViewer 2013-05-27 08:40:26 +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
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
Lirusaito
2b6f49a398 Warning missing a space between "avatar" and appended uuid was annoying me. 2013-05-22 21:52:19 -04:00
Lirusaito
5fc712104a Merge branch 'master' of https://bitbucket.org/SingularityViewer/singularityviewer into Frosting
Conflicts:
	indra/newview/linux_tools/wrapper.sh
2013-05-12 03:33:34 -04:00
Lirusaito
9b5360a40b Chat Frosting
Basic Summary:
Issue 743: [Chat UI] Option to italicize actions (/me) in chat
- Adds debug LiruItalicizeActions, and a checkbox to Adv. Chat->Chat UI preferences
Issue 737: [Frosting] Annoyance Removal (Red beacon after teleport using LM's)
- Adds debug ClearBeaconAfterTeleport, checkbox under System->General
Issue 639: [Frosting] The agent isn't identified properly in chat
- Oh what a silly issue this was, it's as though whoever wrote this didn't care.
Fixes issue where names in logs do not match names in chat due to display name system
Fixes the issue in which Unnamed objects got named by a hardcoded string under certain circumstances.
Issue 813: [Frosting] When only accepting from friends, do not display incoming chat notification for nonfriends
- Also broke the setting out, separating it from the voice calls friend only setting
- Adds InstantMessagesFriendsOnly debug setting and checkbox in Adv. Chat->Chat/IM
Issue 764: Copy SLURL from Map returns correct region but wrong coordinates.
Satisfied the longstanding issue of inflexible autoresponse options.
- Autoresponse now has its own tab in Adv. Chat preferences: Busy, Muted, nonfriends, and anyone (or just friends) can have separate responses, along with items of your choosing.
- Prevent doubling up with the first repeated autoresponse due to typing message and normal message.

Translator Summary:
Adv. Chat->Chat UI->"Italicize action messages (/me)"
System->General->"Clear red destination beacon after teleporting"
Drop Targets for floater_ao.xml, panel_avatar.xml, panel_group_notices.xml, and panel_preferences_ascent_system.xml
Adv. Chat->Chat/IM->"Only accept IMs from Friends"
Please clean up the Busy Mode Response elements from panel_preferences_im.xml
strings.xml now has "IM_autoresponse_minutes"
Adv. Chat (panel_preferences_ascent_chat.xml) now has a new panel "Autoresponse", please clean up the old Autoresponse elements from Chat/IM tab and translate this panel.

Developer Summary:
Adds EChatStyle to LLChat, used for identifying what style a piece of chat is.
Update settings_per_account.xml
- Reorganized the ascent specific section.
- Removes a few old and unused settings
Better organize settings_per_account_ascent.xml
- TODO: Actually get this include system working and remove the Ascent specific section in settings_per_account.xml
Modernize LLDropTarget and make it more flexible and stand alone
- The Text of drop targets is now a child of the target itself, meaning the necessity of having a static instance to the parent is eliminated
- Drop targets are now one element in UI XML.
- Drop targets now have fill_parent option which allows the target to spread over the parent, while the text, tool_tip, and border stays in place
- If Drop Targets have a control_name, it is from the per account settings group, since Items must be in the inventory of the account in question.
- All drop targets now use the common LLDropTarget class instead of their own.
- LLGroupDropTarget is now derived from LLDropTarget and has its own tag group_drop_target.
Cleaned up the focus functions we use to focus the input bar, setInputFocus exists for their purpose.
Updated our llim* code to line up better with upstream and conform to styling.
Polished LLTracker and LLFloaterWorldMap a bit
Cleaned/Updated up LLStyleMap a bit.
Optimized autoresponse code:
- wildcards are now replaced via boost::algorithm::replace_all
- Autoresponse and related chat enhancements are now performed inside their case, instead of by the large if block above.
2013-05-11 22:36:46 -04:00
Latif Khalifa
e1df1b98f7 Merge remote-tracking branch 'aleric/master' 2013-04-28 23:35:30 +02:00
Melanie
c1e31c403e Make sure we only do a show in inventory if a sinle item is given. Enything else makes no sense or bombs 2013-04-28 23:32:17 +02:00
Aleric Inglewood
fb2f0dd164 Add support for uploading .anim files.
Mostly works, but
indra/newview/skins/default/xui/en-us/floater_animation_anim_preview.xml
needs work (the 'Name:' should be at the top, not the bottom).

Also, it asks if you want to upload this as temporary. It shouldn't do
that.
2013-04-25 19:05:52 +02:00
Lirusaito
eac5a45562 Added OverrideAnimations string, so that notifications present an actual permission QUESTION when asking for the perm. 2013-04-19 20:10:05 -04:00
Lirusaito
4cb28f1dea Update/Sync in llviewermessage, makes more things auto-previewable, like in v3. 2013-04-19 11:21:32 -04:00
Lirusaito
2b3350d686 Compile fix for internal pieces accidentally staged. 2013-04-17 22:21:07 -04:00
Lirusaito
8c49716eae Merge branch 'Cupcake' of https://github.com/LightDrake/SingularityViewer into Frosting
Conflicts:
	indra/newview/llviewerwindow.cpp - Also two compile fixes.
2013-04-10 13:26:48 -04:00
Lirusaito
fd9f8fa71f Cleanup and Synchronization (pre-merge wrap-up commit) 2013-04-10 09:14:16 -04:00
Latif Khalifa
303840f729 Merge remote-tracking branch 'shyotl/sunshine'
Conflicts:
	indra/llappearance/llavatarappearance.cpp
	indra/newview/character/avatar_lad.xml
	indra/newview/llagent.cpp
2013-03-26 23:54:36 +01:00
Shyotl
441b564afe RLVa update. 2013-03-26 00:46:11 -05:00