Commit Graph

4317 Commits

Author SHA1 Message Date
Shyotl
a8fb7e812a Fix rightclicking fully transparent prims when show-transparent is enabled. 2013-05-20 20:51:27 +02:00
Inusaito Sayori
ee785f0f17 Allow turning flying on and off while seated, if using Continue Fly On Unsit
Note: Redundant code, but these functions will likely be merged eventually(FUI-esque project), so it doesn't matter for now.
2013-05-20 12:14:58 -04:00
Inusaito Sayori
370b41e7b0 Fix Issue 448: Minimum window size too large 2013-05-20 10:09:27 -04:00
Inusaito Sayori
5c9286f460 Modernize and improve upon LLFloaterReporter to fix Issue 822: Report Abuse does not populate Region Name or screenshot correctly
Cleans up related bits in xmls/translations
2013-05-20 09:09:03 -04:00
Inusaito Sayori
6048c2405b Correct the (hopefully) last chat color issues~ 2013-05-20 08:39:51 -04:00
Inusaito Sayori
0c3f8f77e1 Fix the issue in which during conference chats the user's name is displayed as legacy, not linked, the wrong color, and their chat is not in their chosen color
Removes the "not sure why" block of code that sets the other_participant_id null if it's really from the user.
I have no idea why this ever was needed, it's a hack for certain, and only breaks things now.
2013-05-19 15:21:08 -04:00
Inusaito Sayori
c77c0b641b Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-05-19 12:26:07 -04:00
Inusaito Sayori
1ca2a567cd Improve upon the nametag system
Use the user-desired name with Resident stripped out, when on SecondLife grid.
When using legacy names without group titles, don't show the last name on a new line.
When using chat bubbles or typing bubbles, use the desired tag color.
2013-05-18 19:24:42 -04:00
Inusaito Sayori
8f3fe5dfae File mode fixes for some exe, plist, and glsl files. 2013-05-18 11:45:27 -04:00
Inusaito Sayori
949fa829c2 Improve enable_object_edit() so that the Edit pie menu entry doesn't take forever to enable
Bypasses pointless call to LLSelectMgr::getInstance()->selectGetAllValidAndObjectsFound()
Cleans up RLVa patch to read more clearly (this change is better viewed without spaces)
2013-05-18 10:57:19 -04:00
Latif Khalifa
f4261e35f4 Merge remote-tracking branch 'lirusaito/master' 2013-05-18 15:12:46 +02:00
Latif Khalifa
4f2534790c Merge remote-tracking branch 'shyotl/master' 2013-05-18 15:12:26 +02:00
Inusaito Sayori
00bbbe70a7 Fix a bug pointed out by LaMont Zuzu in which a texture dragged and dropped to one's profile image would be sent back to the user
Removes the unnecessary drop target and give item text in these cases.
On someone else's profile, you may drag and drop a replacement texture
On your profile, you have no reason to drag and drop an item, in fact this can cause bad inventory issues (yes, I've tested it)
2013-05-17 10:06:08 -04:00
Inusaito Sayori
36e218cf19 One more git ignore needed, thanks Latif! 2013-05-17 04:03:42 -04:00
Inusaito Sayori
9742794d08 If possible, figure out the typing person's name according to the name system before showing that they are typing.
(IE: "Aur'a Færs (inusaito.kanya)is typing..." instead of "Inusaito Kanya is typing...")
This adds consistency between chat and messages, and should Resident strip in most cases.
2013-05-17 03:12:10 -04:00
Inusaito Sayori
0f2a4707a3 Add top level build directory to gitignore, and mode change on files that certainly shouldn't be executable. 2013-05-17 03:02:57 -04:00
Siana Gearz
42e42dedd7 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer 2013-05-14 10:04:31 +02:00
Siana Gearz
3c7f3b2af9 Speculative linux buildbot build fix 2013-05-14 10:00:44 +02:00
Lirusaito
048fe6e862 French translation update/cleanup 2013-05-13 06:05:39 -04:00
Siana Gearz
63f152e78d Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer 2013-05-13 02:43:49 +02:00
Lirusaito
a861a90013 Merge branch 'Frosting' of git://github.com/Lirusaito/SingularityViewer 2013-05-12 20:13:19 -04:00
Lirusaito
5730abb6c8 French Translation Update 2013-05-12 20:09:34 -04:00
Lirusaito
42a14952e7 Merge branch 'master' of https://github.com/LightDrake/SingularityViewer 2013-05-12 15:15:06 -04:00
Lirusaito
36e2ee5dfb Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Frosting 2013-05-12 14:31:29 -04:00
Drake Arconis
eef53e3eac Merge branch 'master' of git://github.com/singularity-viewer/SingularityViewer 2013-05-12 10:08:49 -07:00
Drake Arconis
075bbe6831 NyanNyanNyan 2013-05-12 10:08:33 -07:00
Aleric Inglewood
67e88561dc Queue/throttle fix.
If AIPerService::add_queued_to fails because a new request is throttled,
then do not add the request to the end of the queue, nor remove it from
the queue: do nothing: it makes no sense to move the request to the back
because they all belong to the same service and all of them will be
either throttled or not.

Note: Still need to fix that in this case we should look in queues of
other services.
2013-05-12 18:10:49 +02:00
Aleric Inglewood
f8aac1f3dd Lets CurlEasyHandle::approved() stay consisten throughout its lifetime. 2013-05-12 17:56:29 +02:00
Aleric Inglewood
80c8eaab2a Ask approvement for each HTTP request.
The old code could do up till four requests with only one approvement.
Now we just start to assemble the four types of requests until either we
can get approvement for one, or one of them gets too large. This way we
still request everything in the same order, and at LEAST as many per
call as before, assuming we get the approvement of course.
The result should actually be faster because now we will request up to 5
folders or items per capability, and not spread those 5 out over 2 to 4
capability requests.
2013-05-12 16:51:48 +02: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
417dcb4e49 Frosting touchups
Cleaned up flaws in LLUUID
- Removed deprecated LLUUID::toString(char*) and LLUUID::toCompressedString(char*)
Cleaned up some comments
2013-05-11 23:14:16 -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
Aleric Inglewood
929badb110 Let statemachine honor approvements.
The inventory bulk fetch is not thread-safe, so the it doesn't start
right away, causing the approvement not to be honored upon return from
post_approved (formerly post_nb).

This patch renames wantsMoreHTTPReqestsFor to approveHTTPRequestFor,
and has it return NULL or a AIPerService::Approvement object.
The latter is now passed to the CurlEasyHandle object instead of just a
boolean mQueueIfTooMuchBandwidthUsage, and then the Approvement is
honored by the state machine right after the request is actually added
to the command queue.

This should avoid a flood of inventory requests in the case
approveHTTPRequestFor is called multiple times before the main thread
adds the requests to the command queue. I don't think that actually ever
happens, but I added debug code (to find some problem) that is so damn
strictly checking everything that I need to be this precise in order to
do that testing.
2013-05-12 04:19:44 +02:00
Siana Gearz
54983bcc89 Fixing some syntactic and build system stupidity 2013-05-11 23:40:26 +02:00
Siana Gearz
b344873954 Forgotten file and fix 2013-05-11 21:46:41 +02:00
Siana Gearz
c43dd499d0 Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer 2013-05-11 20:45:00 +02:00
Siana Gearz
6c2d5eea30 Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer 2013-05-11 20:39:06 +02:00
Siana Gearz
9183cffb44 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer 2013-05-11 20:36:41 +02:00
Siana Gearz
e86f3a5cbd Starting war on std::map. Peeked at what NickyD and Zwag were doing. 2013-05-11 17:52:13 +02:00
Aleric Inglewood
3d63f9cd24 WIP on inventory background fetch 2013-05-11 16:04:34 +02:00
Aleric Inglewood
de1d44080d Fix terrain textures not updating after terraform or elevation range change. 2013-05-08 20:16:40 +02:00
Lirusaito
c13ed02ec8 Compile fixes (for GCC 4.8) 2013-05-08 00:55:50 -04:00
Lirusaito
f48eca366a Issue 773: Add option to update currently worn outfit 2013-05-08 00:47:55 -04:00
Lirusaito
29c2bc2bed It may be a little misleading, but Script Info in the attachment piemenu is useful
I hadn't committed it at first since it gives more than just information about the selected attachment,
and there was no way to scroll to the selected attachment in the list and highlight it,
but sometimes the avatar's body is covered in attachments, so the entry in the avatar body menu alone isn't enough.
2013-05-07 19:30:02 -04:00
Aleric Inglewood
d2af4a3c23 WIP: comment out llasserts.
This way my master isn't totally broken, at least ;).
2013-05-07 23:02:56 +02:00
Aleric Inglewood
5b1984ed0c WIP: Added AIPerService::Approvement 2013-05-07 19:36:10 +02:00
Aleric Inglewood
e3fec7c715 AIPerService improvements.
* Removed the 'RequestQueue' from other PerServiceRequestQueue occurances
  in the code.
* Made wantsMoreHTTPRequestsFor and checkBandwidthUsage threadsafe (by
  grouping the static variables of AIPerService into thread ThreadSafe
  groups.
2013-05-07 16:10:09 +02:00
Aleric Inglewood
410f9d92a5 Minor improvemnt of coding style. 2013-05-07 02:01:31 +02:00
Drake Arconis
47e83bf677 Merge remote-tracking branch 'LiruFox/master' 2013-05-06 11:44:21 -07:00
Siana Gearz
30332cff3f Sanitize cmake, cleanup develop.py 2013-05-06 06:07:23 +02:00