Aleric Inglewood
1df09dec35
Remove assert that 100% reproducible fired - stopping me from logging in.
...
I wanted to fix the problem, but:
[21:45] <Aleric> Talking about dense - you guys want this to be fixed or not???
[21:45] <lkalif> no
2013-10-12 21:48:51 +02:00
Aleric Inglewood
8e0e532ea8
Merge remote-tracking branch 'singu/master'
2013-10-12 21:48:32 +02:00
Latif Khalifa
cb12a35102
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llaudio/llaudioengine.cpp
2013-10-12 10:04:05 +02:00
Latif Khalifa
e8c286308d
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-12 10:01:52 +02:00
Shyotl
7fb05e6a48
Audio engine changes:
...
-Idle tick is now responsible for dispatching all pending sound sources, as such improves priority sorting.
-Added ui sound precache mechanisms (to fetch sounds without associated soundsources)
-Audio engine no logner available pre-login or upon disconnect, for simplicity.
-General cleanup to the audio engine/impl.
-Fixed some gAudiop calls that were lacking prerequisite null checks.
-Added 'isUpstreamOK' procuedure to LLAssetStorage to allow avoidance of making requests when there is no upstream host connection.
2013-10-12 02:49:11 -05:00
Aleric Inglewood
3b2393dbda
Merge remote-tracking branch 'singu/master'
2013-10-11 13:42:06 +02:00
Aleric Inglewood
0261eac2a4
Fix for crash report 1272
2013-10-11 13:35:32 +02:00
Latif Khalifa
69f273eb0e
Don't crash if pay floater is closed before reply arrives from the server
...
Fix from upstream
Potentially fixes http://crash.singularityviewer.org/crashes.php?stacktrace=processPayPriceReply
2013-10-11 13:14:59 +02:00
Inusaito Sayori
477daff92f
[Warnings] Fix linux32's "format ‘%lu’ expects type ‘long unsigned int’, but argument has type ‘size_t’"
2013-10-11 05:53:57 -04:00
Latif Khalifa
926e76adea
Dump the whole login response to the log file only in the debug builds
2013-10-11 10:12:35 +02:00
Inusaito Sayori
9429b875aa
Demote common "Splitting" warning to debugs
2013-10-11 04:06:38 -04:00
Inusaito Sayori
f268c26a3a
[LLIMMgr/LLIMPanel] Fix the crashes in notifyParticularFriendObservers()
...
Forgot to write this line amidst everything else, my bad.
2013-10-11 03:25:32 -04:00
Inusaito Sayori
aa86730df2
[LLIMMgr/LLIMPanel] Fix race condition between name lookup and title setting
2013-10-11 00:45:23 -04:00
Inusaito Sayori
80bb529220
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-10-10 22:16:39 -04:00
Damian Zhaoying
7cc99ebf72
update spanish messages in IM floaters
2013-10-10 23:15:33 -03:00
Inusaito Sayori
be5727548b
Fix a warning typo and a minor bug I thought I'd fixed long ago indicated by some getString warning spam
2013-10-10 20:25:15 -04:00
Inusaito Sayori
54c08b3ea0
Localize the new Silent Accept/Decline messages
2013-10-10 18:28:06 -04:00
Inusaito Sayori
8964cfd58b
[LLIMMgr/LLIMPanel Revision] Compile Fixies
...
How did these even
2013-10-10 17:01:18 -04:00
Latif Khalifa
cf214e4f9e
Silence compiler warnings
2013-10-10 22:07:43 +02:00
Latif Khalifa
2a830c3184
Merge branch 'master' of https://github.com/slabua/SingularityViewer
2013-10-10 21:58:25 +02:00
Latif Khalifa
c313d5fe28
Merge branch 'master' of https://github.com/AdeonWriter/SingularityViewer
2013-10-10 21:58:19 +02:00
Inusaito Sayori
390c097c6a
Merge branch 'master' of https://github.com/DamianZhaoying/SingularityViewer
2013-10-10 15:53:32 -04:00
Salvatore La Bua
ebc839d540
Rearrange silent keep/discard inventory offer buttons
2013-10-10 21:49:49 +02:00
Salvatore La Bua
20ee6cdb72
Add silent keep/discard inventory offer buttons
...
Adapted from Phoenix code
2013-10-10 20:21:46 +02:00
Inusaito Sayori
d503662b58
Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer
2013-10-10 04:41:08 -04:00
Inusaito Sayori
91f6a4efa3
[OpenSim] Feature Request: Don't clamp max_import_scale to 240 on NonSL grids, and make max_import_scale start off based on the hippolimits' MaxPrimScale, not the SL-constant
2013-10-10 04:36:47 -04:00
Inusaito Sayori
13e25cfe6a
Feature Request: Add MiniMapPrimMaxAltitudeDelta and MiniMapPrimMaxAltitudeDeltaOwn to debug settings for users to configure how much altitude difference prims can have to be shown on the minimap
2013-10-10 04:29:12 -04:00
Inusaito Sayori
3fad577f2b
Fix spammy Texture WARNS to be DEBUGS as they should, also spellind fix
2013-10-10 04:22:48 -04:00
Inusaito Sayori
2f334b021f
[LLIMMgr/LLIMPanel Revision] Two last things
...
Handle display of popped out IM floaters better
send_start_session_messages(): cut early if ids is empty, fallback on UDP if there is a region but there isn't ChatSessionRequest Cap
2013-10-10 04:21:19 -04:00
Inusaito Sayori
363fa450fb
[LLIMMgr/LLIMPanel Revision] More Miscellaneous Code Cleanup
2013-10-10 04:18:08 -04:00
Inusaito Sayori
b049353178
[LLIMMgr/LLIMPanel Revision] Clean up construction of IM Floaters, so much redundant code!!
...
Removes mProfileButtonEnabled and lookupName()
2013-10-10 04:14:09 -04:00
Inusaito Sayori
0a874b0768
[LLIMMgr/LLIMPanel Revision] Don't let new messages ever change the active communications tab (perhaps fixes StockMaster's issue?)
2013-10-10 04:10:02 -04:00
Inusaito Sayori
a179f95057
[LLIMMgr/LLIMPanel Revision] Clean up ignored groups logic
2013-10-10 04:08:01 -04:00
Inusaito Sayori
402f4f7068
[LLIMMgr/LLIMPanel Revision] Feature Request: Friendship operations from IM
...
Also adds the toggle mute option, but this was deemed too risky and has been left commented out for future projects to decide for themselves on
2013-10-10 04:03:41 -04:00
Inusaito Sayori
42d9b425e9
[LLIMMgr/LLIMPanel Revision] Dynamic dropdown entries handling functions
...
Adds addDynamics(), removeDynamics(), rebuildDynamics()
2013-10-10 03:48:17 -04:00
Inusaito Sayori
d15ec04dba
[LLIMMgr/LLIMPanel Revision] Missed function declaration for closeIfNotPinned in a past commit, it's here
2013-10-10 03:40:15 -04:00
Inusaito Sayori
0cc5484b60
[LLIMMgr/LLIMPanel Revision] Add convert_roleplay_text() to centralize roleplay chat preprocessing
...
Unifies CAPSLock /ME handling
Unifies AutoCloseOOC impls so they share full common functionality
Adds AutoCloseOOC functionality to do /me ((autocompleted out of character action))
Also, RP Mode now uses parentheses rather than square brackets, by popular demand
2013-10-10 03:35:54 -04:00
Inusaito Sayori
d04820507c
[LLIMMgr/LLIMPanel Revision] LLFloaterIMPanel constructor combination and removal of LLFloaterIMPanel::init()
...
Also changes Session Label to Log Label because that's really what it is at this point
Also rearranges members in LLFloaterIMPanel, and war on BOOLs
Also removes mSessionInitialTargetIDs because it's no longer needed outside of the constructor
2013-10-10 03:26:51 -04:00
Inusaito Sayori
260723f2a4
[LLIMMgr/LLIMPanel Revision] Fix PinTalkViewOpen=false mechanics
...
If the user is holding a modifier key with enter, it bypasses the unpinned setting
If a chat is popped out, this setting now only minimizes that chat, not toggles the main communications floater.
LLIMPanel::closeIfNotPinned() now condenses the logic.
Also makes LLIMMgr::toggle() non-static and requiring no args.
2013-10-10 02:49:02 -04:00
Inusaito Sayori
9e312a3808
[LLIMMgr/LLIMPanel Revision] Cleanup of unused/useless classes, functions, members and xmls
2013-10-10 02:27:26 -04:00
Latif Khalifa
5f0b1ab05b
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2013-10-10 05:17:41 +02:00
Shyotl
3132d2b0d0
Avoid perpetual re-entry for LLOctreeNode::octree_pool_alloc::malloc if LL_USE_TCMALLOC is defined.
2013-10-09 22:16:19 -05:00
Latif Khalifa
c3226b25fe
Fixed Windows build
2013-10-10 00:18:47 +02:00
Latif Khalifa
d98402b13f
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llvotree.h
2013-10-10 00:03:36 +02:00
Latif Khalifa
b2979ca3a4
Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer
2013-10-10 00:01:56 +02:00
Shyotl
7a913af2c7
Use camera enums instead of magic numbers.
2013-10-09 16:09:09 -05:00
Shyotl
e324ffd9ad
In render_disconnected_background don't bind a shader or flush unless a disconnect image is actually being drawn.
2013-10-09 16:05:15 -05:00
Shyotl
e96caa78a1
Removed a little bit of unnecessary code from pipeline.cpp
2013-10-09 15:45:33 -05:00
Shyotl
b6bf5545c9
Change lightfunc from GL_R8 to GL_R16F/R32F
2013-10-09 15:44:15 -05:00
Shyotl
f25eb07fab
Unstaged changes cleanup. Further vectorization. Change in binormal/bitangent calculation.
2013-10-09 15:43:23 -05:00