Commit Graph

921 Commits

Author SHA1 Message Date
Siana Gearz
cd7b1e434d Announce incoming option fix 2011-04-03 01:51:07 +02:00
Siana Gearz
f9e0b122ae Revert voice control to snowglobe 2011-04-03 01:11:48 +02:00
Siana Gearz
7e895d4590 I really got annoyed by [RECIPIENT] 2011-04-03 00:46:34 +02:00
Siana Gearz
6dd9212d16 Group voice chat fix 2011-04-02 05:03:36 +02:00
Siana Gearz
0f038bbffc Grid manager stuff, part. debrand 2011-04-02 05:03:10 +02:00
Siana Gearz
b92dec7530 How about i read before i commit? Fixes PerAccount dir 2011-04-01 20:50:44 +02:00
Siana Gearz
8b54d6503a Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2011-04-01 15:48:35 +02:00
Shyotl
05102e98ab Using newer method to mark faces dirty on alpha change. 2011-04-01 01:16:01 -05:00
Siana Gearz
758c5bbfeb Stars for passwords are so 1993! 2011-04-01 05:14:02 +02:00
Siana Gearz
b3593f0ffe Proper per-account settings 2011-04-01 05:13:52 +02:00
Siana Gearz
b34d9fb88e MultiAttach unbork attempt 2011-04-01 05:13:39 +02:00
Siana Gearz
4b4096857f Merge commit 'a028c4edba8a5ddb340afc8eebb56b06b363bab1' 2011-04-01 05:13:12 +02:00
Shyotl
a028c4edba Hopefully fixed quicktime sdk conflict with boost as well as vc100 2011-03-28 23:51:55 -05:00
Siana Gearz
6b693d7571 AVN web search fix 2011-03-28 15:04:59 +02:00
Siana Gearz
838c2851da Object DLG fix 2011-03-28 02:29:29 +02:00
Siana Gearz
b4237a8200 HUD of DEATH fix 2011-03-28 02:28:07 +02:00
Shyotl
de109f9f97 LLSD update. LLSD::insert no longer returns self. Use LLSD::with if return value is required. 2011-03-27 19:06:15 -05:00
Shyotl
acf31bb885 U32 LLImageJ2C::mAreaUsedForDataSizeCalcs now initialized to 0 2011-03-27 19:00:36 -05:00
Shyotl
74659e6121 LLImage update. Nothing big. Allocation checks and utility functions. 2011-03-27 18:59:41 -05:00
Shyotl
dc62c29af0 Extended win OS detection to include vista and win7 2011-03-27 18:56:30 -05:00
Shyotl
18af6baedd Cleaned up a few minor things 2011-03-27 18:50:04 -05:00
Shyotl
8323a701e8 Fixed some 'RenderDelayCreation' related crashes 2011-03-27 16:53:17 -05:00
Siana Gearz
9435671d8d Remove L$ in status bar and replace by generic icon 2011-03-27 16:03:06 +02:00
Siana Gearz
1054ea2519 Apparently LLQtWebKit 4.7.1 is still broken on Linux 2011-03-27 16:02:07 +02:00
Siana Gearz
ba9bd7d41e meta7 LightShare 2011-03-26 16:47:16 +01:00
Siana Gearz
18b10638be Stupid headers -.- workaround 2011-03-26 04:02:51 +01:00
Siana Gearz
2298aee369 Merge branch 'master' of github-siana:siana/SingularityViewer 2011-03-26 01:06:43 +01:00
Siana Gearz
b6b18b0693 Adjustments to MultiAttach 2011-03-26 01:06:34 +01:00
Shyotl
b887d3147e Merge branch 'master' of git://github.com/siana/SingularityViewer.git
Conflicts:
	indra/llrender/llglstates.h
2011-03-25 17:54:52 -05:00
Shyotl
459deb4288 Media stream cleared when entering parcel with invalid media url 2011-03-25 17:51:18 -05:00
Shyotl
f73c666f0e Added isAgentAvatarValid() helper function from v2
Nullchecks
Flight-state tweaks
2011-03-25 17:50:06 -05:00
Siana Gearz
86f7987e13 build fix, cleanup 2011-03-25 22:09:42 +01:00
Siana Gearz
82667f5618 Merge git://github.com/Shyotl/SingularityViewer 2011-03-25 03:41:11 +01:00
Siana Gearz
179f4ddabb The Octopus Feature
___
                     .-'   `'.
                    /         \
                    |         ;
                    |         |           ___.--,
           _.._     |0) ~ (0) |    _.---'`__.-( (_.
    __.--'`_.. '.__.\    '--. \_.-' ,.--'`     `""`
   ( ,.--'`   ',__ /./;   ;, '.__.'`    __
   _`) )  .---.__.' / |   |\   \__..--""  """--.,_
  `---' .'.''-._.-'`_./  /\ '.  \ _.-~~~````~~~-._`-.__.'
        | |  .' _.-' |  |  \  \  '.               `~---`
         \ \/ .'     \  \   '. '-._)
          \/ /        \  \    `=.__`~-.
     jgs  / /\         `) )    / / `"".`\
    , _.-'.'\ \        / /    ( (     / /
     `--~`   ) )    .-'.'      '.'.  | (
            (/`    ( (`          ) )  '-;
             `      '-;         (-'
2011-03-24 23:54:23 +01:00
Shyotl
39af56c6f7 Object list now using standard stl container classes instead of deprecated LL clones. 2011-03-24 05:09:34 -05:00
Shyotl
0150bac422 LLGLState::sStateMap now using hash map (boost::unordered_map) opposed to std::map 2011-03-24 05:03:21 -05:00
Shyotl
23e1521a6b Some assertions, just in case. 2011-03-24 05:00:46 -05:00
Shyotl
e4df5c7fd0 Resolved some minor leaks 2011-03-24 04:56:54 -05:00
Shyotl
ad91dcc6e1 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-03-23 23:08:34 -05:00
siana
d4b6ece24b Unbotch jsoncpp 2011-03-21 04:17:00 +01:00
siana
67915fe8c8 That's why tags wouldn't show initially 2011-03-21 03:43:47 +01:00
siana
611b8f48d6 VC10 fixes 2011-03-21 03:13:49 +01:00
siana
15c01ed310 Merge remote branch 'shyotl/V2Renderer'
Conflicts:
	indra/cmake/00-Common.cmake
2011-03-20 04:55:56 +01:00
siana
baac16b5d2 OpenJPEG experiment, PCH circumcision 2011-03-20 04:44:58 +01:00
siana
e70a91311f don't botch Python syntax so badly 2011-03-19 14:17:37 +01:00
siana
472dade93a More build/package fixes 2011-03-19 00:14:20 +01:00
siana
3b567d3eae VC10 transition, Webkit 4.7.1 2011-03-18 01:33:47 +01:00
Shyotl
4ce89f203d And one more. 2011-03-17 00:46:57 -05:00
Shyotl
1166db3436 Oh cmake. You so silly. VS2010 wchar_t fix 2011-03-17 00:37:58 -05:00
Shyotl
77b5ac28e6 Oh cmake. You so silly. VS2010 wchar_t fix 2011-03-17 00:37:18 -05:00