Merge remote-tracking branch 'upstream/master'

Conflicts:
	modules/game_viplist/viplist.lua
This commit is contained in:
Jeffrey
2013-01-07 21:23:14 -06:00
6 changed files with 9 additions and 4 deletions

View File

@@ -104,7 +104,7 @@ function onAddVip(id, name, state)
if (state ~= VipState.Online and child.vipState ~= VipState.Online)
or (state == VipState.Online and child.vipState == VipState.Online) then
local childText = child:getText():lower()
local length = math.min(childText:len(), nameLower:len())