93696ac019
merge
2011-05-12 17:39:08 -05:00
37ef2c4f0f
EXP-670 Voice for basic mode
...
reviewed by Merov
http://codereview.lindenlab.com/6231263/
2011-04-27 16:45:33 -07:00
5f99331f4a
Automated merge up from viewer-development
2010-12-29 13:23:02 -05:00
b512865746
added open advanced floater link
2010-12-22 16:50:03 -08:00
db1af2445d
Initial code for the upload model wizard - loading model is working, not much else
2010-12-09 17:30:17 -08:00
598450785b
merge
2010-12-02 14:51:16 -08:00
522bcf17b7
SOCIAL-311 PARTIAL FIX Media browser has too many oddities to be useful for viewer web apps
2010-11-30 20:52:30 -08:00
f940b49d0f
Merge with andrew
2010-10-21 15:56:13 -07:00
7687653871
Automated merge up from viewer-development
2010-10-20 12:18:33 -04:00
a5619d16f7
correct licenses (fix problem with license change merge)
2010-10-13 07:24:37 -04:00
92a8d93b0d
Another merge from http://hg.secondlife.com/viewer-development
2010-10-11 10:40:05 -07:00
7ffc9b06c8
Created a floater for setting display name
2010-10-08 16:56:02 -07:00
60f8c82790
Merge
2010-09-30 12:00:29 -07:00
613894c8cc
SH-238 Add check boxes to upload skin weights (or not) and/or joint positions (or not).
...
Remove llfloaterimportcollada
Reviewed by Prep.
2010-09-28 13:45:42 -05:00
7c2b9221d6
merge
2010-09-27 15:20:27 -05:00
569f3f4b06
Merge
2010-09-22 13:04:53 -07:00
cf09d6c58a
Remove LL_MESH_ENABLED macros (fixes drag and drop). Add mesh stitching type back into tools floater.
2010-09-22 03:04:21 -05:00
90e3d83a5c
Fix for build failures - disabling tcmalloc for now
2010-09-21 13:26:52 -04:00
ac500df89e
Post-convert merge by convert_monolith.py from http://hg.lindenlab.com/brad/viewer-simconsole
2010-09-10 15:39:20 -07:00
244aa5db98
VWR-22891 FIXED Fixed inability to share an item while My Inventory SP is undocked.
...
All detached side tray tabs are now wrapped with LLFloaterSideTrayTab that adds them as exceptions to LLTransientFloaterMgr,
i.e. as views clicking on which doesn't hide transient floaters.
2010-09-08 21:23:22 +03:00
ae81cf5dc4
STORM-122 FIXED Clean up obsolete floaters and related dead code
...
Removed obsolete XUI files:
floater_activeim.xml
floater_customize.xml
floater_device_settings.xml
floater_first_time_tip.xml
floater_im.xml
floater_my_friends.xml
floater_outfit_save_as.xml
floater_preview_classified.xml
floater_preview_event.xml
floater_preview_gesture_info.xml
floater_preview_gesture_shortcut.xml
floater_preview_gesture_steps.xml
floater_statistics.xml
floater_wearable_save_as.xml
panel_audio_device.xml
panel_friends.xml
panel_groups.xml
panel_nearby_chat.xml
panel_online_status.xml
panel_region_general_layout.xml
Killed obsolete LLFloaterVoiceDeviceSettings class, and moved LLPanelVoiceDeviceSettings into its own appropriately named files.
2010-09-16 17:51:27 +01:00
5dc2f9c5fe
VWR-20696, VWR-20697 WIP Added undocking/redocking tabs from Side Tray.
...
Reviewed by Vadim Savchuk at https://codereview.productengine.com/secondlife/r/877/ .
2010-08-26 21:42:40 +03:00
2f012dd34f
merge
2010-08-25 14:48:18 -05:00
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
98cc236503
Backed out changeset a62bf7c0af21
...
Backing out this merge that I pushed (prematurely) to the wrong place.
2010-08-24 18:44:39 +01:00
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
816cf7db82
Adding a simple region debug console.
2010-07-29 19:49:13 -07:00
19d1d57a65
Adding a simple region debug console.
2010-07-29 19:49:13 -07:00
cc90425fed
Bury the dead code day: Removed LLFloaterParcelInfo, LLFloaterURLDisplay and LLPanelPlace
...
Moved LLParcelHandler from now defunct llfloaterparcel.cpp to llpanelplaces.cpp
2010-07-19 13:23:19 +01:00
e48e1e32d8
Bury the dead code day: Removed LLFloaterParcelInfo, LLFloaterURLDisplay and LLPanelPlace
...
Moved LLParcelHandler from now defunct llfloaterparcel.cpp to llpanelplaces.cpp
2010-07-19 13:23:19 +01:00
f9b13d8f85
Add "LL_MESH_ENABLED" preprocessor flag for toggling mesh code. Couple of merge fixes.
2010-06-10 00:45:48 -05:00
c2da9f5d2c
Merge with viewer-experimental
2010-06-08 23:13:05 -05:00
f461ae214c
Merge with render-pipeline
2010-06-07 23:05:22 -05:00
6bcac50f64
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
2010-05-24 11:00:03 +01:00
d84990307b
VI-65 - Addition of Quick/Eazy Buy Web based floater.
...
Switched off by default for now until Web content ready - turn on with Debug Settings - 'QuickBuyCurrency'
Reviewed by Sam/Richard
2010-05-21 15:22:32 -07:00
24c55c9a68
EXT-7337 WIP Implemented prototype voice font preview floater.
2010-05-18 14:16:25 +01:00
168ef83bcf
slightly hairy merge from viewer-trunk
2010-04-14 10:18:13 +01:00
3a5ae14b85
Completed normal subtask EXT-6621 (Code cleanup: Remove unused LLFloaterActiveSpeakers and related classes from viewer)
...
* Removed llfloateractivespeacker.h/cpp from CMakeLists.txt and from the repo.
* Removed llmediaremotectrl.h/cpp, llvoiceremotectrl.h/cpp from the repo (were not in CMakeLists.txt).
* Unused in 2.0 setings ("ShowVoiceChannelPopup" & "ShowVolumeSettingsPopup") are moved to the end of settings.xml (to not affect 1.23 if remove).
* Removed xml files related to Active Speakers floater and old Communication floater (related cpp files have been already removed). Also removed their localized versions.
* Also removed old textures related to removed xml and unused in 2.0 anymore.
Reviewed by Vadim at https://codereview.productengine.com/secondlife/r/226/
--HG--
branch : product-engine
2010-04-13 18:26:36 +03:00
b27ce5bc88
merge from viewer-2-0
2010-03-05 11:16:34 +00:00
997e91f08e
Fixed major bug EXT-5943 - Classifieds are Published and charged as soon as you hit Save.
...
Added Publish Classified floater to confirm classified creashion and publishing.
--HG--
branch : product-engine
2010-03-04 16:05:04 +02:00
2398ac98d0
merge from viewer2.
2010-02-17 13:50:26 +00:00
4dfed6e353
Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0
2010-02-16 15:43:11 -08:00
f0062fa41a
merge from viewer2. this fucks up davep's optimizations, so I'll backout their backout next to restore them. I hope. Sheesh.
2010-02-13 12:46:14 +00:00
6c5b984bf6
converted llfloaternearbymedia to llpanelnearbymedia
...
moved from LLTransientDockableFloater model to popup panel model like volume popup
2010-02-11 18:06:25 -08:00
de1cf42eb6
EXT-5044 substasks: turning the event panel into an event floater.
...
reviewed by Richard.
2010-02-11 12:41:10 -08:00
a171848fd4
merge from viewer2.
2010-02-03 16:08:44 +00:00
6ebbc5edf6
fixed EXT-4764 “Forbid connecting to different voice channels at once”,
...
removed redundant call status notifications: ringing, connected, hang_up,
unavailable, answering;
--HG--
branch : product-engine
2010-02-03 16:15:34 +02:00
e2612effbe
merge from viewer2
2010-01-29 12:09:37 -08:00
f8bde94b9f
completely got rid of Communicate floater and stuff
...
--HG--
branch : product-engine
2010-01-29 15:41:41 +02:00
Dave Parks