This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
.nocomment-hide .mode-more .bookmark-list span.comment { | |
display: inline !important; | |
} | |
.nocomment-hide #container.mode-more .bookmark-list li { | |
padding-left: 30px !important; | |
} | |
.nocomment-hide #container.mode-more .bookmark-list ul.retweet-tree .retweet-node { | |
padding-left: 0px !important; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/common/network/Utils.hpp | |
+++ b/common/network/Utils.hpp | |
@@ -58,8 +58,8 @@ namespace network { | |
template<> | |
inline std::string GetSerializedValue(const std::string& t) | |
{ | |
- size_t size = t.size(); | |
- return ConvertEndian(std::string(reinterpret_cast<const char*>(&size), sizeof(size_t))) + | |
+ int size = t.size(); | |
+ return ConvertEndian(std::string(reinterpret_cast<const char*>(&size), sizeof(int))) + |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
// Custom Stuff2 Recipe: AdvancedMacines for Greg-Tech | |
var advancedMachinesBlockId = 1741; // from immibis.cfg | |
mod.addAlias(30181, "electrolyzedWaterCell"); // from IC2.cfg I:itemCellWaterElectro + 256 | |
mod.addAliasWithMetadata(advancedMachinesBlockId, 0, "rotaryMacerator"); | |
mod.addAliasWithMetadata(advancedMachinesBlockId, 1, "singularityCompressor"); | |
mod.addAliasWithMetadata(advancedMachinesBlockId, 2, "centrifugeExtractor"); | |
mod.addAlias(49, "obsidian"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1.9.3p429 :009 > 1.minute | |
=> 60 seconds | |
1.9.3p429 :010 > 1.minute.class | |
=> Fixnum | |
1.9.3p429 :011 > 1.minute.object_id | |
=> 121 | |
1.9.3p429 :012 > 60 | |
=> 60 | |
1.9.3p429 :013 > 60.object_id | |
=> 121 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1.9.3p429 :027 > 1.month.from_now | |
=> Sun, 18 Aug 2013 11:46:34 UTC +00:00 | |
1.9.3p429 :028 > (60 * 60 * 24 * 30).from_now | |
=> Sat, 17 Aug 2013 11:46:47 UTC +00:00 | |
1.9.3p429 :029 > 1.month == (60 * 60 * 24 * 30) | |
=> true | |
1.9.3p429 :030 > 1.month.equal?(60 * 60 * 24 * 30) | |
=> true |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# -*- mode: ruby; encoding: utf-8 -*- | |
require 'albacore' | |
require 'win32/shortcut' | |
task :default => :shortcut | |
BUILD_DIR='viewer-local' | |
ENV['LANG'] = 'C' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/indra/llui/lltexteditor.cpp | |
+++ b/indra/llui/lltexteditor.cpp | |
@@ -2832,12 +2832,13 @@ BOOL LLTextEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect | |
const LLWString textString(getWText()); | |
const llwchar * const text = textString.c_str(); | |
- const S32 line_height = mFont->getLineHeight(); | |
+ const line_info& line = mLineInfoList[current_line]; | |
+ LLRect text_rect(line.mRect); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/indra/llui/lltexteditor.cpp | |
+++ b/indra/llui/lltexteditor.cpp | |
@@ -2175,6 +2175,26 @@ void LLTextEditor::drawPreeditMarker() | |
line_start = next_start; | |
cur_line++; | |
} | |
+ | |
+ // for debug | |
+ LLCoordGL coord; | |
+ LLRect bounds; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -r 5c4dc17956b9 indra/llui/lltexteditor.cpp | |
--- a/indra/llui/lltexteditor.cpp Fri Aug 16 13:05:38 2013 +0100 | |
+++ b/indra/llui/lltexteditor.cpp Fri Aug 16 17:18:26 2013 +0100 | |
@@ -2782,6 +2782,9 @@ | |
BOOL LLTextEditor::getPreeditLocation(S32 query_offset, LLCoordGL *coord, LLRect *bounds, LLRect *control) const | |
{ | |
+ static LLUICachedControl<S32> preedit_marker_thickness ("UIPreeditMarkerThickness", 0); | |
+ static LLUICachedControl<S32> preedit_standout_thickness ("UIPreeditStandoutThickness", 0); | |
+ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# -*- coding: utf-8 -*- | |
import bpy.ops | |
import bmesh | |
import os | |
workdir = os.path.dirname(bpy.data.filepath) | |
os.chdir(workdir) | |
outdir = os.path.join(workdir, 'out') | |
rev = os.popen("git log --pretty=oneline -1 head.blend export.py | cut --fields=1 --delimiter=' '").read()[0:6] |
OlderNewer