Commit Graph

4403 Commits

Author SHA1 Message Date
Aleric Inglewood
98badb94da Add AIHTTPView, a HTTP Debug Console - press Ctrl-Shift-7 2013-06-01 16:14:32 +02:00
Aleric Inglewood
5c05a04a2c Fix of 'LLError::NoClassInfo::~AIFilePicker: Calling AIFilePicker::~AIFilePicker()' 2013-06-01 13:32:55 +02:00
Aleric Inglewood
98eecb319a Merge remote-tracking branch 'singu/master' 2013-05-31 20:02:50 +02:00
Aleric Inglewood
34e0398ddf Fix of issue 855 #12 second image.
This should fix 'Received 302 (Moved Temporarily) for responder
"AgentStateResponder" which has no followRedir().

Some responders want to deal with redirections themselves, I checked if
this (new, pathfinder related) responder wants that in viewer-release,
but it doesn't. Turning this on requires to also keep track of cookies,
so it's a bit slower and therefore left at the old default: to not let
curl follow redirections. Optionally we would turn it on by default and
explicitely off for those responders that want to deal with 302's
themselves and for those that really don't need it and are used most
heavily.
2013-05-31 19:52:23 +02:00
Siana Gearz
06c286a8a8 Merge commit '6ef3ba4e113a4f87440f0ad3cafb348383c61504' 2013-05-31 11:07:51 +02:00
Siana Gearz
746f1236d5 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-05-31 10:54:31 +02:00
Siana Gearz
9b31bd9ad6 Fix inventory move logic 2013-05-31 10:54:17 +02:00
Aleric Inglewood
dc265ff9a1 Attempt to fix issue 848
https://code.google.com/p/singularity-viewer/issues/detail?id=848

If advance_state is called, then the state is NOT changed (only
sub_state_w->advance_state is set), but sub_state_w->skip_idle is set to
true in order to ignore the next call to idle (if the state machine is
already in the middle of executing a state). Therefore, this assert
would trigger. The solution is to not trigger when skip_idle is set.
2013-05-29 02:37:48 +02:00
Lirusaito
6ef3ba4e11 Definitely avoid IMs never opening from friends list, and attempt to look up friend names we don't have to prevent this "waiting" chat session problem.
The const LLRelationship* info was likely null at times, or names weren't looked up, we just failed silently and played the start IM sound as though nothing had happened, this won't happen anymore.
2013-05-28 17:38:58 -04:00
Aleric Inglewood
48677d348f Fix issue 679
https://code.google.com/p/singularity-viewer/issues/detail?id=679

Instead of making the cursor just always an arrow, I changed the
'working' cursor from a watch to an arrow + hour glass. Note that the
BMP of the 'wait' cursor was exactly the same as the 'working' cursor,
so if anywhere 'working' should NOT have an arrow, then that should be
replaced with the UI_CURSOR_WAIT to restore the old cursor.

Obviously, the blinking is fixed too - cause that is what this all was
about.
2013-05-28 03:59:35 +02:00
Siana Gearz
1734370682 Merge branch 'master' of https://github.com/lkalif/SingularityViewer 2013-05-28 03:31:52 +02:00
Siana Gearz
dd82997076 Merge branch 'UICleanup' of https://github.com/Shyotl/SingularityViewer 2013-05-28 03:30:50 +02:00
Siana Gearz
0f90991533 OS X build fix 2013-05-28 03:24:12 +02:00
Shyotl
641ada030e Didn't actually want to commit the latter ui-scale related change, but rebasing is too annoying, so revert. 2013-05-27 19:23:36 -05:00
Shyotl
ba9c8f3d6d Merge branch 'master' into UICleanup 2013-05-27 19:19:38 -05:00
Shyotl
d5e1a0dd4b Unbreak ui scaling. 2013-05-27 19:18:47 -05:00
Shyotl
00269e8358 Unbork ui scaling. 2013-05-27 19:18:11 -05:00
Latif Khalifa
fc80adaf7a Remove duplicates in the list of files passed to NSIS 2013-05-28 01:42:38 +02:00
Lirusaito
ee1f1cdde2 Use isNull instead of checking equal to LLUUID::null in hbfloatergrouptitles 2013-05-27 08:11:09 -04:00
Lirusaito
6b83dd5210 LLPanelDebug isn't doing anything, it goes poof. 2013-05-27 08:10:12 -04:00
Lirusaito
4eae554812 Merge branch 'UICleanup' of git://github.com/Shyotl/SingularityViewer
Conflicts:
	indra/llappearance/llwearable.h
	indra/llui/llcombobox.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llpanelgrouproles.cpp
	indra/newview/llpanelgrouproles.h
	indra/newview/llviewermenu.cpp - Plugged in new MenuFloaterDict for AssetBlacklist and SoundExplorer in menu_viewer.xml and removed the old listeners for them.
	indra/newview/skins/default/xui/es/floater_inventory.xml
Compile Fixes:
	indra/llcommon/llstl.h - error: expected nested-name-specifier before ‘const’
	indra/llui/llmultisliderctrl.cpp:283:12: error: ‘caller’ was not declared in this scope
	indra/llui/lltexteditor.cpp
		- error: operands to ?: have different types ‘const LLPointer<LLTextSegment>’ and ‘long int’
		- error: passing ‘const LLPointer<LLTextSegment>’ as ‘this’ argument of ‘LLPointer<Type>& LLPointer<Type>::operator=(const LLPointer<Type>&) [with Type = LLTextSegment]’ discards qualifiers
	indra/newview/llfloaterpermissionsmgr.cpp - Silly Shyotl, boost bind, not std bind.
	indra/newview/llfloaterproperties.* - error: ‘LLInstanceTracker<LLFloaterProperties, LLUUID>’ is an inaccessible base of ‘LLFloaterProperties’
	indra/newview/llgivemoney.cpp - Again, boost::ref, not std::ref
	indra/newview/llpreviewscript.cpp - no known conversion for argument 1 from ‘std::vector<const LLPointer<LLTextSegment> >’ to ‘std::vector<LLPointer<LLTextSegment> >&
2013-05-27 08:09:28 -04:00
Lirusaito
a10708e9be Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer 2013-05-27 04:07:38 -04:00
Lirusaito
8769b98b31 Add Bottom offset spinner to the Chat Console section of Text Chat prefs, thanks Ratany! 2013-05-27 03:08:09 -04:00
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