general: last of the cleanup for now
This commit is contained in:
parent
bab8474cb9
commit
8e34a96b7e
2 changed files with 25 additions and 23 deletions
|
@ -1039,6 +1039,30 @@ class OTPClientRepository(ClientRepositoryBase):
|
|||
self.loginFSM.request('shutdown')
|
||||
return
|
||||
|
||||
if config.GetBool('astron-support', True):
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def handleAvatarListResponse(self, avatarList):
|
||||
avList = []
|
||||
for avNum, avName, avDNA, avPosition, nameState in avatarList:
|
||||
avNames = ['',
|
||||
'',
|
||||
'',
|
||||
'']
|
||||
avNames[0] = avName
|
||||
if nameState == 2: # Pending
|
||||
avNames[1] = avName
|
||||
elif nameState == 3: # Approved
|
||||
avNames[2] = avName
|
||||
elif nameState == 4: # Rejected
|
||||
avNames[3] = avName
|
||||
|
||||
aname = int(nameState == 1)
|
||||
potAv = PotentialAvatar(avNum, avNames, avDNA, avPosition, aname)
|
||||
avList.append(potAv)
|
||||
|
||||
self.avList = avList
|
||||
self.loginFSM.request('chooseAvatar', [self.avList])
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def enterChooseAvatar(self, avList):
|
||||
pass
|
||||
|
@ -2448,29 +2472,6 @@ class OTPClientRepository(ClientRepositoryBase):
|
|||
distObj = self.generateWithRequiredOtherFields(dclass, doId, di, parentId, zoneId)
|
||||
dclass.stopGenerate()
|
||||
|
||||
@report(types=['args', 'deltaStamp'], dConfigParam='teleport')
|
||||
def handleAvatarListResponse(self, avatarList):
|
||||
avList = []
|
||||
for avNum, avName, avDNA, avPosition, nameState in avatarList:
|
||||
avNames = ['',
|
||||
'',
|
||||
'',
|
||||
'']
|
||||
avNames[0] = avName
|
||||
if nameState == 2: # Pending
|
||||
avNames[1] = avName
|
||||
elif nameState == 3: # Approved
|
||||
avNames[2] = avName
|
||||
elif nameState == 4: # Rejected
|
||||
avNames[3] = avName
|
||||
|
||||
aname = int(nameState == 1)
|
||||
potAv = PotentialAvatar(avNum, avNames, avDNA, avPosition, aname)
|
||||
avList.append(potAv)
|
||||
|
||||
self.avList = avList
|
||||
self.loginFSM.request('chooseAvatar', [self.avList])
|
||||
|
||||
def handleDisable(self, di, ownerView = False):
|
||||
doId = di.getUint32()
|
||||
if not self.isLocalId(doId):
|
||||
|
|
|
@ -35,6 +35,7 @@ class IssueFrame(DirectFrame):
|
|||
DirectFrame.__init__(self, frameColor=(1, 1, 1, 0), frameSize=self.FrameDimensions, relief=DGG.FLAT, parent=parent)
|
||||
self.hide()
|
||||
self.accept('newsSnapshot', self.doSnapshot)
|
||||
self._parent = parent
|
||||
self.newsDir = newsDir
|
||||
self.dateStr = dateStr
|
||||
self.myIssueIndex = myIssueIndex
|
||||
|
|
Loading…
Reference in a new issue