Commit Graph

15661 Commits (28b628ab7b92243a6e40fcdf87f4e2c5b44150e7)

Author SHA1 Message Date
Brad Payne (Vir Linden) 28b628ab7b allow run-time query of which timer function is being used 2010-12-29 10:03:33 -05:00
Brad Payne (Vir Linden) 261ac32dda merge 2010-12-20 17:14:51 -05:00
Brad Payne (Vir Linden) 4bd6edc6b0 SH-682 FIX, SH-594 FIX - removed mFMP wrapper, added thread checking. Moved onIdle functions to llcallbacklist. 2010-12-20 17:11:34 -05:00
Dave Parks e9d21ba941 Fix for windows build. Reviewed by Nyx. 2010-12-20 15:09:15 -06:00
Brad Payne (Vir Linden) 6a0e8fc13e thread safety checking 2010-12-20 13:52:48 -05:00
Nyx (Neal Orman) fa17e848a6 Automated merge with https://hg.secondlife.com/mesh-development 2010-12-17 16:19:15 -05:00
Nyx (Neal Orman) 089f9d6d37 merging in fix for CTS-323 / SH-464 2010-12-17 16:06:32 -05:00
Dave Parks ac7fad4cd0 SH-558 Fix for crash in physics shape display. 2010-12-17 14:58:39 -06:00
Dave Parks 4056ab8fbf SH-506 Remove (now obsolete) streaming cost info display. 2010-12-17 14:45:47 -06:00
Brad Payne (Vir Linden) 9a8dbb8520 SH-682 WIP: allow DEBUG_FAST_TIMER_THREADS to work when enabled 2010-12-17 14:13:07 -05:00
Loren Shih ee0055f5af Automated merge up from viewer-development 2010-12-16 11:12:15 -05:00
Seth ProductEngine 73962e2134 STORM-771 FIXED Pasting wearable items from clipboard to Current Outfit or an outfit folder now creates links to these items. 2010-12-16 00:50:03 +02:00
Brad Payne (Vir Linden) ad625861e1 SH-594 - added an extra redundant check for nameless nodes 2010-12-15 17:07:07 -05:00
Brad Payne (Vir Linden) 7926c54a0b SH-594 FIX: added check for nameless nodes 2010-12-15 16:58:35 -05:00
Oz Linden 33f745b237 pulling fixes back from viewer-beta 2010-12-15 10:12:49 -05:00
Kent Quirk cc345710d2 Merge 2010-12-15 09:18:22 -05:00
Vadim ProductEngine 10d9328b86 STORM-786 ADDITIONAL FIX Fixed Windows build. 2010-12-15 16:00:37 +02:00
Vadim ProductEngine 27f3470b7e STORM-786 FIXED Fixed disappearing controls in avatar picks list.
Caused by an improper fix of STORM-690.

Made the way we switch between profile view panels (profile view / pick_info / pick_edit)
more robust. It now suits both My Profile and Profile View panels.
2010-12-15 15:44:06 +02:00
Christian Goetze (CG) 4f798c40d8 Remove reference to then test codeticket service. 2010-12-14 15:32:32 -08:00
Brad Payne (Vir Linden) 3f79aad1df merge 2010-12-14 15:52:46 -05:00
Brad Payne (Vir Linden) 5f8110a68e SH-439 FIX: track name requested in UI separately, so we can fall back to name from dae if needed 2010-12-14 15:52:26 -05:00
Nyx (Neal Orman) ed25bfc431 BUILDFIX uninitialized variable
a potentially uninitialized variable is causing the linux build to fail.
Initializing the value to 0, as its our best guess for what it should
be, as davep is currently out sick.
2010-12-14 14:54:05 -05:00
Oz Linden 2027ce56a2 merge fix for storm-713 2010-12-14 14:47:44 -05:00
Oz Linden a0d3c7c0f8 merge fix for storm-401 2010-12-14 14:47:01 -05:00
Oz Linden 7c0c86774f merge fix for storm-229 2010-12-14 14:46:21 -05:00
Oz Linden 0b6c4d0f66 merge fix for storm-434 2010-12-14 14:45:25 -05:00
brad kittenbrink b159a961bd Merge CHOP-267 fixes with latest viewer-beta. 2010-12-14 11:45:06 -08:00
Oz Linden 3aa12e85f0 merge fix(es) for storm-378 2010-12-14 14:44:23 -05:00
Paul Guslisty a702b34394 STORM-352 FIXED Vertical scrollbar isn't reshaped in resident profile panel after decreasing panel height
- Set height of scroll container the same as bounding panel's height
2010-12-14 17:11:08 +02:00
Paul Guslisty ff38b75bbf STORM-434 FIXED Tooltips don't appear on Mini-Location bar.
- Added localized tooltips for icons and info button in LLPanelTopInfoBar
2010-12-14 17:04:22 +02:00
Paul Guslisty 29dc24a3ea STORM-713 FIXED XML/UI issues in llTextBox
- As the class LLToastNotifyPanel is deprecated, made the class LLToastScriptTextbox derived directly from LLToastPanel.

- Added callback for ignore button.

Now LLToastScriptTextbox has its own XML, therefore it's not needed to dynamically create toast panel.

Since LLToastNotifyPanel is deprecated all new notification toasts should be created this way.
2010-12-14 14:53:51 +02:00
Roxie Linden 4351160958 automated merge 2010-12-13 18:20:37 -08:00
Roxie Linden a22de1b72a Re-add convex hull for simple prims and sculpties,
as per Falcon's advice
2010-12-13 18:19:53 -08:00
Brad Payne (Vir Linden) 4a61efdee9 fixed bad line endings 2010-12-13 17:54:39 -05:00
Brad Payne (Vir Linden) 27f11d9868 merge 2010-12-13 17:51:14 -05:00
Merov Linden 1c48a4cf38 STORM-766 : pull into viewer-development 2010-12-13 14:37:34 -08:00
Merov Linden 8acb521a82 STORM-693 : pull into viewer-development 2010-12-13 14:36:34 -08:00
Merov Linden 1fb47692ff STORM-636 : pull into viewer-development 2010-12-13 14:35:10 -08:00
Merov Linden 9c2a55b6d7 STORM-622 : pull into viewer-development 2010-12-13 14:32:31 -08:00
Merov Linden 6748716a80 Pull viewer-beta in viewer-development 2010-12-13 14:30:45 -08:00
Merov Linden f556f58579 STORM-431 : pull into viewer-development 2010-12-13 14:27:43 -08:00
Merov Linden 7ce570e2c5 STORM-391 : pull into viewer-development 2010-12-13 14:26:36 -08:00
prep linden dd06d42c09 Commented out some unused variables that gcc complains about 2010-12-13 16:35:43 -05:00
Brad Payne (Vir Linden) fbab245e48 SH-646 FIX 2010-12-13 15:28:15 -05:00
Brad Payne (Vir Linden) b76c59a191 SH-653 FIX: upload button now starts out disabled 2010-12-13 13:27:24 -05:00
Loren Shih 52bdaebdbd SH-582 Order of the preview menu items in the same order as theLODs appear in the Import Model window
Reordered from highest to lowest.
2010-12-13 13:13:32 -05:00
Vadim ProductEngine 31d401e1c3 STORM-401 FIXED Add recepients of teleport offers to the recent people list. 2010-12-13 18:38:12 +02:00
Loren Shih 618249155a Automated merge up from viewer-development 2010-12-13 10:08:55 -05:00
Vadim ProductEngine 37cd8ad2a2 STORM-781 FIXED Added support for editing multiple scripts within inventory of the same object using external editor.
The bug was caused by using the object ID as temporary file name for editing script,
which of course didn't work for multiple scripts in the same object inventory.

The fix is to use MD5("object id" + "script inventory item id") for the file name.
2010-12-13 13:38:46 +02:00
Andrew Productengine d3eccbcd8b STORM-229 FIXED Fixed long loading times and stalling of Viewer while loading big scripts or pasting a lot of text into script.
The bug was fixed by Satomi Ahn. Here is the description of what causes the problem from her comment in ticket:
"Disabling the loading of syntax keywords in LLScriptEdCore::postBuild() removes the freeze (and with it: syntax highlighting).
So it obviously comes from the parsing of the text.

I also noticed something else: by adding a llwarn in LLTextEditor::updateSegments(), I saw that this function was called a lot of times when loading a script, roughly once for each line in the script (naively I would have thought only necessary to update when finished... or to only update the new line).
My llwarn was in the "if (mReflowIndex < S32_MAX && mKeywords.isLoaded())", which means that, at each call, the text is actually parsed for all keywords... so the parsing of the script becomes quadratic instead of linear!!!"

- To fix this, Satomi added a flag depending on which parsing is disabled when it is not necessary.
2010-12-13 13:17:48 +02:00