Commit Graph

4335 Commits

Author SHA1 Message Date
Siana Gearz
89e7decc12 Bring chat focus behaviour closer to Phoenix by default, and an option 2013-05-26 14:34:19 +02:00
Siana Gearz
d4251e3f69 This should fix bridge detach and crash, thx Ansariel 2013-05-26 05:45:00 +02:00
Siana Gearz
bc145c95fb Silence VC10 warnings 2013-05-26 05:43:28 +02:00
Latif Khalifa
bd2b25b12b Merge remote-tracking branch 'lirusaito/master' 2013-05-24 19:56:34 +02:00
Latif Khalifa
f67ac97fcf Revert the last change of VSTool.exe 2013-05-24 06:00:22 +02:00
Lirusaito
ceea30977e Merge branch 'Frosting' of git://github.com/Lirusaito/SingularityViewer 2013-05-22 12:50:45 -04:00
Lirusaito
0509fdfdf2 Apparently the navmesh can be dirty when dynamic pathfinding is disabled... fixed the icons to anticipate this silliness. 2013-05-22 11:41:06 -04:00
Lirusaito
a0d6f11c4e Merge branch 'Frosting' of git://github.com/Lirusaito/SingularityViewer 2013-05-22 11:05:05 -04:00
Lirusaito
e3bd635510 Redid ScriptCounter entirely, should fix 182, if not just prevent the permanent failure condition.
Script Counter now shows the names of avatars in the user's desired format.
Adds "Count Scripts in Selection" to the Tools menu. (Can count for multiple objects, quite useful for land owners, no?)
Makes the Script Counting strings translatable. (ScriptCounting, ScriptCountAvatar, ScriptCountObject, and ScriptDeleteObject)

ScriptCounter is no longer a giant pile of static, it goes away when it has run its course and multiple instances can exist simultaneously.
Removes the silly unneeded parts of ScriptCounter, and thus removes it from llstartup.cpp
Adds some nice documentation in comments, and moves some log output to proper places (although I commented it out, it proved quite spammy for high primcount objects, initial loop runs super fast)
Trying to view this diff with no space changes is the best course of action, but even that will be tough...
Adds a header guard to scriptcounter.h
Hooks up menu function LLObjectVisibleScriptCount to Object.VisibleScriptCount, apparently this was never hooked up.... strange
2013-05-22 11:01:43 -04:00
Latif Khalifa
f03a76c3c4 Merge remote-tracking branch 'lirusaito/master' 2013-05-22 02:11:22 +02:00
Lirusaito
ea52583510 LLFloaterNewIM was no longer used, I plucked it out. 2013-05-21 19:09:41 -04:00
Aleric Inglewood
ed8fa9229f Merge remote-tracking branch 'singu/master' 2013-05-21 23:58:53 +02:00
Aleric Inglewood
cf4c4a72c2 Added AICapabilityType and related.
This splits the AIPerService queue up into four queues: one for each
"capability type". On Second Life that doesn't make a difference in
itself for textures because the texture service only serves one
capability type: textures. Other services however can serve two types,
while on Avination - that currently only has one services for everything
- this really makes a difference because that single service now has
four queues.

More importantly however is that the administration of how many requests
are in the "pipeline" (from approving that a new HTTP request may be
added for given service, till curl finished it) is now per capability
type (or service/capabitity type pair actually). This means downloads of
a certain capability type (textures, inventory, mesh, other) will no
longer stall because unapproved requests cluttered the queue for a given
service.

Moreover, before when a request did finished, it would only look for a
new request in the queue of the service that just finished. This simple
algorithm worked when there were no 'PerSerice' objects, and only one
'Curl' queue: because if anything was queued that that was because there
were running requests, and when one of those running requests finished
it made sense to see if one of those queued requests could be added now.
However, after adding multiple queues, one for each service, it could
happen that service A had queued requests while only requests from
service B were actually running: only requests of B would ever finish
and the requests of A would be queued forever.

With this patch the algorithm is to look alternating first in the
texture request queue and then in the inventory request queue - or vice
versa, and if there are none of those, look for a request of a different
type. If also that cannot be found, look for a request in another
service. This is still not optimal and subject to change.
2013-05-21 23:34:23 +02:00
Lirusaito
619b6723ea French Translation update, Merci Selvone et Nomade! 2013-05-21 07:31:27 -04:00
Lirusaito
58eee7e88b Translation cleanups and xml fixes
Removes some areas where grid-specific currency was not being used.
Removes old, obsolete files.
2013-05-21 05:41:51 -04:00
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
Aleric Inglewood
74102e4964 Force running AIMeshUpload in the main thread.
I don't think it did -- but theoretically it could run in any thread
the way it was.
2013-05-17 15:07:45 +02:00
Aleric Inglewood
8688f6e772 Detect infinite loop. 2013-05-17 15:07:45 +02:00
Aleric Inglewood
ca66f44c0e Obscure bug fix. Not relevant in the current viewer code. 2013-05-17 15:07:32 +02: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