Commit Graph

4297 Commits

Author SHA1 Message Date
Siana Gearz
3c7f3b2af9 Speculative linux buildbot build fix 2013-05-14 10:00:44 +02: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
Drake Arconis
e0ef803ed5 Fix issue a different way and supress new gcc 4.8 warning 2013-05-05 19:24:13 -07:00
Aleric Inglewood
84e7f15dc5 Fix initialization list order (compiler warnings) 2013-05-06 03:26:22 +02:00
Drake Arconis
36416743d4 fix a buggy 2013-05-05 18:23:26 -07:00
Drake Arconis
73b10e6b29 Made compiler detection more reliable and cleanup clang warnings 2013-05-05 17:56:16 -07:00
Aleric Inglewood
1d629438c0 Add HTTP bandwidth throttling for every other responder.
Most notably getMesh (the only one possibly using any significant
bandwidth), but in general every type of requests that just have to
happen anyway and in the order they are requested: they are just passed
to the curl thread, but now the curl thread will queue them and hold
back if the (general) service they use is loaded too heavily.
2013-05-06 02:54:10 +02:00
Aleric Inglewood
75a45f501e Moved a part of AIPerService::wantsMoreHTTPRequestsFor to a new function.
The new function is AIPerService::checkBandwidthUsage.
No functional changes were made.
2013-05-06 02:54:10 +02:00
Aleric Inglewood
fd3e8e4a23 Preparation for AIPerService::checkBandwidthUsage.
Don't pass arguments to wantsMoreHTTPRequestsFor, but use globals in
llmessage: AIPerService::sHTTPThrottleBandwidth125 and
AIPerService::sNoHTTPBandwidthThrottling instead.

This is needed later on.
2013-05-06 02:54:03 +02:00
Aleric Inglewood
32a5494c79 Limit sMaxPipelinedRequests changes to once per 40ms, plus code clean up.
Mostly renaming stuff and moving static variables to class AIPerSerive.
2013-05-04 20:02:21 +02:00
Latif Khalifa
a2df4b6693 Merge remote-tracking branch 'aleric/master' 2013-05-03 19:40:56 +02:00
Latif Khalifa
25dd719e39 Revert "Spot-fix the CAPS issue preventing UseHTTPInventory debug setting from working."
On-the-fly switching of UseHTTPInventory provided in patch by Aleric.

This reverts commit bdb74add3c.
2013-05-03 19:39:54 +02:00
Aleric Inglewood
4cc42cd5bd Fix for file-5.14 2013-05-03 19:05:31 +02:00
Aleric Inglewood
4983fd6ab6 Allow switching between HTTP and UDP inventory without relogging.
This also makes the viewer immune for grids that send the FetchInventory2 et al
capabilities regardsless of whether we requested them (in fact, we always
request them now: we need them when someone switches in the middle of a session).

Note that (I tested that) textures could already be switched between
HTTP and UDP without relogging.
2013-05-03 18:24:33 +02:00
Aleric Inglewood
673e96e829 Linux script fix at exit viewer. 2013-05-03 00:06:32 +02:00
Melanie
bdb74add3c Spot-fix the CAPS issue preventing UseHTTPInventory debug setting from working. 2013-05-01 02:29:34 +02:00
Melanie
fc183be845 Add RLV toggle to prefs 2013-05-01 02:29:17 +02:00
Melanie
e00293baba Add the Limit Select Distance control to the input&camera panel 2013-05-01 01:56:36 +02:00
Melanie
ec266b895e XMLize the "Singularity" menu and add Rebake and Region Debug Console to it. 2013-05-01 00:23:10 +02:00
Aleric Inglewood
13e246611d Make refresh_desktop_app_entry.sh executable. 2013-04-30 22:48:32 +02:00