7u83/OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Removed the "masterkey thing"

Browse Source 
We will use proxies from RealWorld to GodWorld
This commit is contained in:
7u83
2018-12-08 11:11:08 +01:00
parent 137c6af75d
commit 6d24eb67b9
27 changed files with 423 additions and 374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/opensesim/gui/AssetEditor/AssetEditorDialog.java
View File

@ -31,10 +31,8 @@ import java.awt.Window;
import opensesim.world.AbstractAsset;
import opensesim.gui.util.EscDialog;
import opensesim.gui.Globals;
import opensesim.gui.util.Json;
import opensesim.world.World;
import opensesim.world.WorldAdm;
import opensesim.world.GodWorld;
import org.json.JSONObject;
/**
@ -43,7 +41,7 @@ import org.json.JSONObject;
*/
public class AssetEditorDialog extends EscDialog {
WorldAdm worldadm;
GodWorld worldadm;
/**
@ -196,7 +194,7 @@ public class AssetEditorDialog extends EscDialog {
}//GEN-LAST:event_cancelButtonActionPerformed
static public boolean runDialog(Window parent, WorldAdm worldadm, JSONObject o, JSONObject old) {
static public boolean runDialog(Window parent, GodWorld worldadm, JSONObject o, JSONObject old) {
AssetEditorDialog d = new AssetEditorDialog(parent);
d.worldadm = worldadm;