Aleric Inglewood
4cd7dec92b
Merge branch 'master' into curlthreading4
...
Conflicts:
indra/aistatemachine/aistatemachine.cpp
indra/aistatemachine/aistatemachine.h
indra/llmessage/aicurleasyrequeststatemachine.cpp
2013-03-06 03:34:05 +01:00
Aleric Inglewood
c4dceaf3e9
Rewrite of AIStateMachine, version 2.
2013-03-06 03:26:43 +01:00
Lirusaito
32b513a025
Finish up last commit
...
Fixes the segfault that was accidentally overlooked because voice decided to not return after the first run as I worked on all the other warnings
Thanks to Latif Khalifa for the VoiceMultiInstance debug setting which enabled me to use voice again.
2013-03-05 20:56:14 -05:00
Lirusaito
db39bab95b
Fix a ton of run-time warnings about UI.
...
Cleans up some related code, probably looks nicer with space changes off.. though this is a pretty straightforward change.
Comments out code that still exists in xmls or might likely be added in future.
Each piece tested quite a bit.
2013-03-05 20:20:59 -05:00
Drake Arconis
565786ead1
Cleanup unused things
2013-03-05 13:35:58 -05:00
Drake Arconis
0e3a9b28bd
CMake cleanup and organization
2013-03-05 12:24:51 -05:00
Drake Arconis
28eec629ec
Remove executable bit from xml
2013-03-05 10:17:08 -05:00
Drake Arconis
bc2d26464f
Remove dead code
2013-03-05 09:08:47 -05:00
Drake Arconis
e725a2915e
Fix typo in local asset browser
2013-03-04 21:59:04 -05:00
Aleric Inglewood
d1d09d7c18
Bail out instead of crash when parseTEMessage fails.
2013-03-05 03:51:45 +01:00
Drake Arconis
5cf556fa09
And now it actually compiles...
2013-03-04 18:05:21 -05:00
Drake Arconis
c718bc4214
Make the actual skin folders lowercase
2013-03-04 17:10:19 -05:00
Drake Arconis
6e72ec2e12
Fix rigged mesh stack smashing
2013-03-04 16:13:58 -05:00
Drake Arconis
3fac86158c
General cleanup of unused variable warnings
2013-03-04 16:04:05 -05:00
Drake Arconis
17067de2dc
Fixed uninitialized warning in hacd
2013-03-04 16:00:00 -05:00
Drake Arconis
b667c81f84
Merge remote-tracking branch 'Lirusaito/Canon' into Cupcake
2013-03-04 12:17:41 -05:00
Drake Arconis
b800320a49
Remove LLMemType and related files
2013-03-04 12:02:01 -05:00
Drake Arconis
425db80fea
Fix warning on non-windows platforms about unknown pragma
2013-03-04 03:31:44 -05:00
Drake Arconis
43c0c4ce91
Some CMake Cleanup
...
Clean up leftover SERVER and VIEWER from when they were a single tree
Fixed debian multiarch cmake
Small bits of OSX cleanup
2013-03-04 03:31:24 -05:00
Lirusaito
79f6883bdf
[Issue 662] Translations retouch
...
Fixes overlaps and text running out of boundaries.
2013-03-03 14:48:03 -05:00
Lirusaito
3effb23f08
Call LLTrans::parseStrings before setting up notifications during LLAppViewer::init
...
Fixes the issue with notifications not translating
Moves the UI initialization code block up a few lines to the same area as v-d and sunshine-external have it.
This more clearly shows how it relates with upstream code such that future changes in this area might avoid similar issues.
2013-03-03 11:42:38 -05:00
Lirusaito
9ffa700c97
xmllint fixups
2013-03-03 09:58:02 -05:00
Lirusaito
198ef8feb0
Fix French role_actions.xml parsing warning
2013-03-02 22:20:42 -05:00
Lirusaito
fcd343af69
Small touches
...
Missed a line during Issue 662
Correct order of contributors to be alphabetical
Present existing translations before others.
2013-03-02 19:25:47 -05:00
Lirusaito
11856180aa
[Issue 662] Translations from upstream to ease the resulting load on translators.
2013-03-02 14:32:26 -05:00
Lirusaito
4060db34fa
[Issue 662] The text replacing certain heading texts to be as wide as it needs to be
2013-03-01 19:53:29 -05:00
Lirusaito
ab21a74bfc
[Issue 662] Plug in LLPanelEstateInfo::updateEstate* functions
2013-03-01 19:31:18 -05:00
Lirusaito
bbe81a86f5
[Issue 662] Allow Version text on Region/Estate region tab to be as long as it needs to be
2013-03-01 15:36:24 -05:00
Lirusaito
1c0f222028
[Issue 662] Add Environment tab to Region/Estate Floater.
2013-03-01 15:23:44 -05:00
Lirusaito
cfd24e0f09
[Issue 662] Switch to using LLEstateInfoModel
...
Applies part of STORM-1506 patch from https://codereview.secondlife.com/r/397/
Removes old WindLight parts from code.
2013-03-01 11:23:43 -05:00
Lirusaito
c2c9d53000
[Issue 662] In preparation for Environment panel, sync panel_region_estate.xml
2013-02-28 23:38:49 -05:00
Lirusaito
8eff717612
[Issue 662] STORM-1265: Combine Terrain and Ground Textures tabs in Region/Estate floater
2013-02-28 23:37:23 -05:00
Lirusaito
c509378b24
[Issue 662] Make the Region/Estate's Covenant panel's text editor take up as much space as the LL Viewer's.
2013-02-28 19:44:29 -05:00
Lirusaito
df8595b72e
[Issue 662] Update llfloaterregioninfo.* in preparation for adding new functionality.
2013-02-28 15:04:05 -05:00
Lirusaito
6525ccc384
Group Feature Request/Bug Fix: Allow setting a log location for any account before log in
...
The new setting gets overridden by the per account setting, if it has been set, but provides users the ability to set log location pre-login.
2013-02-28 14:41:08 -05:00
Lirusaito
7617f560ab
Fix up a mistake in antispam logic where only the user, not any other residents might be blocked.
...
Adds can_block() to NACLantispam.cpp to unify the blocking checks, so mistakes like this shouldn't happen again.
Best viewed without space changes.
2013-02-28 14:05:01 -05:00
Lirusaito
4990af9cfd
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer into Canon
2013-02-27 15:47:03 -05:00
Lirusaito
09c8be1673
Workaround the chat bar no longer focusing because it is within a layout_stack
2013-02-27 15:35:38 -05:00
Aleric Inglewood
186c3ef88a
Add support for xdg-open.
2013-02-27 17:22:10 +01:00
Latif Khalifa
ad03c27805
Tell cmake to only search paths we tell it to
2013-02-27 00:49:51 +01:00
Siana Gearz
c9ab38d449
Stream frequency change support and new anti-starvation strategy
2013-02-26 23:13:39 +01:00
Lirusaito
cef61db77f
Feature Request: Add debug setting for showing Position Before Parcel in the Status Bar
...
Adds StatusBarPositionBeforeParcel
Enables builders on parcels with keywords in their names to see their position.
2013-02-26 16:59:35 -05:00
Lirusaito
c0c32c4b70
Minimal update of llpanelgrouproles.cpp to get the owner role checkbox to enable properly.
2013-02-26 16:56:59 -05:00
Lirusaito
620849607e
Fulfill feature request: Optionally, don't ShowDisplayNameChanges in notifications.
...
Show display name changes checkbox added to Adv. Chat->Chat/IM tab.
Better viewed without space changes.
2013-02-26 16:35:02 -05:00
Lirusaito
180d1862a8
Dim seconds text in general preferences when AllowIdleAFK is false.
2013-02-26 16:07:21 -05:00
Siana Gearz
6ee8cc5798
Unbreak skinning on low end hardware
2013-02-26 20:47:43 +01:00
Siana Gearz
f3b7102034
Merge branch 'master' of github.com:singularity-viewer/SingularityViewer
2013-02-26 00:23:35 +01:00
Siana Gearz
13e0bc2742
Merge branch 'sunshine' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/lldrawable.cpp
indra/newview/llviewerwindow.cpp
2013-02-26 00:20:26 +01:00
Siana Gearz
a4b49e3fc2
Random stab at object updates. Tell me if it breaks anything.
2013-02-26 00:00:45 +01:00
Siana Gearz
e2659b801a
Dirty fix object import
2013-02-25 23:58:43 +01:00