aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2013-06-06 03:20:15 +0100
committerMelanie2013-06-06 03:20:15 +0100
commitfe4a67efb6f54cad3f00884712abe03704216421 (patch)
tree04de93aaa8e9430c7c33e15912b3683b0297a10a /bin
parentMerge branch 'master' into careminster (diff)
parentUpdate HTTP server (diff)
downloadopensim-SC-fe4a67efb6f54cad3f00884712abe03704216421.zip
opensim-SC-fe4a67efb6f54cad3f00884712abe03704216421.tar.gz
opensim-SC-fe4a67efb6f54cad3f00884712abe03704216421.tar.bz2
opensim-SC-fe4a67efb6f54cad3f00884712abe03704216421.tar.xz
Merge branch 'avination-current' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
Diffstat (limited to '')
-rw-r--r--bin/enter_uuid.xml7
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/enter_uuid.xml b/bin/enter_uuid.xml
new file mode 100644
index 0000000..84475ad
--- /dev/null
+++ b/bin/enter_uuid.xml
@@ -0,0 +1,7 @@
1<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
2<floater can_close="true" can_drag_on_left="false" can_minimize="false" can_resize="false" height="100" name="enter_uuid" title="ID Required" width="390">
3 <text bottom="-30" left="10">Enter UUID</text>
4 <line_editor bottom="-60" left="10" width="370" name="new_owner" height="20"/>
5 <button bottom="-90" width="80" height="20" left="300" label="OK" name="ok" />
6 <button bottom="-90" width="80" height="20" left="210" label="Cancel" name="cancel" />
7</floater>