summaryrefslogtreecommitdiff
path: root/indra/newview
AgeCommit message (Collapse)Author
2009-11-12merging put on submenu fix with avatar-pipelineNyx (Neal Orman)
2009-11-12EXT-2354 menus contain multiple lines not editable in XUINyx (Neal Orman)
We're building a pie menu in code, complete with separators for this particular branch of submenus. This is terrible and ugly and needs to be killed, but for now I removed the lines that cause the separators to be added where there are empty pie slices. Code reviewed by Vir
2009-11-12merge latest batch of stuff from viewer2voiceparityTofu Linden
2009-11-12mergeLoren Shih
2009-11-12Rename LLInventoryObservers to LLInventoryObserverLoren Shih
2009-11-12mergeLoren Shih
2009-11-12Extracted LLInventoryObserver classes from LLInventoryModel.h into their own ↵Loren Shih
subclass, LLInventoryObservers.h. This reduces dependencies and compile times, and makes these classes easier to locate. I have not yet refactored classes to remove #include "llinventorymodel.h" and replace with #include "llinventoryobservers.h". This will happen later.
2009-11-12merge.Tofu Linden
2009-11-12mergeMark Palange (Mani)
2009-11-12DEV-42715 Fixed lllogin SRV request timeout unit test.Mark Palange (Mani)
Also made SRV config options not persistent. reviewed by brad
2009-11-12mergeJames Cook
2009-11-12mergeJames Cook
2009-11-12Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-12fix silly error that was nerfing the outgoing call dialog.Tofu Linden
more work towards a decent DEV-42312 and DEV-42313
2009-11-12add Cancel button to outgoing call dialog, make it work (perhaps), make the ↵Tofu Linden
name of the departing voice session more accurate (perhaps). WIP.
2009-11-12Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-12mergeLoren Shih
2009-11-12more inching towards outgoing call popup goodness...Tofu Linden
2009-11-12more work on the outgoing call popup...Tofu Linden
2009-11-12more mimicking of the good parts of the incoming_floater!Tofu Linden
2009-11-12mergeLynx Linden
2009-11-12DEV-2925: Remove a null char at the end of the location string.Lynx Linden
2009-11-12DEV-2925: Remove support for secondlife:///app/objectim URLs.Lynx Linden
These are no longer generated in Viewer 2.0 (instead we use notifications to send object IMs to the user), so there's no need to look for them in every textbox. Users can get details on any objects spamming them via the new remote object inspector.
2009-11-12DEV-2925: Added a new remote object inspector.Lynx Linden
This is used to display details about objects that may not be in the current scene (the existing object inspector is tied to selection and only works for objects in the scene). The remote inspector lets you see the name and owner of the object. You can also teleport to the object's location, view the location on the map, or mute the object. I've also added more information to the notification you receive when an object sends you an IM via llInstantMessage(). This notification now has an "Inspect" button that brings up the remote object inspector.
2009-11-12reacreate floater_outgoing_call in the new style of floater_incoming_call.Tofu Linden
2009-11-12merge.Tofu Linden
2009-11-12Automated merge with ssh://hg.lindenlab.com/moss/viewer2voiceparity/Lynx Linden
2009-11-12DEV-41324: Updated the Incoming Call floater.Lynx Linden
This is now a dockable floater with a dock tongue. It currently floats over the sys well, where other system messages appear. The appearance now matches the voice spec more closely. It also tells you which voice channel you would be leaving if you accept the call.
2009-11-12mergeSteve Bennetts
2009-11-12Better fix for edge case where abort call to readComplete() can cause a crash.Steve Bennetts
2009-11-11Fix for DEV-42720 - media settings floater is Emptycallum
2009-11-11mergeLoren Shih
2009-11-11Took out unnecessary llinfos msg from LLInventoryModel.Loren Shih
2009-11-11EXT-387 : Clean up WARNINGS - Advanced.DumpAvatarLocalTexturesLoren Shih
Added menu callbacks in for avatar texture debug, but disabled functionality for release version.
2009-11-11Fix merge error (and hence build breakage :( )Rick Pasetto
2009-11-11Automated merge with ssh://rick@hg.lindenlab.com/viewer/viewer-2-0/Rick Pasetto
2009-11-11EXT-2261 : Inventory view should show default foldres (i.e. expand My Inventory)Loren Shih
2009-11-11Fix a potential crash if scroll button is not thereRick Pasetto
2009-11-11Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/Brad Payne (Vir Linden)
2009-11-11Remove references to media_panel_scroll in ↵Monroe Linden
LLPanelPrimMediaControls::updateShape(), as it was removed from the XUI file.
2009-11-11Changing VC Debugger working directory to be ${CMAKE_CURRENT_SOURCE_DIR} to ↵brad kittenbrink
restore ability to edit in place xui files, shaders, etc.
2009-11-11Believe this fixes the remaining issues with missing attachment links on ↵Brad Payne (Vir Linden)
first use of 2.0 - EXT-1593 and EXT-1591.
2009-11-11EXT-2377 : Add XML switch to showing either menubar or gear menuLoren Shih
Reverting previous checkin for enabling this. This is more complicated than worth spending time on, at the moment.
2009-11-11Fix bad XML causing UI images not to load.James Cook
2009-11-11Merge from product-engineSteve Bennetts
2009-11-11DEV-41358: Changed format of preferred maturity for search.Lynx Linden
Now preferred maturity is passed to the search web pages as an r={13|21|42} query param.
2009-11-11merge: pulling changes from trunkNyx (Neal Orman)
2009-11-11Changes to fix an LLERRS caused by SRV request timeout.Mark Palange (Mani)
Added settings to config SRV request params Increased timeout to 10 seconds Changed timeout to generate login failure event instead of an error. Added unit test to cover SRV failure event.
2009-11-11fixing build - last commit had bad call to startAppearanceAnimationNyx (Neal Orman)
function definition of startAppearanceAnimation chagned - last patch missed eliminating the parameters at line 6594 in llvoavatar.cpp. This patch fixes the issue, confirmed builds and runs locally.
2009-11-11Fixed typo.Justin C. Rounds (Chuck)
http://jira.secondlife.com/browse/EXT-2359