44a934ef2a
silly change to trigger a rebuild in Team City
2012-08-20 11:24:18 -07:00
3e05f169d6
Minor change required for merge from viewer-development
2012-08-17 09:04:16 -07:00
efdcf045b0
Merged in from viewer-development.
2012-08-17 08:07:15 -07:00
56298eed3d
Reverting Sabin's change to build system that we used during testing
2012-08-16 15:49:14 -07:00
48a964e5dd
Silly Python 'string' fix
2012-08-16 11:48:51 -07:00
ed92d45a5a
Silly Python 'string' fix
2012-08-16 11:12:21 -07:00
f94a296673
Silly typo fix
2012-08-16 10:11:42 -07:00
d400bc2a3f
Add explicit reference to keychain to use
2012-08-15 20:04:10 -07:00
7204593ec3
merge back beta fixes
2012-08-15 22:38:07 -04:00
f586a441ca
silly typo - change language from dutch to english :)
2012-08-15 19:18:52 -07:00
75a3183ad7
merge changes for DRTVWR-198
2012-08-15 20:13:00 -04:00
d7017add55
tag merge of DRTVWR-198
2012-08-15 20:12:39 -04:00
b9e43dfd64
merge back beta fixes
2012-08-15 20:09:41 -04:00
811c466c6b
Changed name of keychain to match setup instructions
2012-08-15 15:51:41 -07:00
f11ba76522
tag merge of DRTVWR-196
2012-08-15 18:04:51 -04:00
97106c2dea
merge changes for DRTVWR-194
2012-08-15 17:07:10 -04:00
f2eef65206
tag merge of DRTVWR-194
2012-08-15 17:06:48 -04:00
981190cf31
merge back beta fixes
2012-08-14 18:41:25 -04:00
f4fb073ae0
open-146: correct licenses in llphysicsextensions stub
2012-08-14 18:30:11 -04:00
c2e2a49d9b
merge changes for DRTVWR-193
2012-08-14 17:26:24 -04:00
9a4a6163ff
tag merge of DRTVWR-193
2012-08-14 17:26:07 -04:00
3e3e695341
merge back beta fixes
2012-08-14 16:04:22 -04:00
ee3137b0ef
merge changes for DRTVWR-195
2012-08-14 14:38:52 -04:00
898b0fe213
tag merge of DRTVWR-195
2012-08-14 14:38:39 -04:00
3bed396675
merge changes for DRTVWR-191
2012-08-14 13:29:01 -04:00
96f8dddba9
tag merge of DRTVWR-191
2012-08-14 13:28:43 -04:00
1e0470ac56
correct merge error
2012-08-14 12:41:48 -04:00
b50f23b899
merge back beta fixes
2012-08-14 09:02:43 -04:00
24c1b62e27
merge back beta fixes
2012-08-14 09:01:56 -04:00
9f6503a1fc
merge changes for DRTVWR-192
2012-08-14 08:50:23 -04:00
f72c1d64c2
tag merge of DRTVWR-192
2012-08-14 08:50:06 -04:00
1b639c33c5
VWR-29358 : Fix auto scroll to selection when the filter is active
2012-08-10 15:35:48 -07:00
2c2167229e
merge changes for DRTVWR-190
2012-08-10 08:08:55 -07:00
b53481354d
tag merge of DRTVWR-190
2012-08-10 08:08:25 -07:00
c63dea6b91
MAINT-1197 : Fix inventory deselection/reselection when cutting items
2012-08-09 16:26:37 -07:00
5f1230e911
MAINT-1342: correct initial login location handling, clarify the two related persistent settings
2012-08-09 11:52:48 -07:00
b9e650a3a1
MAINT-113 Fix for flashing property lines when selecting objects.
2012-08-09 11:47:14 -07:00
559b39c5d1
Automated merge with http://hg.secondlife.com/viewer-development
2012-08-08 18:27:52 -04:00
75caf0c916
More optional signing stuff for 10.5
2012-08-08 14:56:51 -07:00
2d0e911256
Add implementation comments to LLHandle.
...
I recently tried to wade through llhandle.h and got somewhat perplexed. Armed
with an explanation from Richard, I've added notes to the file to try to make
it a bit less mysterious.
2012-08-08 14:57:49 -04:00
6f1be0007b
Pulled merge, changed . to , in viewer-manifest
2012-08-08 11:36:10 -07:00
3e9c9993e3
More optional config for 10.5 builds
2012-08-08 11:28:19 -07:00
50f3e227a2
Move llhandle.h into llcommon; same generality as llpointer.h.
...
Leaving llhandle.h in llui restricts the set of viewer project directories
which could potentially use it, and there's nothing whatsoever UI-specific
about it.
2012-08-08 13:23:02 -04:00
3379760965
merge changes for DRTVWR-189
2012-08-08 07:27:59 -07:00
36e36b9497
tag merge of DRTVWR-189
2012-08-08 07:25:19 -07:00
1ace064a58
Added tag DRTVWR-189 for changeset 9ee938778970
2012-08-08 05:26:57 -07:00
261c10adf3
merge changes for DRTVWR-188
2012-08-07 19:42:45 -07:00
fba9c9e8dd
tag merge of DRTVWR-188
2012-08-07 19:42:04 -07:00
2571809dc0
tag merge of DRTVWR-181
2012-08-07 17:05:30 -07:00
b0843fc14a
merge with head
2012-08-07 14:20:54 -07:00
callum_linden