1abfd822e5
merge fix for storm-776
2010-12-16 14:55:01 -05:00
abda07fb77
STORM-796 FIXED Implemented rendering /app/region/ SLapps into human-readable strings.
...
Example: secondlife:///app/region/Ahern/10/20/30/ is displayed as "Ahern (10,20,30)".
2010-12-16 20:22:32 +02:00
ee0055f5af
Automated merge up from viewer-development
2010-12-16 11:12:15 -05:00
317f5ecf93
STORM-529 FIXED Added Undo/Redo items to the Build menu.
2010-12-16 14:59:10 +02:00
71fa089498
STORM-151 : Suppress unused code, clean up code formating, fix typos
2010-12-15 20:54:25 -08:00
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
ad625861e1
SH-594 - added an extra redundant check for nameless nodes
2010-12-15 17:07:07 -05:00
7926c54a0b
SH-594 FIX: added check for nameless nodes
2010-12-15 16:58:35 -05:00
aa56f78dd2
STORM-453 : Points to the 7.21 curl libs, fixes curl cmake, fixes mac_updater build
2010-12-15 13:36:06 -08:00
de8fa40209
ESC-235 Truncation of over-sized metrics reports wasn't working.
...
Legacy of the LLSD::Map-to-LLSD::Array conversion, this ended up
performing an erase on the array rather than the map taking out
all the regions. So, there *was* a metrics report, it was just empty
of regions. Fixed and scanned for more array/map problems and
corrected the data type for duration sorts (should have been Real).
2010-12-15 15:50:09 -05:00
b854cde9a0
STORM-800 FIXED Crash in LLRemoteParcelInfoProcessor::processParcelInfoReply()
2010-12-15 20:02:53 +01:00
0f1d337a1e
STORM-799 FIXED Crash in LLVivoxVoiceClient::notifyStatusObservers()
2010-12-15 20:40:47 +01:00
33f745b237
pulling fixes back from viewer-beta
2010-12-15 10:12:49 -05:00
bd53ba004a
STORM-776 : unable to change permissions to "no trans" on item in avatar inventory
...
applied Kitty's code changes listed in STROM-288 as it is a related issue and this
actualy fixed both issues!
2010-12-15 09:53:24 -05:00
cc345710d2
Merge
2010-12-15 09:18:22 -05:00
10d9328b86
STORM-786 ADDITIONAL FIX Fixed Windows build.
2010-12-15 16:00:37 +02:00
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
4f798c40d8
Remove reference to then test codeticket service.
2010-12-14 15:32:32 -08:00
3f79aad1df
merge
2010-12-14 15:52:46 -05:00
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
91021bf905
VWR-24263: Crash fix for notecards with negative text length
2010-12-14 12:30:32 -08:00
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
2027ce56a2
merge fix for storm-713
2010-12-14 14:47:44 -05:00
a0d3c7c0f8
merge fix for storm-401
2010-12-14 14:47:01 -05:00
7c0c86774f
merge fix for storm-229
2010-12-14 14:46:21 -05:00
0b6c4d0f66
merge fix for storm-434
2010-12-14 14:45:25 -05:00
b159a961bd
Merge CHOP-267 fixes with latest viewer-beta.
2010-12-14 11:45:06 -08:00
3aa12e85f0
merge fix(es) for storm-378
2010-12-14 14:44:23 -05:00
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
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
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
4351160958
automated merge
2010-12-13 18:20:37 -08:00
a22de1b72a
Re-add convex hull for simple prims and sculpties,
...
as per Falcon's advice
2010-12-13 18:19:53 -08:00
4a61efdee9
fixed bad line endings
2010-12-13 17:54:39 -05:00
27f11d9868
merge
2010-12-13 17:51:14 -05:00
1c48a4cf38
STORM-766 : pull into viewer-development
2010-12-13 14:37:34 -08:00
8acb521a82
STORM-693 : pull into viewer-development
2010-12-13 14:36:34 -08:00
1fb47692ff
STORM-636 : pull into viewer-development
2010-12-13 14:35:10 -08:00
9c2a55b6d7
STORM-622 : pull into viewer-development
2010-12-13 14:32:31 -08:00
6748716a80
Pull viewer-beta in viewer-development
2010-12-13 14:30:45 -08:00
f556f58579
STORM-431 : pull into viewer-development
2010-12-13 14:27:43 -08:00
7ce570e2c5
STORM-391 : pull into viewer-development
2010-12-13 14:26:36 -08:00
dd06d42c09
Commented out some unused variables that gcc complains about
2010-12-13 16:35:43 -05:00
fbab245e48
SH-646 FIX
2010-12-13 15:28:15 -05:00
b76c59a191
SH-653 FIX: upload button now starts out disabled
2010-12-13 13:27:24 -05:00
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
aa21243085
Merge from viewer-beta
2010-12-13 09:51:15 -08:00
31d401e1c3
STORM-401 FIXED Add recepients of teleport offers to the recent people list.
2010-12-13 18:38:12 +02:00
622c9f772c
Cleanup a cross-thread command dtor. It was technically
...
correct but looked a bit dodgy with pointer ownership.
2010-12-13 11:17:41 -05:00
618249155a
Automated merge up from viewer-development
2010-12-13 10:08:55 -05:00
Oz Linden