forked from bartvdbraak/blender
* Verse username for blender avatar can be set in userprefs (System&OpenGL). The name defaults to the old form.
This commit is contained in:
parent
e259923340
commit
ba4f678b5c
@ -32,6 +32,7 @@
|
|||||||
#include "MEM_guardedalloc.h"
|
#include "MEM_guardedalloc.h"
|
||||||
|
|
||||||
#include "DNA_listBase.h"
|
#include "DNA_listBase.h"
|
||||||
|
#include "DNA_userdef_types.h"
|
||||||
|
|
||||||
#include "BLI_dynamiclist.h"
|
#include "BLI_dynamiclist.h"
|
||||||
#include "BLI_blenlib.h"
|
#include "BLI_blenlib.h"
|
||||||
@ -616,10 +617,7 @@ static void cb_node_create(
|
|||||||
vnode->data = create_object_data();
|
vnode->data = create_object_data();
|
||||||
/* set up avatar's name */
|
/* set up avatar's name */
|
||||||
if(node_id == session->avatar) {
|
if(node_id == session->avatar) {
|
||||||
char *client_name;
|
verse_send_node_name_set(node_id, U.verseuser);
|
||||||
client_name = verse_client_name();
|
|
||||||
verse_send_node_name_set(node_id, client_name);
|
|
||||||
MEM_freeN(client_name);
|
|
||||||
}
|
}
|
||||||
else if(session->flag & VERSE_AUTOSUBSCRIBE) {
|
else if(session->flag & VERSE_AUTOSUBSCRIBE) {
|
||||||
/* subscribe to changes of object node transformations */
|
/* subscribe to changes of object node transformations */
|
||||||
|
@ -166,13 +166,14 @@ typedef struct UserDef {
|
|||||||
struct SolidLight light[3];
|
struct SolidLight light[3];
|
||||||
short tw_hotspot, tw_flag, tw_handlesize, tw_size;
|
short tw_hotspot, tw_flag, tw_handlesize, tw_size;
|
||||||
int textimeout, texcollectrate;
|
int textimeout, texcollectrate;
|
||||||
int memcachelimit;
|
int memcachelimit;
|
||||||
short frameserverport;
|
short frameserverport;
|
||||||
short pad;
|
short pad;
|
||||||
short obcenter_dia;
|
short obcenter_dia;
|
||||||
short rvisize; /* rotating view icon size */
|
short rvisize; /* rotating view icon size */
|
||||||
short rvibright; /* rotating view icon brightness */
|
short rvibright; /* rotating view icon brightness */
|
||||||
char versemaster[160];
|
char versemaster[160];
|
||||||
|
char verseuser[160];
|
||||||
short pad1;
|
short pad1;
|
||||||
} UserDef;
|
} UserDef;
|
||||||
|
|
||||||
|
@ -3021,6 +3021,10 @@ void drawinfospace(ScrArea *sa, void *spacedata)
|
|||||||
(xpos+edgsp),y3label+buth+5,mpref*2,buth,
|
(xpos+edgsp),y3label+buth+5,mpref*2,buth,
|
||||||
U.versemaster, 1.0, 63.0, 0, 0,
|
U.versemaster, 1.0, 63.0, 0, 0,
|
||||||
"The Verse Master-server IP");
|
"The Verse Master-server IP");
|
||||||
|
uiDefBut(block, TEX, 0, "Verse Username: ",
|
||||||
|
(xpos+edgsp)+mpref*2+10,y3label+buth+5,mpref*2,buth,
|
||||||
|
U.verseuser, 1.0, 63.0, 0, 0,
|
||||||
|
"The Verse user name");
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
uiDefBut(block, LABEL,0,"Solid OpenGL light:",
|
uiDefBut(block, LABEL,0,"Solid OpenGL light:",
|
||||||
|
@ -356,6 +356,9 @@ static void init_userdef_file(void)
|
|||||||
if(strlen(U.versemaster)<1) {
|
if(strlen(U.versemaster)<1) {
|
||||||
strcpy(U.versemaster, "master.uni-verse.org");
|
strcpy(U.versemaster, "master.uni-verse.org");
|
||||||
}
|
}
|
||||||
|
if(strlen(U.verseuser)<1) {
|
||||||
|
strcpy(U.verseuser, verse_client_name());
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user