Commit Graph

4360 Commits

Author SHA1 Message Date
Siana Gearz
6fca791632 Fortify on release doesn't work and throws warnings on F18 2013-05-27 08:48:45 +02:00
Siana Gearz
7c675af943 Merge branch 'master' of https://github.com/MelanieT/SingularityViewer 2013-05-27 08:40:26 +02:00
Siana Gearz
074e6c135b Merge branch 'master' of https://github.com/Lirusaito/SingularityViewer 2013-05-27 08:37:39 +02:00
Siana Gearz
e9a323af9f Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer 2013-05-27 08:36:56 +02:00
Siana Gearz
8b085bd03d Matching movement rebuild code with V3 again 2013-05-27 08:35:07 +02:00
Siana Gearz
772f5e0e5d Somebody just won the prize for the least working contributed code.
Just made it compile and look like it does something sane, don't have time to test it at the moment.
2013-05-27 08:12:39 +02:00
Siana Gearz
62be5ae913 Merge branch 'v2URI' of https://github.com/Swiftkill/SingularityViewer 2013-05-27 06:48:51 +02:00
Siana Gearz
3cd16c84ef Dirty patch Intel HD4000 shader-confusion 2013-05-27 06:47:00 +02:00
Aleric Inglewood
b6f6dfbe99 Fix french assert.
Fixes a possible ASSERT(!(need_new_run && !mYieldEngine &&
sub_state_r->run_state == run_state)).

When over all multiplex_impl functions and this is the only case that I
found where it could return without changing the state and without
calling either idle() or yield().
2013-05-27 02:15:28 +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
Siana Gearz
c61415d785 Canonicalize detach crash fix to RLVa 2013-05-26 15:56:22 +02:00
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
Lirusaito
9b4748ae71 Fix deleting all scripts in selection
Two real changes: 1. Don't tell the user we're counting scripts when they just want them gone; 2. When deleting a script, counter-iterate to avoid a crash
Adds a bit more debug spew commented out, helped me out with this.

Thanks to Sentinel for catching this early!
2013-05-25 20:51:15 -04: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
Aleric Inglewood
a8880983c4 Fix WARNING: addData: Type mismatch in LLMsgVarData::addData for Set 2013-05-25 22:07:50 +02:00
Lirusaito
67c6864f5e Update to french translation, thanks Nomade. 2013-05-25 15:30:55 -04:00
Melanie
326008c553 Correct curreny display in "serverside is now viewerside" currency dialogs on OpenSim 2013-05-25 05:36:11 +02:00
Aleric Inglewood
b1be8802ca Fix URL to correct section for store creation. 2013-05-25 03:20:14 +02:00
Aleric Inglewood
3af2c13cd3 Compile fix for libcwd. 2013-05-25 03:19:33 +02:00
Lirusaito
1abd7f18f5 Tweak the increment and the minimum value of the draw distance slider on the graphics prefs panel to display the same values as seen on the quick prefs.
Thanks to Xanthe Yordstorm for pointing out this inconsistency!
2013-05-24 20:53:15 -04:00
Lirusaito
6cfaeeb37b Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Frosting 2013-05-24 17:30:54 -04: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
19996468c1 Correct a flipped bool 2013-05-23 17:37:19 -04:00
Lirusaito
0e8fed0dc5 Minor update to group roles panel from upstream
Don't add names that haven't been looked up yet to the group roles list, wait for them to be looked up, then check them against the filter.. this avoids unrelated names getting turned up in the list under a filter.
Also diverged a bit from upstream to filter using the displayed names, since people who are only having Display Name shown will get inconsistent names turned up by the filter, otherwise. (Searching "Inusaito Kanya" would turn up "Aur'a Færs" in the results, which obviously isn't what they're looking for... maybe this should be done with complete name, but logically you should see what you searched in your results)
2013-05-23 17:36:41 -04:00
Lirusaito
99ea3facce Just some touch-ups to the radar, they compile and won't affect anything, but they'll help in the future. 2013-05-23 14:28:11 -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
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