Leyla Farazha
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
Aimee Linden
ffae589843
Post-convert merge by convert_monolith.py from /Users/Aimee/Documents/Work/Linden-Lab/Development/viewer/convert/viewer-identity-evolution
2010-09-03 17:41:39 +01:00
Aimee Linden
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
Monroe Linden
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07:00
Tofu Linden
e416840f85
Backed out changeset c3d41f18ce2b
...
back-out the back-out for this branch. yay.
2010-08-24 19:22:00 +01:00
Tofu Linden
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
Tofu Linden
6ba23344c9
merge heads. whew.
2010-08-24 18:37:53 +01:00
Richard Nelson
02d8197019
changed buildPanel/buildFloater to member functions buildFromFile
...
streamlined LLUICtrlFactory's interface
2010-08-20 10:14:28 -07:00
Richard Nelson
c20bd2dfee
cleaned up LLUICtrlFactory...
...
removed redundant functionality
moved buildPanel to LLPanel
2010-08-16 15:00:51 -07:00
Oz Linden
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
Richard Nelson
60a313a687
speed up population of region scripts list
2010-08-06 11:02:37 -07:00
Richard Nelson
5062351a0a
deprecated ADD_SORTED due to n^2 behavior, set the sort order on the scroll list instead
2010-08-04 19:01:18 -07:00
Richard Nelson
566e3969f9
deprecated LLPanel::child*() methods
2010-07-30 10:02:30 -07:00
Leyla Farazha
33d1aa30ab
Merge from dessie/viewer-release
2010-07-06 17:51:07 -07:00
gabriel
86da02f7d2
=EXT-4655 fixed
2010-07-05 16:29:30 +01:00
James Cook
3e7f5e571e
Code comments/variable names to make clear when legacy names used
...
Reviewed with Leyla
2010-05-28 15:14:29 -07:00
James Cook
b944a47927
DEV-50013 Script memory floater uses usernames
2010-05-28 09:59:47 -07:00
James Cook
2b7153c26a
merge from dessie/viewer-public right before SLE code landed
2010-05-11 16:11:09 -07:00
James Cook
ecc2c72650
Merge latest viewer-hotfix, approximately equal to Viewer 2.0 final
2010-03-29 16:55:22 -07:00
Loren Shih
114e5ca083
EXT-5940 : Typedef all vector<LLUUID>'s
...
Superficial cleanup to change all typedef std::vector<LLUUID> to use a common typedef uuid_vec_t instead.
2010-03-29 16:33:35 -04:00
gabriel lee
3fa23202b3
EXT-4655 fixed a hanging listener on parcelinfo messages and fixed possible crash through spamming refresh of script limits floater
...
reviewed by Johnny
2010-03-16 17:58:06 +00:00
James Cook
18ebacefcf
Merge with viewer 2 beta 4
2010-03-08 10:54:23 -08:00
gabriel lee
def35926db
ext-4657 changed inappropriate llerrs to llwarns
...
reviewed by Lynx
2010-03-04 16:14:01 +00:00
James Cook
207c40de94
Fix script info for group-owned objects and stop requesting group name lookups for IDs that are actually avatars
2010-03-03 16:04:37 -08:00
James Cook
9dd7924b19
Merge
2010-02-11 10:09:23 -08:00
Tofu Linden
88785f06a8
CID-426
...
Checker: UNINIT_CTOR
Function: LLPanelScriptLimitsAttachment::LLPanelScriptLimitsAttachment()
File: /indra/newview/llfloaterscriptlimits.h
and some BOOL->boolification while I was there.
2010-02-10 17:02:41 +00:00
James Cook
88350edbcb
merge
2010-02-03 14:13:56 -08:00
gabriel lee
7c7bea0344
acted on code review advise, check some return pointers for nullness etc
2010-02-02 14:28:47 +00:00
James Cook
146e9d5e4d
Support returning full_name (and SLID) for LLCacheName::get() calls
...
Changed callback signature to full_name instead of first_name,last_name
Eliminated all calls to legacy (non-signal/non-boost-bind) lookup mechanism
Change Pay dialog names to SLURL links
Tweaked layout of Pay Resident and Pay via Object floaters to make SLURLs fit
Consolidate name first + " " + last concatenation in LLCacheName::buildFullName()
Reviewed with Kelly
2010-02-01 17:06:18 -08:00
gabriel lee
5dfdb0d5a4
DEV-44904 and other fixes
2010-02-01 16:12:47 +00:00
Ychebotarev ProductEngine
a402b2975f
fix for normal [BSI] About Land -> Script Information -> Divider between object owner and parcel location cannot be moved to resize fields
...
--HG--
branch : product-engine
2010-01-26 12:25:11 +02:00
gabriel lee
427fa33446
EXT-3630 & EXT-3893 added object owners to script information floater and corrected memory readout for attachments
...
reviewed by H
2010-01-08 17:09:59 +00:00
gabriel
e148eebff3
Added a first view script limits floater
...
reviewed by Mani
2009-12-19 01:57:42 +00:00