History

Merge pull request #2630 from AndrewMeadows/scripting

Expose MyAvatar.sessionUUID to JS

Stephen Birarda committed 12 years ago

Commit 973fb952 parents a33263e 698e3789 files · +102 −17Browse files

Showing the changes to interface/src/Application.cpp (1 of 9 files). Show all

Unified · Split

interface/src/Application.cpp+1−2
@@ -232,6 +232,7 @@ Application::Application(int& argc, char** argv, timeval &startup_time) : · 231 unmodified lines
232232 connect(nodeList, SIGNAL(nodeAdded(SharedNodePointer)), &_voxels, SLOT(nodeAdded(SharedNodePointer)));
233233 connect(nodeList, SIGNAL(nodeKilled(SharedNodePointer)), &_voxels, SLOT(nodeKilled(SharedNodePointer)));
234234 connect(nodeList, &NodeList::uuidChanged, this, &Application::updateWindowTitle);
235+ connect(nodeList, SIGNAL(uuidChanged(const QUuid&)), _myAvatar, SLOT(setSessionUUID(const QUuid&)));
235236 connect(nodeList, &NodeList::limitOfSilentDomainCheckInsReached, nodeList, &NodeList::reset);
236237
237238 // connect to appropriate slots on AccountManager
@@ -1216,8 +1217,6 @@ void Application::timer() { · 978 unmodified lines
12161217
12171218 // ask the node list to check in with the domain server
12181219 NodeList::getInstance()->sendDomainServerCheckIn();
1219−
1220−
12211220 }
12221221
12231222 void Application::idle() {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t