ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
207d9fd767
Viewer-chui merge
2013-03-11 14:45:53 -04:00
faae38daaa
Pull merge from lindenlab/viewer-developement
2013-01-30 20:01:03 -08:00
11fe124ae9
merging in viewer-beta.
...
Most of the merge was clean, a couple conflicts.
Brought over a couple patches manually for llpolymesh.
2013-01-24 16:22:49 -05:00
d840a60ecc
CHUI-373 : Fix : Refresh panel after setting parcel for sale
2012-10-18 21:49:02 -07:00
d67c295d8b
CHUI-305: Minor changes after code review. Using templated findChild() instead of getChildView(). Also using settings.xml to store common custom variables.
2012-08-30 16:20:27 -07:00
be61b5be2f
CHUI-305: Problem: The 'resident picker' had multiple parents and due to the design of the resident picker it can have only one parent. Having multiple parents caused both parents to fight for depth ordering...which caused the flickering. Resolution: Now multiple 'resident pickers' can exist and they are coupled to the floater that spawned then. Meaning that when the parent floater closes, the 'resident picker' floater will also close. In addition, a shadow frustum eminates from the button that opened the 'resident picker'.
2012-08-29 19:18:25 -07:00
64d9705ae2
Expanding region flags to 64 bits. Adding region protocol flags
2012-08-17 03:56:38 +00:00
1341d591e3
MAINT-269 FIXED Check if current agent is owner of the parcel before enabling "Buy pass"
2012-08-08 16:01:28 +03:00
83f5d0c616
Merge in viewer-development
2012-07-31 15:42:02 -07:00
173d0fa213
Pull in viewer-development because it's painful. Merge with runitai's help.
2012-07-11 16:15:23 -07:00
a96a260a4d
Merge simon/viewmaster-merge for latest maint work
2012-06-29 13:53:35 -07:00
0ee53b21d2
MAINT-30 Estate access lists for groups and residents are blank when "Allow public access" is checked.
...
MAINT-1200 Resident names not sorted in About Land (or Estate management) floater's allowed/banned boxes
reviewed with Simon
2012-06-25 13:41:53 -07:00
9e9d32de38
merge
2012-06-22 14:04:33 -05:00
99dc246ac8
Merge
2012-06-15 14:29:46 -05:00
d76715776b
MAINT-442: [PUBLIC]Unable to change parcel restrictions for a scripts-disabled
...
parcel in a damage-enabled region. Reviewed by Kelly
2012-06-14 17:03:32 -07:00
b8bc62a514
Pull and merge from ssh://hg@bitbucket.org/lindenlab/viewer-release.
2012-05-25 18:45:27 -07:00
e76d7d73c5
Removing cruft code that is no longer used.
2012-05-23 18:58:47 -07:00
890c583289
MAINT-119 FIXED (PUBLIC]no-transfer textures not searchable via texture picker)
...
- Implemented Richard's and Leo's spec
- Also fixed an issue when applying no-transfer texture for an object using texture picker, creates redundant copies of the texture in the object's content
2012-05-22 20:01:22 +03:00
47425d67fe
EXP-1882 FIXED Crashes when invoking avatar picker from mouse look mode.
...
Fixing the cases missed in EXP-1879.
2012-02-13 17:12:03 +02:00
4ef9277761
merge changes for vmrg-218
2012-01-24 16:22:23 -05:00
83138403ec
EXP-1768 FIXED (incomplete sentence for translation)
...
The whole sentence was split to two parts:
First pars was in panel.string and the second one in the text box. I combined them both in "allow_label5" text box and also I deleted unnecessary panel.string with the first part of the sentence.
2012-01-17 13:40:35 +02:00
7bc4085eb2
STORM-1788 Clarify wording in About Land->Access and tooltips (and similar Estate panel)
2012-01-10 12:03:20 -05:00
e926b33567
EXP-1544 FIX Remove 'Edit Terrain' from About Land floater
2011-11-11 16:12:33 -08:00
8b0d63f343
STORM-1105 "Traffic: 0" shown for two cases (traffic actually 0, and waiting for data)
2011-10-28 07:27:54 -04:00
c645e9e59e
STORM-1220 FIXED Localized sim product name (e.g. "Estate / Full Region") everywhere.
2011-07-25 17:34:06 +03:00
bef014ad2a
ER-910 cleanup: removed a stale comment, tweaked text in About Land dialog
...
Options tab.
2011-07-08 15:41:55 -07:00
f5bd2109c2
Revert code fo ER-1016 - "Remove ability for anyone to edit terrain"
...
and muck with the "About Land" Options tab one more time.
2011-07-07 17:42:54 -07:00
918238dd18
ER-1016 - "Remove ability for anyone to edit terrain" and ER-910 "Parcel
...
Privacy" changes. Many naming changes for the featureto be "See avatars"
instead of "hidden avatars". Also removed the "anyone can edit terrain"
checkbox and slammed the value to FALSE.
2011-07-01 14:06:08 -07:00
c0c0a2b9a5
ER-944: Add feature to control user sounds on a parcel. Added new checkboxes
...
to the About Land / Sound tab. Reviewed by Kelly.
2011-06-20 09:28:10 -07:00
5039378869
ER-910: Parcel Privacy. Rename things in code to reflect feature name change to "hidden avatars"
2011-06-09 13:46:19 -07:00
1a5b3b0a90
ER-914: Disable Parcel Privacy UI in viewer if on older sim
2011-05-24 10:44:27 -07:00
8a6965a3f9
Merge latest from lindenlab/viewer-development
2011-05-13 13:58:40 -07:00
dbc92691a6
Work in progress on CHOP-609 / CHOP-624 build time improvements. Eliminated a bunch of unnecesary header dependencies.
2011-05-05 17:13:52 -07:00
9bfae21706
ER-858: Add viewer checkbox to toggle parcel privacy settings. Reviewed by Kelly
2011-05-02 16:35:55 -07:00
e0ca936fbf
STORM-1072 FIXED [TRANSLATED BUT IN EN] in "Monde" > "Profil du lieu" > "À propos des terrains" > "Réglement" : "Estate / Full Region" is in english.
...
- Linked region_type string value with translation in strings.xml. If translation for region_type string is absent set unlocalized version (not MissingString text as usual)
2011-03-29 13:57:24 +03:00
d3422c8d9e
Merge
2010-10-12 15:52:03 -07:00
a4b223248e
Merge
2010-09-27 17:54:52 -07:00
62a46df736
STORM-269 FIXED Added strings for missing land types in strings.xml
...
If localized land type name is not found it is displayed as original string to avoid MissingString error.
2010-09-29 21:44:30 +03:00
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
0a74d15935
Merge between james/viewer-identity-evolution and dessie/viewer-public
2010-09-03 15:30:16 +01:00
b62b10dd26
Post-convert merge by convert_monolith.py from ./viewer-experience
2010-08-27 16:58:33 -07: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
124bc854dd
moved buildFloater out of lluictrlfactory to llfloater.cpp
2010-08-16 17:44:23 -07:00
06b0d72efa
Change license from GPL to LGPL (version 2.1)
2010-08-13 07:24:57 -04:00
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
854e6acb42
Merge with dessie/viewer-release
2010-07-30 18:07:35 -07:00
Oz Linden