summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-04-06YET another hairy merge from viewer-trunk. Conflicts resolved... so far.Tofu Linden
2010-04-06un-hairy merge from viewer-trunkTofu Linden
2010-04-06sigghhhh, yet more conflict resolution from the viewer-trunk merge. ↵Tofu Linden
actually builds now. let's see if it runs and works.
2010-04-06yet more conflict fixing from viewer-trunk mergeTofu Linden
2010-04-06another conflict fix from viewer-trunk mergeTofu Linden
2010-04-06automated mergeLoren Shih
2010-04-06EXT-4151 : Immediately check if a fetchObserver filter is done, else add to ↵Loren Shih
observer list automatically Preliminary work to clean up naming conventions.
2010-04-06wtf-fix for using \\ instead of // as a comment.Tofu Linden
2010-04-06wtf-fix for using \\ instead of // as a comment.Tofu Linden
2010-04-06more fixing from the viewer-trunk mergeTofu Linden
2010-04-06some fixing from the viewer-trunk merge.Tofu Linden
2010-04-06another hairy merge from viewer-trunk :(Tofu Linden
2010-04-06merge from PE viewer-hotfixTofu Linden
2010-04-06mergeTofu Linden
2010-04-06Fixed normal bug EXT-6545 - Admin > God Tools > Object > Sim Name ↵Dmitry Zaporozhan
incorrectly reported. Using region name retrieval code. Fixed labels. Reviewed by Mike Antipov https://codereview.productengine.com/secondlife/r/125/ --HG-- branch : product-engine
2010-04-06Merge from default branchVadim Savchuk
--HG-- branch : product-engine
2010-04-06Fixed normal bug EXT-6464 (Buy pass from popup menu doesn't work).Andrew Dyukov
- The bug was caused by deselection of parcel(because of zero ref count to parcel selection) after appearance of alert with ok/cancel. Added setting pointer to this selection before notification appearance and nullifying pointer it after user chooses ok or cancel. Nullifying will always take place because alert is modal, so there is no chance that LLPanelLandGeneral::cbBuyPass() won't be called. Reviewed by Mike at https://codereview.productengine.com/secondlife/r/180/ --HG-- branch : product-engine
2010-04-06mergeYuri Chebotarev
--HG-- branch : product-engine
2010-04-05MergeLeyla Farazha
2010-04-05MergeEli Linden
2010-04-05ES fix unlocalized sidepanel titlesEli Linden
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup for LLInventoryFunctions. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Superficial header file cleanup. Change made to simulator files as well.
2010-04-05EXT-6703 : LLInventory.h cleanup and create new LLInventoryDefinesLoren Shih
Took out enums and flags from LLInventory into LLInventoryDefines Did a bunch of header file reformatting for LLInventory.h Change made to simulator files as well.
2010-04-05automated mergeLoren Shih
2010-04-02merge hotfix changes to releaseKent Quirk
2010-04-02EXT-5921 Inspector icon in nearby chat/IM doesn't match other inspector iconsLeyla Farazha
2010-04-02Updated Mac build of LLQtWebKit library.Monroe Linden
This was built from: revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision f35a5eab8c2f in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'cookie-api' branch)
2010-04-02Merge with tipCallum Prentice
2010-04-02DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of ↵Callum Prentice
LLQtWebKit/Windows)
2010-04-02EXT-6696 : Make Library inventory items somehow distinguishable at first ↵Loren Shih
glance from My Inventory items Library items are now set to Emphasis Color. This can be easily changed. Also fixed an issue where the "(Loading...)" string was overlapping with folder inventory strings.
2010-04-02EXT-6690 shorten PL translationEli Linden
2010-04-02DEV-47911: Backport webkit security fixes 2010-03-23 (via new version of ↵Callum Prentice
LLQtWebKit/Windows)
2010-04-02mergeTofu Linden
2010-04-02Updated Mac build of LLQtWebKit library.Monroe Linden
This was built from: revision c02879cea1c0070eb264e261d316a77d420741c7 in http://qt.gitorious.org/+lindenqt/qt/lindenqt (currently head of the 'lindenqt' branch) revision 8eff99f78fb0 in http://bitbucket.org/lindenlab/llqtwebkit/ (currently head of the 'default' branch)
2010-04-02Fix for EXT-6663 (TOS Screen logic for enabling agreement checkbox is ↵Monroe Linden
questionable) * remove the use of the start_url parameter, and instead store the loading url as a string in the xui, so that there's no chance of the loading screen page completing before we add our observer. * replace the "load complete count" with explicit state variables for whether the loading screen has completed and whether the site is alive * don't begin trying to load the real URL until both of the above conditions are met (and begin the load no matter which order they are satisfied in) Reviewed by Richard at http://codereview.lindenlab.com/1218007
2010-04-02First draft of skin weights in .mesh assetDave Parks
2010-04-02VWR-17709 en_xui_change to accommodate the longest translation in PL even ↵Eli Linden
though this is a bug reported for ES; undo JA old override
2010-04-02EXT-5940 : INFRASTRUCTURE: Typedef all vector<LLUUID>'sLoren Shih
Fixed some more typedefs that I missed in first checkin.
2010-04-02automated mergeLoren Shih
2010-04-02automated mergeLoren Shih
2010-04-02mergeBrad Payne (Vir Linden)
2010-04-02Fixed normal bug EXT-6348 (SLapp world map location does not display the ↵Eugene Mutavchi
correct region) - fixed displaying the world map location for escaped SLapp urls. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/173/. --HG-- branch : product-engine
2010-04-02mergeBrad Payne (Vir Linden)
2010-04-02Fixed normal bug EXT-6673 (Default sort order of Nerby People list should be ↵Eugene Mutavchi
by most recent speaker) - corrected the default setting for nearby people sort order. Reviewed by Vadim Savchuk, https://codereview.productengine.com/secondlife/r/175/. --HG-- branch : product-engine
2010-04-02Automated merge with ssh://hg.lindenlab.com/q/viewer-trunkXiaohong Bao
2010-04-02add some debug code for EXT-5394: Crash in ↵Xiaohong Bao
LLViewerMediaImpl::calculateInterest()
2010-04-02automated mergeLoren Shih
2010-04-02Partial fix for reopened EXT-6357 (SLapp for object chat does display an ↵Eugene Mutavchi
inspector) - changed the order of registering SLURLs so the LLUrlEntryObjectIM will be handled before LLUrlEntryPlace. Reviewed by Vadim Savchuk. --HG-- branch : product-engine
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-03 11:02:45 +0000